litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust SPARQL node logic to add datatypes to literals only if lacking a language tag (#175)

Browse source
This commit is contained in:
Ben 2020-07-21 08:01:39 -06:00 • committed by GitHub
parent e198fce908
commit 119413413a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
View file

@ -290,10 +290,10 @@ public class RDFServiceGraph implements GraphWithPerform {
literalBuff.append("\""); literalBuff.append("\"");
pyString(literalBuff, node.getLiteralLexicalForm()); pyString(literalBuff, node.getLiteralLexicalForm());
literalBuff.append("\""); literalBuff.append("\"");
if (node.getLiteralDatatypeURI() != null) { if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
literalBuff.append("@").append(node.getLiteralLanguage()); literalBuff.append("@").append(node.getLiteralLanguage());
} else if (node.getLiteralDatatypeURI() != null) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} }
return literalBuff.toString(); return literalBuff.toString();
} else { } else {

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
View file

@ -232,10 +232,10 @@ public class SparqlGraph implements GraphWithPerform {
literalBuff.append("\""); literalBuff.append("\"");
pyString(literalBuff, node.getLiteralLexicalForm()); pyString(literalBuff, node.getLiteralLexicalForm());
literalBuff.append("\""); literalBuff.append("\"");
if (node.getLiteralDatatypeURI() != null) { if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} else if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
literalBuff.append("@").append(node.getLiteralLanguage()); literalBuff.append("@").append(node.getLiteralLanguage());
} else if (node.getLiteralDatatypeURI() != null) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} }
return literalBuff.toString(); return literalBuff.toString();
} else { } else {

6
api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
View file

@ -254,10 +254,10 @@ public abstract class RDFServiceImpl implements RDFService {
literalBuff.append("\""); literalBuff.append("\"");
pyString(literalBuff, node.getLiteralLexicalForm()); pyString(literalBuff, node.getLiteralLexicalForm());
literalBuff.append("\""); literalBuff.append("\"");
if (node.getLiteralDatatypeURI() != null) { if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
literalBuff.append("@").append(node.getLiteralLanguage()); literalBuff.append("@").append(node.getLiteralLanguage());
} else if (node.getLiteralDatatypeURI() != null) {
literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
} }
return literalBuff.toString(); return literalBuff.toString();
} else { } else {