Changeset 28966 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceUtil.java

Timestamp:

2014-04-10T14:39:33+12:00 (10 years ago)

Author:

kjdon

Message:

Lots of changes. Mainly to do with removing this.doc from everywhere. Document is not thread safe. Now we tend to create a new Document everytime we are starting a new page/message etc. in service this.desc_doc is available as teh document to create service info stuff. But it should only be used for this and not for other messages. newDOM is now static for XMLConverter. method param changes for some GSXML methods.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceUtil.java (modified) (9 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceUtil.java

@@ -8 +8 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -34 +37 @@
         for (int i = 0; i < services.length; i++)
         {
-            Element service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             service.setAttribute(GSXML.NAME_ATT, services[i]);
@@ -43 +46 @@
     }
 
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+    protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
         for (int i = 0; i < services.length; i++)
@@ -49 +52 @@
             if (service_id.equals(services[i]))
             {
-                Element service_elem = this.doc.createElement(GSXML.SERVICE_ELEM);
+                Element service_elem = doc.createElement(GSXML.SERVICE_ELEM);
                 service_elem.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
                 service_elem.setAttribute(GSXML.NAME_ATT, services[i]);
@@ -61 +64 @@
     protected Element processGetAllImagesInCollection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, GET_ALL_IMAGES_IN_COLLECTION);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, GET_ALL_IMAGES_IN_COLLECTION);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, GET_ALL_IMAGES_IN_COLLECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_ALL_IMAGES_IN_COLLECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -76 +80 @@
 
         if (param_list == null) {
-            GSXML.addError(this.doc, result, GET_ALL_IMAGES_IN_COLLECTION + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_ALL_IMAGES_IN_COLLECTION + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;  // Return the empty result
         }
@@ -85 +89 @@
         if(regex == null)
         {
-            GSXML.addError(this.doc, result, GET_ALL_IMAGES_IN_COLLECTION + ": No file name extensions specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_ALL_IMAGES_IN_COLLECTION + ": No file name extensions specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -93 +97 @@
         if(collection == null)
         {
-            GSXML.addError(this.doc, result, GET_ALL_IMAGES_IN_COLLECTION + ": No collection specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_ALL_IMAGES_IN_COLLECTION + ": No collection specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -101 +105 @@
         getImagesRecursive(indexDir, regex, images);
         
-        Element imageListElem = this.doc.createElement("imageList");
+        Element imageListElem = result_doc.createElement("imageList");
         result.appendChild(imageListElem);
         for(String i : images)
         {
-            Element imageElem = this.doc.createElement("image");
-            imageElem.appendChild(this.doc.createTextNode(i));
+            Element imageElem = result_doc.createElement("image");
+            imageElem.appendChild(result_doc.createTextNode(i));
             imageListElem.appendChild(imageElem);
         }