Release 3.3. Fixed Redmine Bug#1188

Author: group131

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>Forth-ICS</groupId>
     <artifactId>3MEditor</artifactId>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.3</version>
     <packaging>war</packaging>
 
     <name>3MEditor</name>

src/main/java/gr/forth/ics/isl/x3mlEditor/Index.java

@@ -139,10 +139,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         if (output.equals("html")) {
             xmlMiddle.append("</xml>");
             if (mappingFileAsString.contains("<source>")) {
-                System.out.println("NEW");
                 xmlMiddle.append("<schemaVersion>").append("1.2+").append("</schemaVersion>");
             } else {
-                System.out.println("OLD");
                 xmlMiddle.append("<schemaVersion>").append("1.1").append("</schemaVersion>");
             }
 

src/main/java/gr/forth/ics/isl/x3mlEditor/upload/UploadReceiver.java

@@ -106,7 +106,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
 
         String use = "";
         if (xpath != null) {
-            if (filename.endsWith("rdf") || filename.endsWith("rdfs") || filename.endsWith("ttl")|| filename.endsWith("nt")) {
+            if (filename.endsWith("rdf") || filename.endsWith("rdfs") || filename.endsWith("ttl") || filename.endsWith("nt")) {
                 if (xpath.endsWith("/@rdf_link")) {
                     use = "rdf_link";
                 } else if (xpath.endsWith("/@thesaurus_link")) {
@@ -261,7 +261,8 @@ private void writeResponse(String filename, PrintWriter writer, String failureRe
             String json = "{\"success\": true, \"filename\": \"" + filename + "\", \"mime\": \"" + mime + "\"}";
             writer.print(json);
 
-        } else {
+        } else {          
+            failureReason = failureReason.replaceAll("\\\\'", "");//Added because we had a problem when error message contained \'          
             writer.print("{\"error\": \"" + failureReason + "\"}");
         }
 

src/main/webapp/readme.html

@@ -29,7 +29,7 @@
 <fieldset>
     <legend>3MEditor</legend>
     Version: <b>3.3</b><br/>
-    Build: <b>2018-05-30 (da3b891decdd7c7e11cb16f46676f9a4655b60be)</b>
+    Build: <b>2018-05-30 ()</b>
 </fieldset>
 
 <fieldset>
@@ -38,7 +38,8 @@
     <h4 style="text-decoration: underline;">2018</h4>
 
     <h5 style="text-decoration: underline;">May</h5>
-    <p>30 May 2018:<b>Release 3.3</b> Updated x3ml engine to 1.9.0-SNAPSHOT to support thesaurus on transformation. Thesaurus may now also be nt or rdf.</p>
+    <p>30 May 2018:<b>Release 3.3</b>. Updated x3ml engine to 1.9.0-SNAPSHOT to support thesaurus on transformation. Thesaurus may now also be nt or rdf.
+    Fixed Redmine Bug#1188</p>
     <p>29 May 2018: Release 3.3 almost ready. Editor updated to work with x3ml schema version 1.4. It now supports thesaurus uploading and usage by x3ml 
         engine when transforming.</p>
     <p>02 May 2018: Updated isl.Reasoner version once more to fix an issue with nt files. Fixed Redmine Bug#1050 (Cannot update constant value inside additional)