Skip to content

Revert changes in GraphML import that caused annotation values with … #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomaskrause merged 1 commit into from
Apr 18, 2026
Merged

Revert changes in GraphML import that caused annotation values with … #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Revert changes in GraphML import that caused annotation values with XML tags inside to fail.

## [4.1.3] - 2026-04-17

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ memmap2 = "0.9"
normpath = "1.1.1"
num-traits = "0.2"
percent-encoding = "2.1"
quick-xml = "0.39"
quick-xml = "0.28"
rand = "0.10"
rayon = { version = "1.3", default-features = false }
regex = "1"
Expand Down
2 changes: 0 additions & 2 deletions core/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ pub enum GraphAnnisCoreError {
#[error(transparent)]
Xml(#[from] quick_xml::Error),
#[error(transparent)]
XmlEncoding(#[from] quick_xml::encoding::EncodingError),
#[error(transparent)]
XmlAttr(#[from] quick_xml::events::attributes::AttrError),
#[error("Cache error: {0}")]
LfuCache(String),
Expand Down
8 changes: 4 additions & 4 deletions core/src/graph/serialization/graphml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ fn read_graphml<CT: ComponentType, R: std::io::BufRead, F: Fn(&str)>(
progress_callback: &F,
) -> Result<Option<String>> {
let mut reader = Reader::from_reader(input);
reader.config_mut().expand_empty_elements = true;
reader.expand_empty_elements(true);

let mut keys = BTreeMap::new();

Expand Down Expand Up @@ -584,7 +584,7 @@ fn read_graphml<CT: ComponentType, R: std::io::BufRead, F: Fn(&str)>(
}
}
Event::Text(t) if in_graph && level == 4 && current_data_key.is_some() => {
current_data_value = Some(t.decode()?.to_string());
current_data_value = Some(t.unescape()?.to_string());
}

Event::CData(t) => {
Expand Down Expand Up @@ -745,7 +745,7 @@ value = "test""#;
node_name: "first_node".to_string(),
anno_ns: DEFAULT_NS.to_string(),
anno_name: "an_annotation".to_string(),
anno_value: "something".to_string(),
anno_value: "something <strong>important</strong>".to_string(),
})
.unwrap();

Expand Down Expand Up @@ -839,7 +839,7 @@ value = "test""#;
.unwrap();
assert_eq!(3, first_node_annos.len());
assert_eq!(
Some(Cow::Borrowed("something")),
Some(Cow::Borrowed("something <strong>important</strong>")),
g.get_node_annos()
.get_value_for_item(
&first_node_id,
Expand Down
2 changes: 1 addition & 1 deletion core/src/graph/serialization/graphml_example.graphml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ key = "<value>"
[some.another]
value = "test"]]></data>
<node id="first_node">
<data key="k1">something</data>
<data key="k1">something &lt;strong&gt;important&lt;/strong&gt;</data>
<data key="k2">node</data>
</node>
<node id="second_node">
Expand Down
Loading