[Feature #15] Fix loading configuration

kbss-cvut · Sep 17, 2021 · 4c0b038 · 4c0b038
1 parent da76f60
commit 4c0b038
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java b/s-pipes-core/src/main/java/cz/cvut/spipes/modules/AbstractModule.java
@@ -297,7 +297,7 @@ Resource getPropertyValue(Property property, Resource defaultValue) {
     }
 
 
-    boolean getPropertyValue(Property property, boolean defaultValue) {
+    boolean getPropertyValue(@NotNull Property property, boolean defaultValue) {
 
         Statement s = resource.getProperty(property);
 
@@ -308,6 +308,16 @@ boolean getPropertyValue(Property property, boolean defaultValue) {
         return defaultValue;
     }
 
+    char getPropertyValue(@NotNull Property property, char defaultValue) {
+
+        Statement s = resource.getProperty(property);
+
+        if (s != null && s.getObject().isLiteral()) {
+            return s.getObject().asLiteral().getChar();
+        }
+        return defaultValue;
+    }
+
     protected String getStringPropertyValue(@NotNull Property property) {
 
         Statement st = resource.getProperty(property);

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
@@ -249,7 +249,7 @@ ExecutionContext executeSelf() {
     public void loadConfiguration() {
         isReplace = getPropertyValue(SML.replace, false);
         delimiter = getPropertyValue(P_DELIMITER, '\t');
-        quoteCharacter = getEffectiveValue(P_QUOTE_CHARACTER).asLiteral().getChar();
+        quoteCharacter = getPropertyValue(P_QUOTE_CHARACTER, '\'');
         dataPrefix = getEffectiveValue(P_DATE_PREFIX).asLiteral().toString();
         sourceResource = getResourceByUri(getEffectiveValue(P_SOURCE_RESOURCE_URI).asLiteral().toString());
         outputMode = Mode.fromResource(