diff --git a/Cargo.lock b/Cargo.lock index aced4900..04e56f83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1060,7 +1060,7 @@ checksum = "bb175ec8981211357b7b379869c2f8d555881c55ea62311428ec0de46d89bd5c" [[package]] name = "oxrdf" -version = "0.1.4" +version = "0.1.5-dev" dependencies = [ "lasso", "oxilangtag", @@ -1663,7 +1663,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "sparesults" -version = "0.1.6" +version = "0.1.7-dev" dependencies = [ "json-event-parser", "oxrdf", @@ -1672,7 +1672,7 @@ dependencies = [ [[package]] name = "spargebra" -version = "0.2.6" +version = "0.2.7-dev" dependencies = [ "oxilangtag", "oxiri", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index afa22663..5a035f38 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -37,10 +37,10 @@ hex = "0.4" siphasher = "0.3" lazy_static = "1" sysinfo = "0.28" -oxrdf = { version = "0.1.4", path="oxrdf", features = ["rdf-star", "oxsdatatypes"] } +oxrdf = { version = "0.1.5-dev", path="oxrdf", features = ["rdf-star", "oxsdatatypes"] } oxsdatatypes = { version = "0.1.1", path="oxsdatatypes" } -spargebra = { version = "0.2.6", path="spargebra", features = ["rdf-star", "sep-0002", "sep-0006"] } -sparesults = { version = "0.1.6", path="sparesults", features = ["rdf-star"] } +spargebra = { version = "0.2.7-dev", path="spargebra", features = ["rdf-star", "sep-0002", "sep-0006"] } +sparesults = { version = "0.1.7-dev", path="sparesults", features = ["rdf-star"] } [target.'cfg(not(target_family = "wasm"))'.dependencies] libc = "0.2" diff --git a/lib/oxrdf/Cargo.toml b/lib/oxrdf/Cargo.toml index 18c9fbf9..6fa8cc0d 100644 --- a/lib/oxrdf/Cargo.toml +++ b/lib/oxrdf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxrdf" -version = "0.1.4" +version = "0.1.5-dev" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/lib/oxrdf/src/parser.rs b/lib/oxrdf/src/parser.rs index 283b48e1..e06128d3 100644 --- a/lib/oxrdf/src/parser.rs +++ b/lib/oxrdf/src/parser.rs @@ -161,7 +161,10 @@ fn read_blank_node(s: &str) -> Result<(BlankNode, &str), TermParseError> { let s = s.trim(); if let Some(remain) = s.strip_prefix("_:") { let end = remain - .find(|v: char| v.is_whitespace() || matches!(v, '<' | '_' | '?' | '$' | '"' | '\'')) + .find(|v: char| { + v.is_whitespace() + || matches!(v, '<' | '_' | '?' | '$' | '"' | '\'' | '>' | '@' | '^') + }) .unwrap_or(remain.len()); let (value, remain) = remain.split_at(end); let term = BlankNode::new(value).map_err(|error| TermParseError { diff --git a/lib/sparesults/Cargo.toml b/lib/sparesults/Cargo.toml index 5bb0bd5b..445f916a 100644 --- a/lib/sparesults/Cargo.toml +++ b/lib/sparesults/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sparesults" -version = "0.1.6" +version = "0.1.7-dev" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" @@ -19,7 +19,7 @@ rdf-star = ["oxrdf/rdf-star"] [dependencies] json-event-parser = "0.1" -oxrdf = { version = "0.1.4", path="../oxrdf" } +oxrdf = { version = "0.1.5-dev", path="../oxrdf" } quick-xml = "0.27" [package.metadata.docs.rs] diff --git a/lib/spargebra/Cargo.toml b/lib/spargebra/Cargo.toml index dc3318bc..4b7401da 100644 --- a/lib/spargebra/Cargo.toml +++ b/lib/spargebra/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spargebra" -version = "0.2.6" +version = "0.2.7-dev" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" @@ -24,7 +24,7 @@ peg = "0.8" rand = "0.8" oxiri = "0.2" oxilangtag = "0.1" -oxrdf = { version = "0.1.4", path="../oxrdf" } +oxrdf = { version = "0.1.5-dev", path="../oxrdf" } [package.metadata.docs.rs] all-features = true diff --git a/server/Cargo.toml b/server/Cargo.toml index 73b7f8f6..87f62427 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -18,7 +18,7 @@ oxhttp = { version = "0.1", features = ["rayon"] } clap = { version = "=4.0", features = ["derive"] } clap_lex = "=0.3.0" oxigraph = { version = "0.3.14-dev", path = "../lib", features = ["http_client"] } -sparesults = { version = "0.1.6", path = "../lib/sparesults", features = ["rdf-star"] } +sparesults = { version = "0.1.7-dev", path = "../lib/sparesults", features = ["rdf-star"] } rand = "0.8" url = "2" oxiri = "0.2"