Skip to content
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

Jump to bottom

Sprint i18n main #208

Merged
merged 10 commits into from
Feb 3, 2021
Merged

Sprint i18n main #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4efe43c
Make data property richtext editor option selectable from UI
gneissone Mar 22, 2020
7981d24
Merge pull request #138 from vivo-project/bugfix/VIVO-1756
roflinn Mar 31, 2020
edef930
[VIVO-1755] - Better error handling when reasoner disabled (#137)
gneissone Mar 31, 2020
6d30a0f
Change Model writer lang from "N3-PP" to "N3" (#149)
Apr 7, 2020
42c69ef
[VIVO-1851] - Add 'remove' option to named graph management page (#162)
gneissone May 13, 2020
e198fce
[VIVO-1872] - Add download option to SPARQL Query page (#164)
gneissone May 28, 2020
1194134
Adjust SPARQL node logic to add datatypes to literals only if lacking…
gneissone Jul 21, 2020
936305b
Upgrade Jena version to 3.16.0 (#196)
Dec 3, 2020
73cc117
Merge branch 'main' into sprint-i18n-main
Feb 3, 2021
0653b36
Remove comments
Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,6 @@ public static String sparqlNode(Node node, String varName) {
literalBuff.append("\"");
pyString(literalBuff, node.getLiteralLexicalForm());
literalBuff.append("\"");
/*
* UQAM-Bug-Correction
* reversing the condition tests.
* It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
*/
// if (node.getLiteralDatatypeURI() != null) {
// literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
// } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
// literalBuff.append("@").append(node.getLiteralLanguage());
// }
if (!StringUtils.isEmpty(node.getLiteralLanguage())) {
literalBuff.append("@").append(node.getLiteralLanguage());
} else if (node.getLiteralDatatypeURI() != null) {
Expand Down
5 changes: 5 additions & 0 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public boolean isResource() {
throw new UnsupportedOperationException();
}

@Override
public boolean isStmtResource() {
throw new UnsupportedOperationException();
}

public Literal inModel(Model model) {
throw new UnsupportedOperationException();
}
Expand Down
10 changes: 10 additions & 0 deletions ...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,11 @@ public PrefixMapping lock() {
return inner.lock();
}

@Override
public boolean hasNoMappings() {
return inner.hasNoMappings();
}

@Override
public boolean samePrefixMappingAs(PrefixMapping other) {
return inner.samePrefixMappingAs(other);
Expand Down Expand Up @@ -684,6 +689,11 @@ public Resource createResource(String uri) {
return inner.createResource(uri);
}

@Override
public Resource createResource(Statement statement) {
return inner.createResource(statement);
}

@Override
public Property createProperty(String nameSpace, String localName) {
return inner.createProperty(nameSpace, localName);
Expand Down
10 changes: 10 additions & 0 deletions .../java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,11 @@ public PrefixMapping lock() {
return inner.lock();
}

@Override
public boolean hasNoMappings() {
return inner.hasNoMappings();
}

@Override
public boolean samePrefixMappingAs(PrefixMapping other) {
return inner.samePrefixMappingAs(other);
Expand Down Expand Up @@ -729,6 +734,11 @@ public Resource createResource(String uri) {
return inner.createResource(uri);
}

@Override
public Resource createResource(Statement statement) {
return inner.createResource(statement);
}

@Override
public Property createProperty(String nameSpace, String localName) {
return inner.createProperty(nameSpace, localName);
Expand Down
10 changes: 0 additions & 10 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,6 @@ protected static String sparqlNode(Node node, String varName) {
literalBuff.append("\"");
pyString(literalBuff, node.getLiteralLexicalForm());
literalBuff.append("\"");
/*
* UQAM-Bug-Correction
* reversing the condition tests.
* It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data
*/
// if (node.getLiteralDatatypeURI() != null) {
// literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">");
// } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
// literalBuff.append("@").append(node.getLiteralLanguage());
// }
if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) {
literalBuff.append("@").append(node.getLiteralLanguage());
} else if (node.getLiteralDatatypeURI() != null) {
Expand Down
5 changes: 5 additions & 0 deletions api/src/test/java/stubs/org/apache/jena/rdf/model/LiteralStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public boolean isResource() {
return false;
}

@Override
public boolean isStmtResource() {
return false;
}

@Override
public boolean isURIResource() {
return false;
Expand Down
18 changes: 14 additions & 4 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>3.11.0</version>
<version>3.16.0</version>
<exclusions>
<!-- Exclude OSGi bundles from jsonld-java -->
<exclusion>
Expand All @@ -192,23 +192,33 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>3.11.0</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-sdb</artifactId>
<version>3.11.0</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
<version>3.11.0</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>7.4.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.26</version>
</dependency>
<dependency>
<groupId>org.directwebremoting</groupId>
<artifactId>dwr</artifactId>
Expand Down