From c4904f69b90ba5da1d87b16bf30564e0f16f4bfe Mon Sep 17 00:00:00 2001 From: Tpt Date: Fri, 28 Oct 2022 21:32:14 +0200 Subject: [PATCH] Fixes SPARQL query formatting --- lib/spargebra/src/algebra.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/spargebra/src/algebra.rs b/lib/spargebra/src/algebra.rs index 38acb015..1460d3c0 100644 --- a/lib/spargebra/src/algebra.rs +++ b/lib/spargebra/src/algebra.rs @@ -71,17 +71,17 @@ impl fmt::Display for PropertyPathExpression { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::NamedNode(p) => p.fmt(f), - Self::Reverse(p) => write!(f, "^{}", p), + Self::Reverse(p) => write!(f, "^({})", p), Self::Sequence(a, b) => write!(f, "({} / {})", a, b), Self::Alternative(a, b) => write!(f, "({} | {})", a, b), - Self::ZeroOrMore(p) => write!(f, "{}*", p), - Self::OneOrMore(p) => write!(f, "{}+", p), - Self::ZeroOrOne(p) => write!(f, "{}?", p), + Self::ZeroOrMore(p) => write!(f, "({})*", p), + Self::OneOrMore(p) => write!(f, "({})+", p), + Self::ZeroOrOne(p) => write!(f, "({})?", p), Self::NegatedPropertySet(p) => { write!(f, "!(")?; for (i, c) in p.iter().enumerate() { if i > 0 { - write!(f, " ")?; + write!(f, " | ")?; } write!(f, "{}", c)?; } @@ -466,7 +466,7 @@ impl fmt::Display for Function { Self::LCase => write!(f, "LCASE"), Self::EncodeForUri => write!(f, "ENCODE_FOR_URI"), Self::Contains => write!(f, "CONTAINS"), - Self::StrStarts => write!(f, "STRSTATS"), + Self::StrStarts => write!(f, "STRSTARTS"), Self::StrEnds => write!(f, "STRENDS"), Self::StrBefore => write!(f, "STRBEFORE"), Self::StrAfter => write!(f, "STRAFTER"),