[Upd] Fix bad csvw:Row uri, remove unused StreamResource, change scor…

…e uri
kbss-cvut · Feb 15, 2023 · eaa87f6 · eaa87f6
1 parent 2f63319
commit eaa87f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 40 deletions.
diff --git a/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/constants/CSVW.java b/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/constants/CSVW.java
@@ -26,6 +26,7 @@ public static Property extendedProperty(String local )
     public static final Property table = property( "table");
     public static final Property url = property( "url");
     public static final Property row = property( "row");
+    public static final Property Row = property( "Row");
     public static final Property propertyUrl = property("propertyUrl");
     public static final Property name = property("name");
     public static final Property title = property("title");

diff --git a/...dule-text-analysis/src/main/java/cz/cvut/spipes/modules/ExtractTermOccurrencesModule.java b/...dule-text-analysis/src/main/java/cz/cvut/spipes/modules/ExtractTermOccurrencesModule.java
@@ -4,15 +4,13 @@
 import cz.cvut.spipes.constants.SML;
 import cz.cvut.spipes.engine.ExecutionContext;
 import cz.cvut.spipes.engine.ExecutionContextFactory;
-import cz.cvut.spipes.exception.ResourceNotFoundException;
 import cz.cvut.spipes.modules.constants.Constants;
 import cz.cvut.spipes.modules.textAnalysis.Extraction;
-import cz.cvut.spipes.registry.StreamResource;
-import cz.cvut.spipes.registry.StreamResourceRegistry;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.jena.rdf.model.*;
+import org.apache.jena.riot.RDFDataMgr;
+import org.apache.jena.riot.RDFFormat;
 import org.apache.jena.vocabulary.RDF;
-import org.jetbrains.annotations.NotNull;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -36,11 +34,6 @@ public class ExtractTermOccurrencesModule extends AnnotatedAbstractModule {
     @Parameter(urlPrefix = TYPE_PREFIX, name = "data-prefix")
     private String dataPrefix;
 
-    @Parameter(urlPrefix = TYPE_PREFIX, name = "source-resource-uri")
-    private String streamResourceUri;
-
-    private StreamResource sourceResource;
-
     Extraction extraction = new Extraction();
 
     @Override
@@ -66,7 +59,7 @@ protected ExecutionContext executeSelf() {
 
             if(e.hasAttr(Constants.SCORE)){
                 res.addLiteral(
-                        ResourceFactory.createProperty(getDataPrefix() + Constants.SCORE),
+                        ResourceFactory.createProperty(Constants.MA_SKORE),
                         inputRDF.createTypedLiteral(Float.valueOf(e.attr(Constants.SCORE)))
                 );
             }
@@ -79,7 +72,7 @@ protected ExecutionContext executeSelf() {
             addLiteral(res, createProperty(Constants.REFERENCES_ANNOTATION), StringEscapeUtils.unescapeJava(e.toString()));
             addLiteral(res, createProperty(Constants.REFERENCES_TEXT), parentTag);
             addLiteral(res, ResourceFactory.createProperty(Constants.JE_VYSKYT_TERMU), e.text());
-            addLiteral(res, ResourceFactory.createProperty(Constants.MA_STARTOVNi_POZICI), parentTag.indexOf(e.text()));
+            addLiteral(res, ResourceFactory.createProperty(Constants.MA_STARTOVNI_POZICI), parentTag.indexOf(e.text()));
             addLiteral(res, ResourceFactory.createProperty(Constants.MA_KONCOVOU_POZICI), parentTag.indexOf(e.text()) + e.text().length());
         });
         return ExecutionContextFactory.createContext(inputRDF);
@@ -98,23 +91,6 @@ public String getTypeURI() {
         return TYPE_URI;
     }
 
-    @Override
-    public void loadConfiguration() {
-        super.loadConfiguration();
-        sourceResource = getResourceByUri(streamResourceUri);
-    }
-
-    @NotNull
-    private StreamResource getResourceByUri(@NotNull String resourceUri) {
-
-        StreamResource res = StreamResourceRegistry.getInstance().getResourceByUrl(resourceUri);
-
-        if (res == null) {
-            throw new ResourceNotFoundException("Stream resource " + resourceUri + " not found. ");
-        }
-        return res;
-    }
-
     private static Property getSpecificParameter(String localPropertyName) {
         return ResourceFactory.createProperty(TYPE_PREFIX + localPropertyName);
     }
@@ -127,14 +103,6 @@ public void setReplace(boolean replace) {
         isReplace = replace;
     }
 
-    public StreamResource getSourceResource() {
-        return sourceResource;
-    }
-
-    public void setSourceResource(StreamResource sourceResource) {
-        this.sourceResource = sourceResource;
-    }
-
     public String getDataPrefix() {
         return dataPrefix;
     }

diff --git a/...odules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/constants/Constants.java b/...odules/module-text-analysis/src/main/java/cz/cvut/spipes/modules/constants/Constants.java
@@ -19,10 +19,12 @@
  */
 public class Constants {
 
-    public static final String VYSKYT_TERMU = "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/v\u00fdskyt-termu";
-    public static final String JE_VYSKYT_TERMU = "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/je-v\u00fdskytem-termu";
-    public static final String MA_KONCOVOU_POZICI = "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/má-koncovou-pozici";
-    public static final String MA_STARTOVNi_POZICI = "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/má-startovní-pozici";
+    public static final String termitUri = "http://onto.fel.cvut.cz/ontologies/application/termit/pojem/";
+    public static final String VYSKYT_TERMU = termitUri + "v\u00fdskyt-termu";
+    public static final String JE_VYSKYT_TERMU = termitUri + "je-v\u00fdskytem-termu";
+    public static final String MA_KONCOVOU_POZICI = termitUri + "má-koncovou-pozici";
+    public static final String MA_STARTOVNI_POZICI = termitUri + "má-startovní-pozici";
+    public static final String MA_SKORE = termitUri + "má-skóre";
 
     private Constants() {
         throw new AssertionError();