Changeset 4188

Timestamp:

12/13/13 16:48:59 (10 years ago)

Author:

olhsha

Message:

postimg/getting annotations with xml bodies is fixed

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend

Files:

• Helpers.java (modified) (3 diffs)
• dao/impl/JdbcTargetDao.java (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/Helpers.java

@@ -18 +18 @@
 package eu.dasish.annotation.backend;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 import javax.xml.parsers.DocumentBuilder;
@@ -51 +53 @@
             try {
                 try {
-                    Document doc = dbf.parse(string);
+                    InputStream is = new ByteArrayInputStream(string.getBytes("UTF-16"));
+                    Document doc = dbf.parse(is);
                     return doc.getDocumentElement();
                 } catch (SAXException saxException) {
@@ -67 +70 @@
     public static String elementToString(Element element) {
         Document document = element.getOwnerDocument();
-        DOMImplementationLS domImplLS = (DOMImplementationLS) document
-                .getImplementation();
+        DOMImplementationLS domImplLS = (DOMImplementationLS) document.getImplementation();
+        String encoding=document.getInputEncoding();
         LSSerializer serializer = domImplLS.createLSSerializer();
         String result = serializer.writeToString(element);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcTargetDao.java

@@ -241 +241 @@
         target.setURI(externalIDtoURI(externalID));
         target.setLastModified(xmlTimeStamp);
-        target.setLink(((new StringBuilder(link)).append("#").append(fragment)).toString());
+        if (fragment != null) {
+            target.setLink(((new StringBuilder(link)).append("#").append(fragment)).toString());
+        } else {
+            target.setLink(link);
+        }
         target.setVersion(version);
         return target;
     }
-    
-    private String[] splitLink(String link){
-      if (link!=null) {
-         String[] result = new String[2]; 
-         String[] parts = link.split("#");
-         if (parts.length > 1) {
-             result[0] = parts[0];             
-             StringBuilder buffer = new StringBuilder();
-             for (int i=1; i<parts.length ; i++){
-                 if (parts[i]!=null){
-                     buffer.append(parts[i]);
-                 }
-             }
-             result[1] = buffer.toString();
-         }
-         return result;
-      }
-      else return null;
+
+    private String[] splitLink(String link) {
+        if (link != null) {
+            String[] result = new String[2];
+            String[] parts = link.split("#");
+            result[0] = parts[0];
+            if (parts.length > 1) {
+                StringBuilder buffer = new StringBuilder();
+                for (int i = 1; i < parts.length; i++) {
+                    if (parts[i] != null) {
+                        buffer.append(parts[i]);
+                    }
+                }
+                result[1] = buffer.toString();
+            }
+            return result;
+        } else {
+            return null;
+        }
     }
 }