diff --git a/.gitignore b/.gitignore index 7c60c87..d0bedbd 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,16 @@ twb-covid-wikidata.ttl twb-covid-wordnet.ttl twb-naisc.zip feats.csv +apache-jena-fuseki-3.16.0/ +apache-jena2/ + +apache-jena-fuseki-3.16.0.tar.gz +configs/wikidata-wordnet.json +left.nt +left.nt.gz +left.ttl +maple-test.sh +right.nt.gz +right.ttl +wordnet-wikidata.nt +feats.csv diff --git a/configs/ontolex-default.json b/configs/ontolex-default.json index b52633b..211d493 100644 --- a/configs/ontolex-default.json +++ b/configs/ontolex-default.json @@ -4,7 +4,7 @@ }, "lenses": [{ "name": "lens.Label", - "property": ["http://www.w3.org/2004/02/skos/core#definition"], + "property": "http://www.w3.org/2004/02/skos/core#definition", "id": "label" }], "textFeatures": [{ diff --git a/naisc-cili/pom.xml b/naisc-cili/pom.xml index b438387..f8423e0 100644 --- a/naisc-cili/pom.xml +++ b/naisc-cili/pom.xml @@ -3,6 +3,7 @@ 4.0.0 org.insightcentre naisc-cili + Naisc - Linker interface to CILI 1.1 1.3.10 diff --git a/naisc-core/src/main/java/org/insightcentre/uld/naisc/lens/Label.java b/naisc-core/src/main/java/org/insightcentre/uld/naisc/lens/Label.java index ff92cfb..235d211 100644 --- a/naisc-core/src/main/java/org/insightcentre/uld/naisc/lens/Label.java +++ b/naisc-core/src/main/java/org/insightcentre/uld/naisc/lens/Label.java @@ -90,10 +90,10 @@ public Collection extract(URIRes res1, URIRes res2, NaiscListener lo } if(lit1.isEmpty()) { - log.message(NaiscListener.Stage.MATCHING, NaiscListener.Level.WARNING, String.format("Property %s not found in left ontology\n", leftProp.getURI())); + log.message(NaiscListener.Stage.MATCHING, NaiscListener.Level.WARNING, String.format("Property %s not found in left ontology for %s\n", leftProp.getURI(), res1)); } if(lit2.isEmpty()) { - log.message(NaiscListener.Stage.MATCHING, NaiscListener.Level.WARNING, String.format("Property %s not found in right ontology\n", rightProp.getURI())); + log.message(NaiscListener.Stage.MATCHING, NaiscListener.Level.WARNING, String.format("Property %s not found in right ontology for %s\n", rightProp.getURI(), res2)); } List labels = Labels.closestLabelsByLang(lit1, lit2); diff --git a/naisc-rest/Dockerfile b/naisc-rest/Dockerfile index 8026595..9fb497d 100644 --- a/naisc-rest/Dockerfile +++ b/naisc-rest/Dockerfile @@ -1,7 +1,7 @@ FROM tomcat:9.0-jdk14-openjdk-oracle RUN rm -rf /usr/local/tomcat/webapps/ROOT -COPY naisc-rest/build/libs/naisc-rest-1.1-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war +COPY naisc-rest/build/libs/naisc-rest-1.1.war /usr/local/tomcat/webapps/ROOT.war RUN mkdir /usr/local/tomcat/configs/ COPY configs/* /usr/local/tomcat/configs/ RUN mkdir /usr/local/tomcat/models/ diff --git a/naisc-rest/pom.xml b/naisc-rest/pom.xml index a2f0064..f82c76e 100644 --- a/naisc-rest/pom.xml +++ b/naisc-rest/pom.xml @@ -5,6 +5,7 @@ org.insightcentre naisc-rest 1.1 + Naisc - REST file interface war 1.3.10 diff --git a/naisc.sh b/naisc.sh index 137aeaa..fc6b543 100755 --- a/naisc.sh +++ b/naisc.sh @@ -5,4 +5,4 @@ cd "$(dirname "$0")" ./gradlew jarWithDeps -java -jar naisc-core/build/libs/naisc-core-all-1.1-SNAPSHOT.jar $* +java -jar naisc-core/build/libs/naisc-core-all-1.1.jar $* diff --git a/settings.gradle b/settings.gradle index ca6d23d..7c9f09d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = 'naisc' include 'naisc-core', 'naisc-meas', 'naisc-cili', 'naisc-rest', 'naisc-elexis' -include 'config' \ No newline at end of file +include 'config' diff --git a/train.sh b/train.sh index 078c2c3..ea9c0ec 100755 --- a/train.sh +++ b/train.sh @@ -5,4 +5,4 @@ cd "$(dirname "$0")" ./gradlew jarWithDeps -java -cp naisc-core/build/libs/naisc-core-all-1.1-SNAPSHOT.jar org.insightcentre.uld.naisc.main.MultiTrain $* +java -cp naisc-core/build/libs/naisc-core-all-1.1.jar org.insightcentre.uld.naisc.main.MultiTrain $*