[Feature #15] Fix conventions for vocabularies

kbss-cvut · Sep 14, 2021 · 31d7eac · 31d7eac
1 parent e54a314
commit 31d7eac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/constants/CSVW.java b/s-pipes-core/src/main/java/cz/cvut/spipes/constants/CSVW.java
@@ -17,11 +17,11 @@ protected static final Resource resource(String local )
     protected static final Property property(String local )
     { return ResourceFactory.createProperty( uri, local ); }
 
-    public static final Property hasTable = property( "table");
-    public static final Property hasUrl = property( "url");
-    public static final Property hasRow = property( "row");
-    public static final Property hasRowNum = property( "rownum");
-    public static final Property hasDescribes = property( "describes");
+    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 rowNum = property( "rownum");
+    public static final Property describes = property( "describes");
 
     public static final Resource TableGroup = resource("TableGroup");
     public static final Resource Table = resource("Table");

diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/modules/TabularModule.java b/s-pipes-core/src/main/java/cz/cvut/spipes/modules/TabularModule.java
@@ -140,7 +140,7 @@ ExecutionContext executeSelf() {
                     // 4.6.2
                     outputModel.add(
                             T,
-                            CSVW.hasRow,
+                            CSVW.row,
                             R);
                     // 4.6.3
                     outputModel.add(
@@ -150,14 +150,14 @@ ExecutionContext executeSelf() {
                     // 4.6.4
                     outputModel.add(
                             R,
-                            CSVW.hasRowNum,
+                            CSVW.rowNum,
                             ResourceFactory.createTypedLiteral(Integer.toString(rowNumber),
                                     XSDDatatype.XSDinteger));
                     // 4.6.5
                     final String rowIri = T.getURI() + "#" + rowNumber;
                     outputModel.add(
                             R,
-                            CSVW.hasUrl,
+                            CSVW.url,
                             ResourceFactory.createResource(rowIri));
                     // 4.6.6 - Add titles.
                     // We do not support titles.
@@ -183,7 +183,7 @@ ExecutionContext executeSelf() {
                         //Standard mode - add links from table
                         outputModel.add(
                                 R,
-                                CSVW.hasDescribes,
+                                CSVW.describes,
                                 S);
                     }
                 }
@@ -256,7 +256,7 @@ private void onTable(String tableResource, String tableUri) {
             // 4.2
             outputModel.add(
                     G,
-                    CSVW.hasTable,
+                    CSVW.table,
                     T);
             // 4.3
             outputModel.add(
@@ -267,7 +267,7 @@ private void onTable(String tableResource, String tableUri) {
             if (tableUri != null) {
                 outputModel.add(
                         G,
-                        CSVW.hasUrl,
+                        CSVW.url,
                         ResourceFactory.createResource(tableUri));
             }
             // 4.5