Changeset 4033

Timestamp:

2003-03-28T13:50:51+12:00 (21 years ago)

Author:

mdewsnip

Message:

Modified to returned a section with annotations as a proper XML document (with structure), rather than just a block of text. This allows much easier access to the annotations, and the code no longer needs to know anything about its usage (span tags are now added in the XSLT).

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GATEServices.java

@@ -240 +240 @@
 
         // Remove the surrounding HTML tags
-        annotated_text = annotated_text.substring(25, annotated_text.length() - 7);
+        annotated_text = annotated_text.substring(49, annotated_text.length() - 13);
         // System.out.println("GATE result:\n" + annotated_text);
-        content_text.setNodeValue(annotated_text);
+
+        annotated_text = "<nodeContent>" + annotated_text + "</nodeContent>";
+        Element annotated_content = converter_.getDOM(annotated_text).getDocumentElement();
+        doc_node.replaceChild(doc_node.getOwnerDocument().importNode(annotated_content, true), content);
     }
 
@@ -271 +274 @@
 
         // Extract all the annotations
-        // AnnotationSet annSet = outputAnnotationSetName == null ||
-        // outputAnnotationSetName.length() == 0 ?
-        // doc.getAnnotations() :
-        // doc.getAnnotations(outputAnnotationSetName);
         AnnotationSet annSet = doc.getAnnotations();
-        // String result = doc.toXml(annSet, false);
 
         // Return the desired annotations
@@ -283 +281 @@
         Factory.deleteResource(doc);
 
-        // Replace all the annotations with div tags
+        // 1. Escape the GATE result
+        result = GSXML.xmlSafe(result);
+
+        // 2. Unescape the annotation tags
         Iterator setIterator = annotationTypesToExport.iterator();
         while (setIterator.hasNext()) {
         String annotationType = (String) setIterator.next();
-        result = result.replaceAll("<" + annotationType + ">",
-                       "<span class=\"" + annotationType + "\">");
-        result = result.replaceAll("</" + annotationType + ">",
-                       "</span>");
+        result = result.replaceAll("&lt;" + annotationType + "&gt;",
+                       "<annotation type=\"" + annotationType + "\">");
+        result = result.replaceAll("&lt;/" + annotationType + "&gt;",
+                       "</annotation>");
         }
 
-        // System.out.println("Result:\n" + result);
         return result;
     }