Changeset 28966 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CoverageMetadataRetrieve.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/CoverageMetadataRetrieve.java (modified) (12 diffs)

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

@@ -65 +65 @@
         // with their names and service types
         // we have two services, a new textquery, and a new one of a new type
-        //Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        //Element tq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         //tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
         //tq_service.setAttribute(GSXML.NAME_ATT, QUERY_SERVICE);
         //this.short_service_info.appendChild(tq_service);
 
-        Element diff_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element diff_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         diff_service.setAttribute(GSXML.TYPE_ATT, "retrieve");
         diff_service.setAttribute(GSXML.NAME_ATT, COVERAGE_SERVICE);
@@ -122 +122 @@
         if (format != null)
         {
-            this.format_info_map.put(COVERAGE_SERVICE, this.doc.importNode(format, true));
+            this.format_info_map.put(COVERAGE_SERVICE, this.desc_doc.importNode(format, true));
         }
 
@@ -130 +130 @@
 
     // get the desription of a service. Could include parameter lists, displayText
-    protected Element getServiceDescription(String service, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
 
@@ -141 +141 @@
         /*
          * if (service.equals(QUERY_SERVICE)) { Element tq_service =
-         * this.doc.createElement(GSXML.SERVICE_ELEM);
+         * doc.createElement(GSXML.SERVICE_ELEM);
          * tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
          * tq_service.setAttribute(GSXML.NAME_ATT, QUERY_SERVICE); if
@@ -148 +148 @@
          * in any <displayText> elements // name, for example - get from
          * properties file
-         * tq_service.appendChild(GSXML.createDisplayTextElement(this.doc,
+         * tq_service.appendChild(GSXML.createDisplayTextElement(doc,
          * GSXML.DISPLAY_TEXT_NAME, getTextString(QUERY_SERVICE+".name", lang)
          * )); }
@@ -155 +155 @@
          * subset.equals(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER)) { // add in a
          * param list if this service has parameters Element param_list =
-         * this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+         * doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
          * tq_service.appendChild(param_list); // create any params and append
          * to param_list } return tq_service; }
@@ -162 +162 @@
         if (service.equals(COVERAGE_SERVICE))
         {
-            Element diff_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element diff_service = doc.createElement(GSXML.SERVICE_ELEM);
             diff_service.setAttribute(GSXML.TYPE_ATT, "retrieve");
             diff_service.setAttribute(GSXML.NAME_ATT, COVERAGE_SERVICE);
@@ -169 +169 @@
                 // add in any <displayText> elements
                 // name, for example - get from properties file
-                diff_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(COVERAGE_SERVICE + ".name", lang)));
+                diff_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(COVERAGE_SERVICE + ".name", lang)));
             }
 
@@ -175 +175 @@
             {
                 // add in a param list if this service has parameters
-                Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+                Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
                 diff_service.appendChild(param_list);
                 // create any params and append to param_list
@@ -230 +230 @@
 
         // Create response
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
         result.setAttribute(GSXML.FROM_ATT, COVERAGE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
-        Element metadataSetList = this.doc.createElement("metadataSetList");
+        Element metadataSetList = result_doc.createElement("metadataSetList");
         result.appendChild(metadataSetList);
 
@@ -249 +250 @@
 
             // Create metadataSet using the current key and add to metadataSetList
-            metadataSet = this.doc.createElement("metadataSet");
+            metadataSet = result_doc.createElement("metadataSet");
             if (current_key.indexOf("-") != -1)
             {
@@ -263 +264 @@
             {
                 value = iter2.next();
-                metadata = this.doc.createElement("metadata");
+                metadata = result_doc.createElement("metadata");
                 metadata.setAttribute(GSXML.NAME_ATT, value);
                 metadataSet.appendChild(metadata);