Fixes BlankNode encoding

pull/41/head
Tpt 4 years ago
parent 2d80960e79
commit 0aa536998e
  1. 24
      lib/src/store/numeric_encoder.rs

@ -907,9 +907,7 @@ pub trait Encoder {
self.encode_rio_named_node(named_node.into()) self.encode_rio_named_node(named_node.into())
} }
fn encode_blank_node(&self, blank_node: &BlankNode) -> Result<EncodedTerm> { fn encode_blank_node(&mut self, blank_node: &BlankNode) -> Result<EncodedTerm>;
Ok(blank_node.into())
}
fn encode_literal(&mut self, literal: &Literal) -> Result<EncodedTerm> { fn encode_literal(&mut self, literal: &Literal) -> Result<EncodedTerm> {
self.encode_rio_literal(literal.into()) self.encode_rio_literal(literal.into())
@ -1028,6 +1026,17 @@ impl<S: StrContainer> Encoder for S {
Ok(EncodedTerm::NamedNode { iri_id }) Ok(EncodedTerm::NamedNode { iri_id })
} }
fn encode_blank_node(&mut self, blank_node: &BlankNode) -> Result<EncodedTerm> {
if let Some(id) = blank_node.id() {
Ok(EncodedTerm::InlineBlankNode { id })
} else {
let id = blank_node.as_str();
let id_id = StrHash::new(id);
self.insert_str(id_id, id)?;
Ok(EncodedTerm::NamedBlankNode { id_id })
}
}
fn encode_rio_blank_node( fn encode_rio_blank_node(
&mut self, &mut self,
blank_node: rio::BlankNode<'_>, blank_node: rio::BlankNode<'_>,
@ -1263,15 +1272,16 @@ fn test_encoding() {
NamedNode::new_unchecked("http://bar.com").into(), NamedNode::new_unchecked("http://bar.com").into(),
NamedNode::new_unchecked("http://foo.com").into(), NamedNode::new_unchecked("http://foo.com").into(),
BlankNode::default().into(), BlankNode::default().into(),
Literal::new_simple_literal("foo").into(), BlankNode::new_unchecked("foo-bnode").into(),
Literal::new_simple_literal("foo-literal").into(),
Literal::from(true).into(), Literal::from(true).into(),
Literal::from(1.2).into(), Literal::from(1.2).into(),
Literal::from(1).into(), Literal::from(1).into(),
Literal::from("foo").into(), Literal::from("foo-string").into(),
Literal::new_language_tagged_literal("foo", "fr") Literal::new_language_tagged_literal("foo-fr", "fr")
.unwrap() .unwrap()
.into(), .into(),
Literal::new_language_tagged_literal("foo", "FR") Literal::new_language_tagged_literal("foo-FR", "FR")
.unwrap() .unwrap()
.into(), .into(),
Literal::new_typed_literal("-1.32", xsd::DECIMAL.clone()).into(), Literal::new_typed_literal("-1.32", xsd::DECIMAL.clone()).into(),

Loading…
Cancel
Save