Changeset 28966

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.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• LibraryServlet.java (modified) (1 diff)
• OAIServer.java (modified) (3 diffs)
• SOAPServerlocalsite.java (modified) (1 diff)
• collection/Collection.java (modified) (9 diffs)
• collection/ServiceCluster.java (modified) (27 diffs)
• collection/XMLCollection.java (modified) (9 diffs)
• comms/SOAPCommunicator.java (modified) (1 diff)
• core/DefaultReceptionist.java (modified) (6 diffs)
• core/MessageRouter.java (modified) (7 diffs)
• core/OAIReceptionist.java (modified) (11 diffs)
• core/Receptionist.java (modified) (5 diffs)
• core/TransformingReceptionist.java (modified) (6 diffs)
• service/AbstractBrowse.java (modified) (32 diffs)
• service/AbstractDocumentRetrieve.java (modified) (30 diffs)
• service/AbstractGS2DocumentRetrieve.java (modified) (5 diffs)
• service/AbstractGS2FieldSearch.java (modified) (21 diffs)
• service/AbstractGS2TextSearch.java (modified) (1 diff)
• service/AbstractSearch.java (modified) (13 diffs)
• service/AbstractTextSearch.java (modified) (6 diffs)
• service/ArchiveIO.java (modified) (19 diffs)
• service/ArchiveRetrieve.java (modified) (16 diffs)
• service/Authentication.java (modified) (50 diffs)
• service/BerryBasket.java (modified) (32 diffs)
• service/CoverageMetadataRetrieve.java (modified) (12 diffs)
• service/CrossCollectionSearch.java (modified) (24 diffs)
• service/DebugService.java (modified) (30 diffs)
• service/DocXMLUtil.java (modified) (17 diffs)
• service/DocumentBasket.java (modified) (33 diffs)
• service/DocumentMaker.java (modified) (15 diffs)
• service/FedoraSearch.java.tmp (modified) (2 diffs)
• service/FedoraServiceProxy.java (modified) (2 diffs)
• service/GS2Browse.java (modified) (5 diffs)
• service/GS2Construct.java (modified) (25 diffs)
• service/GS2LuceneRetrieve.java (modified) (2 diffs)
• service/GS2LuceneSearch.java (modified) (4 diffs)
• service/GS2MGPPRetrieve.java (modified) (4 diffs)
• service/GS2MGPPSearch.java (modified) (5 diffs)
• service/GS2MGRetrieve.java (modified) (4 diffs)
• service/GS2MGSearch.java (modified) (7 diffs)
• service/GoogleSearch.java.tmp (modified) (2 diffs)
• service/GutBookRetrieve.java (modified) (3 diffs)
• service/IViaProxy.java (modified) (20 diffs)
• service/IViaRetrieve.java (modified) (5 diffs)
• service/IViaSearch.java (modified) (5 diffs)
• service/LuceneSearch.java (modified) (6 diffs)
• service/MapRetrieve.java (modified) (12 diffs)
• service/MapSearch.java (modified) (4 diffs)
• service/OAIPMH.java (modified) (8 diffs)
• service/PhindPhraseBrowse.java (modified) (23 diffs)
• service/RSSRetrieve.java (modified) (5 diffs)
• service/ServiceRack.java (modified) (16 diffs)
• service/ServiceUtil.java (modified) (9 diffs)
• service/SharedSoleneGS2FieldSearch.java (modified) (4 diffs)
• service/TEIRetrieve.java (modified) (3 diffs)
• service/UserTracker.java (modified) (8 diffs)
• service/XMLRetrieve.java (modified) (25 diffs)
• service/XSLTServices.java (modified) (10 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -187 +187 @@
         }
         this.converter = new XMLConverter();
-        this.doc = this.converter.newDOM();
+        this.doc = XMLConverter.newDOM();
 
         // the receptionist -the servlet will talk to this

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -184 +184 @@
             Communicator communicator = null;
             // we need to create the XML to configure the communicator
-            Document site_doc = this.converter.newDOM();
+            Document site_doc = XMLConverter.newDOM();
             Element site_elem = site_doc.createElement(GSXML.SITE_ELEM);
             site_elem.setAttribute(GSXML.TYPE_ATT, remote_site_type);
@@ -359 +359 @@
         
         String verb = getVerb(query);
-        Document response_doc = this.converter.newDOM();
+        Document response_doc = XMLConverter.newDOM();
         Element xml_response = OAIXML.createBasicResponse(response_doc, verb, pairs);
         Element verb_elem = null;
@@ -389 +389 @@
         // The query is valid, we can now
         // compose the request message to the receptionist
-        Document request_doc = this.converter.newDOM();
+        Document request_doc = XMLConverter.newDOM();
         Element xml_message = request_doc.createElement(GSXML.MESSAGE_ELEM);
         Element xml_request = request_doc.createElement(GSXML.REQUEST_ELEM);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/SOAPServerlocalsite.java

@@ -78 +78 @@
         Element new_req = GSXML.duplicateWithNewName(req.getOwnerDocument(), req, tag_name, true);
         Node n = mr.process(new_req);
-        Element r = XMLConverter.nodeToElement(n);
+        Element r = GSXML.nodeToElement(n);
         // add the namespace back on
         //Element new_res = r;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -39 +39 @@
 import org.greenstone.gsdl3.util.SimpleMacroResolver;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.greenstone.gsdl3.util.XMLTransformer;
 import org.w3c.dom.Document;
@@ -95 +96 @@
     {
         super();
-        this.description = this.doc.createElement(GSXML.COLLECTION_ELEM);
+        this.description = this.desc_doc.createElement(GSXML.COLLECTION_ELEM);
     }
 
@@ -463 +464 @@
         }
 
-        if (subset.equals(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER) || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER) || subset.equals("libraryParamList"))
+        if (subset.equals(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER) || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER) || subset.equals(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER))
         {
             configureLocalData(coll_config_elem);
@@ -482 +483 @@
      * @return the result Element - should be <response>
      */
-    protected Element processMessage(Element request)
+  protected Element processMessage(Document result_doc, Element request)
     {
         String type = request.getAttribute(GSXML.TYPE_ATT);
         if (type.equals(GSXML.REQUEST_TYPE_FORMAT_STRING))
         {
-            return processFormatStringRequest(request);
+          return processFormatStringRequest(result_doc, request);
         }
         else if (type.equals(GSXML.REQUEST_TYPE_SECURITY))
         {
-            return processSecurityRequest(request);
+          return processSecurityRequest(result_doc, request);
         }
         else if (type.equals(GSXML.REQUEST_TYPE_FORMAT))
         {
-            Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+
+            Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
             response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
             response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
             if (_globalFormat != null)
             {
-                response.appendChild(this.doc.importNode(_globalFormat, true));
+                response.appendChild(result_doc.importNode(_globalFormat, true));
             }
             return response;
         }
         // unknown type
-        return super.processMessage(request);
-
-    }
-
-    protected Element processSecurityRequest(Element request)
-    {
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        return super.processMessage(result_doc, request);
+
+    }
+
+  protected Element processSecurityRequest(Document result_doc, Element request)
+    {
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_SECURITY);
@@ -523 +525 @@
         ArrayList<String> groups = getPermittedGroups(oid);
 
-        Element groupList = this.doc.createElement(GSXML.GROUP_ELEM + GSXML.LIST_MODIFIER);
+        Element groupList = result_doc.createElement(GSXML.GROUP_ELEM + GSXML.LIST_MODIFIER);
         response.appendChild(groupList);
 
         for (String groupName : groups)
         {
-            Element group = this.doc.createElement(GSXML.GROUP_ELEM);
+            Element group = result_doc.createElement(GSXML.GROUP_ELEM);
             groupList.appendChild(group);
             group.setAttribute(GSXML.NAME_ATT, groupName);
@@ -652 +654 @@
     protected String getFieldValue(String oid, String fieldName)
     {
-        Element metadataMessage = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element metadataRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, this.cluster_name + "/DocumentMetadataRetrieve", new UserContext());
+      Document msg_doc = XMLConverter.newDOM();
+        Element metadataMessage = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        Element metadataRequest = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PROCESS, this.cluster_name + "/DocumentMetadataRetrieve", new UserContext());
         metadataMessage.appendChild(metadataRequest);
 
-        Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element paramList = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         metadataRequest.appendChild(paramList);
 
-        Element param = this.doc.createElement(GSXML.PARAM_ELEM);
+        Element param = msg_doc.createElement(GSXML.PARAM_ELEM);
         paramList.appendChild(param);
 
@@ -665 +668 @@
         param.setAttribute(GSXML.VALUE_ATT, fieldName);
 
-        Element docList = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element docList = msg_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         metadataRequest.appendChild(docList);
 
-        Element doc = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc = msg_doc.createElement(GSXML.DOC_NODE_ELEM);
         docList.appendChild(doc);
 
@@ -685 +688 @@
     }
 
-    protected Element processFormatStringRequest(Element request)
-    {
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+  protected Element processFormatStringRequest(Document result_doc, Element request)
+    {
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT_STRING);
         response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
@@ -834 +837 @@
                 int index;
                 Element elem;
-                // Try importing entire tree to this.doc so we can add and remove children at ease
-                //Node current_node = this.doc.importNode(GSXML.getChildByTagName(config, "CollectionConfig"),true);
                 Node current_node = GSXML.getChildByTagName(config, "CollectionConfig");
                 NodeList current_node_list;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -83 +83 @@
   protected SimpleMacroResolver macro_resolver = null;
 
-    /** container doc for description elements */
-    protected Document doc = null;
+    /** container doc for description elements 
+     only use this document for creating the below stored lists. */
+        protected Document desc_doc = null;
     /** list of services */
     protected Element service_list = null;
@@ -139 +140 @@
         this.converter = new XMLConverter();
         this.macro_resolver = new SimpleMacroResolver();
-        this.doc = this.converter.newDOM();
-        this.description = this.doc.createElement(GSXML.CLUSTER_ELEM);
-        this.display_item_list = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
-        this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        this.library_param_list = this.doc.createElement("libraryParamList");
-        this.service_list = this.doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
-        //this.plugin_item_list = this.doc.createElement(GSXML.PLUGIN_ELEM + GSXML.LIST_MODIFIER);
+        this.desc_doc = XMLConverter.newDOM();
+        this.description = this.desc_doc.createElement(GSXML.CLUSTER_ELEM);
+        this.display_item_list = this.desc_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+        this.metadata_list = this.desc_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        this.library_param_list = this.desc_doc.createElement(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER);
+        this.service_list = this.desc_doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        //this.plugin_item_list = this.desc_doc.createElement(GSXML.PLUGIN_ELEM + GSXML.LIST_MODIFIER);
     }
 
@@ -266 +267 @@
 
         // get the servlet params
-        Element param_list = (Element) GSXML.getChildByTagName(service_cluster_info, "libraryParamList");
+        Element param_list = (Element) GSXML.getChildByTagName(service_cluster_info, GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list != null) {
           if (!addLibraryParams(param_list)) {
@@ -286 +287 @@
             for (int k = 0; k < metanodes.getLength(); k++)
             {
-                this.metadata_list.appendChild(this.doc.importNode(metanodes.item(k), true));
+                this.metadata_list.appendChild(this.desc_doc.importNode(metanodes.item(k), true));
             }
         }
@@ -294 +295 @@
   /** adds an individual metadata element into the list */
   protected boolean addMetadata(String name, String value) {
-    return GSXML.addMetadata(this.doc, this.metadata_list, name, value);
+    return GSXML.addMetadata(this.metadata_list, name, value);
   }
   
@@ -324 +325 @@
                 if (this_item == null)
                 {
-                    this_item = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM);
+                    this_item = this.desc_doc.createElement(GSXML.DISPLAY_TEXT_ELEM);
                     this_item.setAttribute(GSXML.NAME_ATT, name);
                     this.display_item_list.appendChild(this_item);
                 }
 
-                this_item.appendChild(this.doc.importNode(d, true));
+                this_item.appendChild(this.desc_doc.importNode(d, true));
             }
         }
@@ -385 +386 @@
             for (int k = 0; k < paramnodes.getLength(); k++)
             {
-                this.library_param_list.appendChild(this.doc.importNode(paramnodes.item(k), true));
+                this.library_param_list.appendChild(this.desc_doc.importNode(paramnodes.item(k), true));
             }
         }
@@ -396 +397 @@
         service_map.clear();
         service_name_map.clear();
-        this.service_list = this.doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        this.service_list = this.desc_doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
     }
 
   protected void clearLocalData() {
-    this.description = this.doc.createElement(GSXML.CLUSTER_ELEM);
-    this.display_item_list = this.doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
-    this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-    this.library_param_list = this.doc.createElement("libraryParamList");
+    this.description = this.desc_doc.createElement(GSXML.CLUSTER_ELEM);
+    this.display_item_list = this.desc_doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+    this.metadata_list = this.desc_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+    this.library_param_list = this.desc_doc.createElement(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER);
  
   }
@@ -422 +423 @@
         }
 
+        // the xml request to send to the serviceRacks to query what
+        // services they provide
+        // can send same message to each service rack
+        Document doc = XMLConverter.newDOM();
+        Element message = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", new UserContext());
+        message.appendChild(request);
         for (int i = 0; i < nodes.getLength(); i++)
         {
 
-            // the xml request to send to the serviceRack to query what
-            // services it provides
-            Element message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-            Element request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", new UserContext());
-            message.appendChild(request);
 
             Element n = (Element) nodes.item(i);
@@ -499 +502 @@
                     this.service_map.put(service, s);
                     // also add info to the ServiceInfo XML element
-                    this.service_list.appendChild(this.doc.importNode(typenodes.item(j), true));
+                    this.service_list.appendChild(this.desc_doc.importNode(typenodes.item(j), true));
                 }
             }
@@ -532 +535 @@
     public Node process(Node message_node)
     {
-        Element message = this.converter.nodeToElement(message_node);
+        Element message = GSXML.nodeToElement(message_node);
 
         NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
         Document mess_doc = message.getOwnerDocument();
-        Element mainResult = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element mainResult = result_doc.createElement(GSXML.MESSAGE_ELEM);
         if (requests.getLength() == 0)
         {
@@ -560 +564 @@
             if (to.equals(""))
             { // this command is for me
-                Element response = processMessage(request);
+              Element response = processMessage(result_doc, request);
                 mainResult.appendChild(response);
 
@@ -606 +610 @@
                     from = GSPath.prependLink(from, this.cluster_name);
                     response.setAttribute(GSXML.FROM_ATT, from);
-                    mainResult.appendChild(this.doc.importNode(response, true));
+                    mainResult.appendChild(result_doc.importNode(response, true));
                 }
 
@@ -622 +626 @@
      * @return the result Element - should be <response>
      */
-    protected Element processMessage(Element request)
-    {
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+  protected Element processMessage(Document result_doc, Element request)
+    {
+
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
         String type = request.getAttribute(GSXML.TYPE_ATT);
@@ -633 +638 @@
         {
             // create the collection element
-            Element description = (Element) this.description.cloneNode(false);
+          Element description = (Element) result_doc.importNode(this.description, false);
             // set collection type : mg, mgpp, lucene or solr
             //description.setAttribute(GSXML.TYPE_ATT, col_type);
@@ -644 +649 @@
             {
                 addAllDisplayInfo(description, lang);
-                description.appendChild(this.service_list);
-                description.appendChild(this.metadata_list);
-                description.appendChild(this.library_param_list);
+                description.appendChild(result_doc.importNode(this.service_list, true));
+                description.appendChild(result_doc.importNode(this.metadata_list, true));
+                description.appendChild(result_doc.importNode(this.library_param_list, true));
                 //description.appendChild(this.plugin_item_list);
                 return response;
@@ -663 +668 @@
                     if (info.equals(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER))
                     {
-                        description.appendChild(this.service_list);
+                      description.appendChild(result_doc.importNode(this.service_list, true));
                     }
                     else if (info.equals(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER))
                     {
-                        description.appendChild(this.metadata_list);
+                      description.appendChild(result_doc.importNode(this.metadata_list, true));
                     }
                     else if (info.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
@@ -673 +678 @@
                         addAllDisplayInfo(description, lang);
                     }
-                    else if (info.equals("libraryParamlist"))
+                    else if (info.equals(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER))
                     {
-                      description.appendChild(this.library_param_list);
+                      description.appendChild(result_doc.importNode(this.library_param_list, true));
                     }
                 }
@@ -778 +783 @@
     protected Element processSystemRequest(Element request)
     {
-
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_SYSTEM);
@@ -801 +806 @@
                     if (this.configure())
                     {
-                        Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, this.cluster_name + " reconfigured");
+                        Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, this.cluster_name + " reconfigured");
                         response.appendChild(s);
 
@@ -807 +812 @@
                     else
                     {
-                        Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, this.cluster_name + " could not be reconfigured");
+                        Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, this.cluster_name + " could not be reconfigured");
                         response.appendChild(s);
                     }
@@ -813 +818 @@
                 else if (this.configureSubset(subset))
                 {
-                    Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, this.cluster_name + " " + subset + " reconfigured");
+                    Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, this.cluster_name + " " + subset + " reconfigured");
                     response.appendChild(s);
                 }
                 else
                 {
-                    Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, this.cluster_name + " " + subset + " could not be reconfigured");
+                    Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, this.cluster_name + " " + subset + " could not be reconfigured");
                     response.appendChild(s);
                 }
@@ -828 +833 @@
             if (action.equals(GSXML.SYSTEM_TYPE_ACTIVATE))
             {
-                Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, "activate action not yet implemented - does it even make sense in this context??");
+                Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, "activate action not yet implemented - does it even make sense in this context??");
                 response.appendChild(s);
             }
@@ -846 +851 @@
                     message = "Can't deactivate " + module_type + " type modules!";
                 }
-                Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, message);
+                Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, message);
                 response.appendChild(s);
             }
@@ -897 +902 @@
         else if (subset.equals(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER))
         {
-            this.metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+            this.metadata_list = this.desc_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
             Element metadata_list = (Element) GSXML.getChildByTagName(cluster_config_elem, GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
             return addMetadata(metadata_list);
@@ -923 +928 @@
     protected boolean addAllDisplayInfo(Element description, String lang)
     {
-
+      Document doc = description.getOwnerDocument();
         NodeList items = this.display_item_list.getChildNodes();
         for (int i = 0; i < items.getLength(); i++)
@@ -940 +945 @@
                 new_m = (Element) GSXML.getChildByTagName(m, GSXML.DISPLAY_TEXT_ELEM);
             }
-            description.appendChild(new_m.cloneNode(true));
+            description.appendChild(doc.importNode(new_m, true));
         }
         return true;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java

@@ -30 +30 @@
                       Element build_config_xml){
 
-    // metadata
+    // add metadata to stored metadata list from collConfig and buildConfig
     Element meta_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     addMetadata(meta_list);
@@ -36 +36 @@
     addMetadata(meta_list);
 
-    meta_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-    GSXML.addMetadata(this.doc, meta_list, "httpPath", this.site_http_address+"/collect/"+this.cluster_name);
-    addMetadata(meta_list);
+    addMetadata("httpPath", this.site_http_address+"/collect/"+this.cluster_name);
 
     // display stuff
@@ -47 +45 @@
     }
 
-    //plugin stuff
-    // Element import_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.IMPORT_ELEM);
-    // if (import_list != null)
-    // {
-    //  Element plugin_list = (Element)GSXML.getChildByTagName(import_list, GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER);
-    //  addPlugins(plugin_list);
-    // }
-    
     // are we a private collection??
     if (this.metadata_list != null) {
@@ -69 +59 @@
     Element config_doc_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
     if (config_doc_list != null) {
-        document_list = (Element)this.doc.importNode(config_doc_list, true);
+        document_list = (Element)desc_doc.importNode(config_doc_list, true);
     } else {
-        document_list = this.doc.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+        document_list = desc_doc.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
     }
     return true;
@@ -82 +72 @@
      * @return the result Element - should be <response>
      */
-    protected Element processMessage(Element request) {
+  protected Element processMessage(Document response_doc, Element request) {
 
-    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element response = response_doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
     String type = request.getAttribute(GSXML.TYPE_ATT);
@@ -92 +82 @@
     if (type.equals(GSXML.REQUEST_TYPE_DESCRIBE)) {
         // create the collection element
-        Element description = (Element)this.description.cloneNode(false);
+      Element description = (Element)response_doc.importNode(this.description, false);
         response.appendChild(description);
         // check the param list
@@ -98 +88 @@
         if (param_list == null) {
         addAllDisplayInfo(description, lang);
-        description.appendChild(this.service_list);
-        description.appendChild(this.metadata_list);
-        description.appendChild(this.library_param_list);
-        description.appendChild(this.document_list);
+        description.appendChild(response_doc.importNode(this.service_list, true));
+        description.appendChild(response_doc.importNode(this.metadata_list, true));
+        description.appendChild(response_doc.importNode(this.library_param_list, true));
+        description.appendChild(response_doc.importNode(this.document_list, true));
         return response;
         }
@@ -114 +104 @@
             String info = param.getAttribute(GSXML.VALUE_ATT);
             if (info.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
-            description.appendChild(this.service_list);
+            description.appendChild(response_doc.importNode(this.service_list, true));
             } else if (info.equals(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER)) {
-            description.appendChild(metadata_list);
+            description.appendChild(response_doc.importNode(metadata_list, true));
             } else if (info.equals(GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER)) {
             addAllDisplayInfo(description, lang);
             
             } else if (info.equals(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER)) {
-            description.appendChild(this.document_list);
-            // } else if (info.equals(GSXML.PLUGIN_ELEM+GSXML.LIST_MODIFIER)) {
-            //  description.appendChild(this.plugin_item_list);
-            // }
-            } else if (info.equals("libraryParamlist")) {
+            description.appendChild(response_doc.importNode(this.document_list, true));
+            } else if (info.equals(GSXML.LIBRARY_PARAM_ELEM+GSXML.LIST_MODIFIER)) {
               
-              description.appendChild(this.library_param_list);
+            description.appendChild(response_doc.importNode(this.library_param_list, true));
             }
         
@@ -134 +121 @@
         return response;
     }
-    return super.processMessage(request);
+    return super.processMessage(response_doc, request);
         
     }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

@@ -96 +96 @@
     public Node process(Node message_node) {
     
-    Element message = XMLConverter.nodeToElement(message_node);
+    Element message = GSXML.nodeToElement(message_node);
 
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

@@ -29 +29 @@
     {
         super.addExtraInfo(page);
-
+        // the document for the page
+        Document doc = page.getOwnerDocument();
+        // a new document to create messages to send to MR
+        Document msg_doc = XMLConverter.newDOM();
         Element page_request = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
         // if it is a system request, then we don't bother with this.
@@ -70 +73 @@
         if (this.language_list != null)
         {
-            page_response.appendChild(this.language_list);
+          page_response.appendChild(doc.importNode(this.language_list, true));
         }
         Element coll_description = (Element) GSXML.getChildByTagName(page_response, GSXML.COLLECTION_ELEM);
@@ -80 +83 @@
         if (coll_description == null)
         {
-
+          logger.debug("getting the coll description");
             // we dont have one yet - get it
-            Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-            Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext);
+
+            Element coll_about_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+            Element coll_about_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, userContext);
             coll_about_message.appendChild(coll_about_request);
 
@@ -104 +108 @@
             }
             // have found one, append it to the page response
-            coll_description = (Element) this.doc.importNode(coll_description, true);
+            coll_description = (Element) doc.importNode(coll_description, true);
             page_response.appendChild(coll_description);
             get_service_description = true;
         }
+        
 
         // have got a coll description
@@ -151 +156 @@
 
         // we will send all the requests in a single message
-        Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element info_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
         for (int i = 0; i < services.getLength(); i++)
         {
@@ -157 +162 @@
             String name = c.getAttribute(GSXML.NAME_ATT);
             String address = GSPath.appendLink(coll_name, name);
-            Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, address, userContext);
+            Element info_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, address, userContext);
             //Element req_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
             //req_param_list.appendChild(GSXML.createParameter(this.doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER));

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -235 +235 @@
     {
 
-      Document doc = this.converter.newDOM();
-        Element message = this.converter.nodeToElement(message_node);
+      Document doc = XMLConverter.newDOM();
+        Element message = GSXML.nodeToElement(message_node);
 
         // check that its a correct message tag
@@ -464 +464 @@
 
         // load up the services: serviceRackList
-        Document doc = this.converter.newDOM();
+        Document doc = XMLConverter.newDOM();
         this.service_list = doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
         Element service_rack_list_elem = (Element) GSXML.getChildByTagName(config_info, GSXML.SERVICE_CLASS_ELEM + GSXML.LIST_MODIFIER);
@@ -512 +512 @@
             return true;
         }
-        Document doc = this.converter.newDOM();
+        Document doc = XMLConverter.newDOM();
         Element service_message = doc.createElement(GSXML.MESSAGE_ELEM);
         Element service_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", new UserContext());
@@ -916 +916 @@
 
         logger.info(" getting info from site:" + site_name);
-        Document doc = this.converter.newDOM();
+        Document doc = XMLConverter.newDOM();
         Element info_request = doc.createElement(GSXML.MESSAGE_ELEM);
         Element req = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, "", new UserContext());
@@ -923 +923 @@
         // process the message
         Node info_response_node = comm.process(info_request);
-        Element info_response = converter.nodeToElement(info_response_node);
+        Element info_response = GSXML.nodeToElement(info_response_node);
 
         if (info_response == null)
@@ -1083 +1083 @@
 
         // message for self, should be type=describe/configure at this stage
-            Document doc = this.converter.newDOM();
+            Document doc = XMLConverter.newDOM();
         String type = req.getAttribute(GSXML.TYPE_ATT);
         Element response = doc.createElement(GSXML.RESPONSE_ELEM);
@@ -1334 +1334 @@
     protected Element modifyMessages(Element request, Element message, Element result)
     {
-      Document doc = this.converter.newDOM();
+      Document doc = XMLConverter.newDOM();
         Element response = doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, "");

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -178 +178 @@
     // First, we get a list of all the OAI enabled collections
     // We get this by sending a listSets request to the MR
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element message = doc.createElement(GSXML.MESSAGE_ELEM);
     
@@ -228 +228 @@
       return false;
     }
-    Document listsets_doc = this.converter.newDOM();
+    Document listsets_doc = XMLConverter.newDOM();
     Element listsets_element = listsets_doc.createElement(OAIXML.LIST_SETS);
     this.listsets_response = getMessage(listsets_doc, listsets_element);
@@ -285 +285 @@
   protected void resetMessageRouter() {
     // we just need to send a configure request to MR
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element mr_request_message = doc.createElement(GSXML.MESSAGE_ELEM);
     Element mr_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_SYSTEM, "", null);
@@ -321 +321 @@
     logger.error("OAIReceptionist received request");
 
-    Element message = this.converter.nodeToElement(message_node);
+    Element message = GSXML.nodeToElement(message_node);
     logger.error(this.converter.getString(message));
 
@@ -413 +413 @@
     valid_strs.add(OAIXML.RESUMPTION_TOKEN);
     
-    Document result_doc = this.converter.newDOM();
+    Document result_doc = XMLConverter.newDOM();
     Element result_element = result_doc.createElement(verb);
     boolean result_token_needed = false; // does this result need to include a
@@ -538 +538 @@
 
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element mr_msg = doc.createElement(GSXML.MESSAGE_ELEM);
     Element mr_req = doc.createElement(GSXML.REQUEST_ELEM);
@@ -767 +767 @@
     NodeList params = GSXML.getChildrenByTagName(req, GSXML.PARAM_ELEM);
     Element param = null;
-    Document lmf_doc = this.converter.newDOM();
+    Document lmf_doc = XMLConverter.newDOM();
     if(params.getLength() == 0) {
       //this is requesting metadata formats for the whole repository
@@ -852 +852 @@
     //Now send the request to the message router to process
     Node result_node = mr.process(message);
-    return converter.nodeToElement(result_node);
+    return GSXML.nodeToElement(result_node);
   }
   
@@ -877 +877 @@
       return getMessage(this.identify_response.getOwnerDocument(), this.identify_response);
     }
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element identify = doc.createElement(OAIXML.IDENTIFY);
     //do the repository name
@@ -979 +979 @@
     *  Exceptions: badArgument; cannotDisseminateFormat; idDoesNotExist
     */ 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element get_record = doc.createElement(OAIXML.GET_RECORD);
 
@@ -1031 +1031 @@
     msg.appendChild(doc.importNode(req, true));
     Node result_node = mr.process(msg);
-    return converter.nodeToElement(result_node);
+    return GSXML.nodeToElement(result_node);
   }
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -33 +33 @@
     protected HashMap<String, Object> config_params = null;
     /** container Document to create XML Nodes */
-    protected Document doc = null;
+    //protected Document doc = null;
 
     /** a converter class to parse XML and create Docs */
@@ -54 +54 @@
     {
         this.converter = new XMLConverter();
-        this.doc = this.converter.newDOM();
+        //this.doc = XMLConverter.newDOM();
         this.action_map = new HashMap<String, Action>();
     }
@@ -182 +182 @@
     public Node process(Node message_node)
     {
-        Element message = this.converter.nodeToElement(message_node);
+        Element message = GSXML.nodeToElement(message_node);
 
         // get the request out of the message - assume that there is only one
@@ -242 +242 @@
         preProcessRequest(request);
         // set up the page
-        Element page = this.doc.createElement(GSXML.PAGE_ELEM);
+        Document doc = XMLConverter.newDOM();
+        Element page = doc.createElement(GSXML.PAGE_ELEM);
         page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
         // just in case these namespaces end up in the page and we want to display the XML
@@ -273 +274 @@
 
         // the request is part of the page
-        page.appendChild(GSXML.duplicateWithNewName(this.doc, request, GSXML.PAGE_REQUEST_ELEM, true));
+        page.appendChild(GSXML.duplicateWithNewName(doc, request, GSXML.PAGE_REQUEST_ELEM, true));
         // add the response too
-        Element page_response = GSXML.duplicateWithNewName(this.doc, (Element) GSXML.getChildByTagName(action_response, GSXML.RESPONSE_ELEM), GSXML.PAGE_RESPONSE_ELEM, true);
+        Element page_response = GSXML.duplicateWithNewName(doc, (Element) GSXML.getChildByTagName(action_response, GSXML.RESPONSE_ELEM), GSXML.PAGE_RESPONSE_ELEM, true);
         page.appendChild(page_response);
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -179 +179 @@
         else
         {
-            this.language_list = (Element) this.doc.importNode(lang_list, true);
+          //this.language_list = (Element) this.doc.importNode(lang_list, true);
+          this.language_list = lang_list;
         }
 
@@ -380 +381 @@
         ArrayList<File> stylesheets = GSFile.getStylesheetFiles(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, name);
 
-        Element extraMetadataList = this.doc.createElement(GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
+        Document doc = XMLConverter.newDOM();
+        Element extraMetadataList = doc.createElement(GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
         for (File stylesheet : stylesheets)
         {
@@ -389 +391 @@
                 for (String metadataString : requiredMetadata)
                 {
-                    Element metadataElem = this.doc.createElement(GSXML.EXTRA_METADATA);
+                    Element metadataElem = doc.createElement(GSXML.EXTRA_METADATA);
                     metadataElem.setAttribute(GSXML.NAME_ATT, metadataString);
                     extraMetadataList.appendChild(metadataElem);
@@ -701 +703 @@
         if (style_doc == null)
         {
-            String errorPage = this.converter.getParseErrorMessage();
-            if (errorPage != null)
-            {
-                return XMLTransformer.constructErrorXHTMLPage("Cannot parse the xslt file\n" + errorPage);
-            }
+          // this getParseErrorMessage may have originally worked, but now it doesn't.
+          // //String errorPage = this.converter.getParseErrorMessage();
+          //    if (errorPage != null)
+          //    {
+          //      return XMLTransformer.constructErrorXHTMLPage("Cannot parse the xslt file\n");// + errorPage);
+          //    }
             return page;
         }
@@ -712 +715 @@
         // the paths right if you have paths relative to the document root
         // eg /page.
-        Document doc = this.converter.newDOM();
+        Document doc = XMLConverter.newDOM();
         doc.appendChild(doc.importNode(page, true));
         Element page_response = (Element) GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM);
@@ -743 +746 @@
             if (configStylesheet_doc != null)
             {
-                Document format_doc = this.converter.newDOM();
+                Document format_doc = XMLConverter.newDOM();
                 format_doc.appendChild(format_doc.importNode(format_elem, true));
 

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

@@ -29 +29 @@
 import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.OID;
+import org.greenstone.gsdl3.util.XMLConverter;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -113 +115 @@
 
         // short_service_info_ - the browse one
-        Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element cb_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         cb_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_BROWSE);
         cb_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_SERVICE);
@@ -119 +121 @@
 
         // metadata retrieval for the browsing  
-        Element cbmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element cbmr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         cbmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         cbmr_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_METADATA_SERVICE);
@@ -125 +127 @@
 
         // the format info
-        Element cb_format_info = this.doc.createElement(GSXML.FORMAT_ELEM);
+        Element cb_format_info = this.desc_doc.createElement(GSXML.FORMAT_ELEM);
         boolean format_found = false;
 
@@ -132 +134 @@
         if (def_format != null)
         {
-            cb_format_info.appendChild(GSXML.duplicateWithNewName(this.doc, def_format, GSXML.DEFAULT_ELEM, true));
+            cb_format_info.appendChild(GSXML.duplicateWithNewName(this.desc_doc, def_format, GSXML.DEFAULT_ELEM, true));
             format_found = true;
         }
@@ -142 +144 @@
             Element cl = (Element) classifiers.item(i);
 
-            Element new_cl = (Element) this.doc.importNode(cl, false); // just import this node, not the children
+            Element new_cl = (Element) this.desc_doc.importNode(cl, false); // just import this node, not the children
 
             // get the format info out, and put inside a classifier element
@@ -153 +155 @@
                 for (int j = 0; j < elems.getLength(); j++)
                 {
-                    format_cl.appendChild(this.doc.importNode(elems.item(j), true));
+                    format_cl.appendChild(this.desc_doc.importNode(elems.item(j), true));
                 }
                 cb_format_info.appendChild(format_cl);
@@ -184 +186 @@
 
         // Base line for document (might be overriden by sub-classes)
-        gs_doc = new BasicDocument(this.doc, this.default_document_type);
+        gs_doc = new BasicDocument(this.default_document_type);
 
         return true;
     }
 
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
 
@@ -202 +204 @@
             }
 
-            Element cb_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element cb_service = doc.createElement(GSXML.SERVICE_ELEM);
             cb_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_BROWSE);
             cb_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_SERVICE);
-            cb_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(CLASSIFIER_SERVICE + ".name", lang)));
-            cb_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(CLASSIFIER_SERVICE + ".description", lang)));
-
-            Element cl_list = this.doc.createElement(GSXML.CLASSIFIER_ELEM + GSXML.LIST_MODIFIER);
+            cb_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(CLASSIFIER_SERVICE + ".name", lang)));
+            cb_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(CLASSIFIER_SERVICE + ".description", lang)));
+
+            Element cl_list = doc.createElement(GSXML.CLASSIFIER_ELEM + GSXML.LIST_MODIFIER);
             cb_service.appendChild(cl_list);
             NodeList classifiers = class_list.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
@@ -214 +216 @@
             {
                 Element cl = (Element) classifiers.item(i);
-                Element new_cl = (Element) this.doc.importNode(cl, false); // just import this node, not the children
+                Element new_cl = (Element) doc.importNode(cl, false); // just import this node, not the children
 
                 //String content = cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT);
@@ -236 +238 @@
                 }
 
-                Element cl_name = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, text);
+                Element cl_name = GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, text);
                 new_cl.appendChild(cl_name);
 
@@ -248 +250 @@
                 String[] array = { meta_name };
                 String description = getTextString("ClassifierBrowse.classifier_help", lang, array);
-                Element cl_desc = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);
+                Element cl_desc = GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);
                 new_cl.appendChild(cl_desc);
 
@@ -260 +262 @@
         {
 
-            Element cbmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element cbmr_service = doc.createElement(GSXML.SERVICE_ELEM);
             cbmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             cbmr_service.setAttribute(GSXML.NAME_ATT, CLASSIFIER_METADATA_SERVICE);
@@ -348 +350 @@
 
         // Create a new (empty) result message
-        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, CLASSIFIER_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -424 +427 @@
 
         // the node list to hold the results
-        Element node_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element node_list = result_doc.createElement(GSXML.CLASS_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(node_list);
 
@@ -432 +435 @@
         {
             // Add the document to the list
-            Element node = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
+            Element node = result_doc.createElement(GSXML.CLASS_NODE_ELEM);
             node_list.appendChild(node);
 
@@ -450 +453 @@
             if (want_info)
             {
-                Element node_info_elem = this.doc.createElement("nodeStructureInfo");
+                Element node_info_elem = result_doc.createElement("nodeStructureInfo");
                 node.appendChild(node_info_elem);
 
@@ -459 +462 @@
                     if (info_value != null)
                     {
-                        Element info_elem = this.doc.createElement("info");
+                        Element info_elem = result_doc.createElement("info");
                         info_elem.setAttribute(GSXML.NAME_ATT, info_type);
                         info_elem.setAttribute(GSXML.VALUE_ATT, info_value);
@@ -470 +473 @@
             {
                 // all structure info goes into a nodeStructure elem
-                Element structure_elem = this.doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
+                Element structure_elem = result_doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
                 node.appendChild(structure_elem);
 
@@ -476 +479 @@
                 {
                     String root_id = getRootId(node_id);
-                    Element root_node = createClassifierNode(root_id); //, true, false);
+                    Element root_node = createClassifierNode(result_doc, root_id); //, true, false);
                     addDescendants(root_node, root_id, true);
                     structure_elem.appendChild(root_node);
@@ -483 +486 @@
 
                 // Add the requested structure information
-                Element base_node = createClassifierNode(node_id); //, false, false);
+                Element base_node = createClassifierNode(result_doc, node_id); //, false, false);
 
                 //Ancestors: continually add parent nodes until the root is reached
@@ -496 +499 @@
                         if (parent_id == null)
                             break; // no parent
-                        Element parent_node = createClassifierNode(parent_id);
+                        Element parent_node = createClassifierNode(result_doc, parent_id);
                         parent_node.appendChild(top_node);
                         current_id = parent_id;//.getAttribute(GSXML.NODE_ID_ATT);
@@ -508 +511 @@
                     if (parent_id != null)
                     {
-                        Element parent_node = createClassifierNode(parent_id);
+                      Element parent_node = createClassifierNode(result_doc, parent_id);
                         parent_node.appendChild(base_node);
                         top_node = parent_node;
@@ -567 +570 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         String lang = request.getAttribute(GSXML.LANG_ATT);
@@ -602 +606 @@
         }
 
-        Element node_list = this.doc.createElement(GSXML.CLASS_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element node_list = result_doc.createElement(GSXML.CLASS_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(node_list);
 
@@ -620 +624 @@
 
             // Add the document to the results list
-            Element new_node = (Element) this.doc.importNode(request_node, false);
+            Element new_node = (Element) result_doc.importNode(request_node, false);
             node_list.appendChild(new_node);
 
@@ -632 +636 @@
             }
 
-            Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list);
+            Element metadata_list = getMetadataList(result_doc, node_id, all_metadata, metadata_names_list);
             new_node.appendChild(metadata_list);
         }
@@ -640 +644 @@
 
     /** Creates a classifier node */
-    protected Element createClassifierNode(String node_id)
-    {
-        Element node = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
+  protected Element createClassifierNode(Document doc, String node_id)
+    {
+        Element node = doc.createElement(GSXML.CLASS_NODE_ELEM);
         node.setAttribute(GSXML.NODE_ID_ATT, node_id);
         node.setAttribute(GSXML.CHILD_TYPE_ATT, getChildType(node_id));
@@ -652 +656 @@
      * <docNode nodeId='xxx' nodeType='leaf' docType='hierarchy'/>
      */
-    protected Element createDocNode(String node_id)
-    {
-      return this.gs_doc.createDocNode(node_id);
+  protected Element createDocNode(Document doc, String node_id)
+    {
+      return this.gs_doc.createDocNode(doc, node_id);
     }
 
@@ -675 +679 @@
         if (child_ids == null)
             return;
+        Document doc = node.getOwnerDocument();
         for (int i = 0; i < child_ids.size(); i++)
         {
@@ -681 +686 @@
             if (isDocumentId(child_id))
             {
-                child_elem = createDocNode(child_id);
+              child_elem = createDocNode(doc, child_id);
             }
             else
             {
-                child_elem = createClassifierNode(child_id);
+              child_elem = createClassifierNode(doc, child_id);
             }
             node.appendChild(child_elem);
@@ -784 +789 @@
      * returns all available metadata, otherwise just returns requested metadata
      */
-    abstract protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names);
+  abstract protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names);
 
     /**

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

@@ -31 +31 @@
 import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.GSConstants;
+import org.greenstone.gsdl3.util.XMLConverter;
 
 // XML classes
@@ -104 +105 @@
         if (does_structure)
         {
-            Element dsr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element dsr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             dsr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             dsr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
@@ -112 +113 @@
         if (does_metadata)
         {
-            Element dmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element dmr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             dmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             dmr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -120 +121 @@
         if (does_content)
         {
-            Element dcr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element dcr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             dcr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             dcr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
@@ -131 +132 @@
         if (display_format != null)
         {
-            this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
+            this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.desc_doc.importNode(display_format, true));
             // should we keep a copy?
             // check for docType option.
@@ -171 +172 @@
 
         // Base line for document (might be overriden by sub-classes)
-        gs_doc = new BasicDocument(this.doc, this.default_document_type);
+        gs_doc = new BasicDocument(this.default_document_type);
 
         return true;
     }
 
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
 
         // these ones are probably never called, but put them here just in case
-        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, service_id);
@@ -190 +191 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
         String lang = request.getAttribute(GSXML.LANG_ATT);
         result.setAttribute(GSXML.FROM_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -204 +206 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentMetadataRetrieve: missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -232 +234 @@
         if (!all_metadata && metadata_names_list.size() == 0)
         {
-            GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: no metadata names found in the " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentMetadataRetrieve: no metadata names found in the " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -240 +242 @@
         if (request_node_list == null)
         {
-            GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: missing " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentMetadataRetrieve: missing " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
 
         // copy the request doc node list to the response
-        Element response_node_list = (Element) this.doc.importNode(request_node_list, true);
+        Element response_node_list = (Element) result_doc.importNode(request_node_list, true);
         result.appendChild(response_node_list);
 
         // use the copied list so that we add the metadata into the copy
         // are we just adding metadata for the top level nodes? or can we accept a hierarchy here???
-        NodeList request_nodes = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
-        if (request_nodes.getLength() == 0)
-        {
-            GSXML.addError(this.doc, result, "DocumentMetadataRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+        NodeList doc_nodes = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
+        if (doc_nodes.getLength() == 0)
+        {
+            GSXML.addError(result, "DocumentMetadataRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
 
         // Whew, now we have checked (almost) all the syntax of the request, now we can process it.
-        for (int i = 0; i < request_nodes.getLength(); i++)
-        {
-            Element request_node = (Element) request_nodes.item(i);
-            String node_id = request_node.getAttribute(GSXML.NODE_ID_ATT);
+        for (int i = 0; i < doc_nodes.getLength(); i++)
+        {
+            Element doc_node = (Element) doc_nodes.item(i);
+            String node_id = doc_node.getAttribute(GSXML.NODE_ID_ATT);
             boolean is_href_id = false;
             if (node_id.equals(""))
             {
-                node_id = getGreenstoneIdFromHref(request_node);
+                node_id = getGreenstoneIdFromHref(doc_node);
                 if (node_id == null)
                 {
                     // **** TODO, is this good enough???
-                    request_node.setAttribute("external_link", "true");
+                    doc_node.setAttribute("external_link", "true");
                     continue;
                 }
@@ -287 +289 @@
             try
             {
-              Element metadata_list = getMetadataList(node_id, all_metadata, metadata_names_list, lang);
+              Element metadata_list = getMetadataList(result_doc, node_id, all_metadata, metadata_names_list, lang);
                 if (metadata_list != null)
                 {
-                    request_node.appendChild(metadata_list);
+                    doc_node.appendChild(metadata_list);
                 }
             }
             catch (GSException e)
             {
-                GSXML.addError(this.doc, result, e.getMessage(), e.getType());
+                GSXML.addError(result, e.getMessage(), e.getType());
                 if (e.getType().equals(GSXML.ERROR_TYPE_SYSTEM))
                 {
@@ -312 +314 @@
 
         // Create a new (empty) result message
-        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, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -328 +331 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, "DocumentStructureRetrieve: missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentStructureRetrieve: missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -336 +339 @@
         if (query_doc_list == null)
         {
-            GSXML.addError(this.doc, result, "DocumentStructureRetrieve: missing " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentStructureRetrieve: missing " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
 
         // copy the doc_list to the response
-        Element response_node_list = (Element) this.doc.importNode(query_doc_list, true);
+        Element response_node_list = (Element) result_doc.importNode(query_doc_list, true);
         result.appendChild(response_node_list);
 
@@ -348 +351 @@
         if (node_list.getLength() == 0)
         {
-            GSXML.addError(this.doc, result, "DocumentStructureRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentStructureRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -407 +410 @@
             want_children = false;
 
+        // for each of the doc nodes, get the required info
+        // these nodes are part of result_doc - can use that to create Elements
         for (int i = 0; i < node_list.getLength(); i++)
         {
-            Element doc = (Element) node_list.item(i);
-
-            String doc_id = doc.getAttribute(GSXML.NODE_ID_ATT);
+            Element doc_node = (Element) node_list.item(i);
+
+            String doc_id = doc_node.getAttribute(GSXML.NODE_ID_ATT);
             boolean is_href_id = false;
             if (doc_id.equals(""))
             {
-                doc_id = getGreenstoneIdFromHref(doc);
+                doc_id = getGreenstoneIdFromHref(doc_node);
                 if (doc_id == null)
                 {
                     // **** TODO, is this good enough???
-                    doc.setAttribute("external_link", "true");
+                    doc_node.setAttribute("external_link", "true");
                     continue;
                 }
-                doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+                doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
             }
 
@@ -428 +433 @@
             {
                 doc_id = translateId(doc_id);
-                doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
+                doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
             }
 
@@ -438 +443 @@
             if (want_info)
             {
-                Element node_info_elem = this.doc.createElement("nodeStructureInfo");
-                doc.appendChild(node_info_elem);
+              Element node_info_elem = result_doc.createElement("nodeStructureInfo");
+                doc_node.appendChild(node_info_elem);
 
                 for (int j = 0; j < info_types.size(); j++)
@@ -447 +452 @@
                     if (info_value != null)
                     {
-                        Element info_elem = this.doc.createElement("info");
+                        Element info_elem = result_doc.createElement("info");
                         info_elem.setAttribute(GSXML.NAME_ATT, info_type);
                         info_elem.setAttribute(GSXML.VALUE_ATT, info_value);
@@ -458 +463 @@
             {
                 // all structure info goes into a nodeStructure elem
-                Element structure_elem = this.doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
-                doc.appendChild(structure_elem);
+                Element structure_elem = result_doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
+                doc_node.appendChild(structure_elem);
 
                 if (want_entire_structure)
                 {
                     String root_id = getRootId(doc_id);
-                    Element root_node = createDocNode(root_id); //, true, false);
+                    Element root_node = createDocNode(result_doc, root_id); //, true, false);
                     addDescendants(root_node, root_id, true);
                     structure_elem.appendChild(root_node);
@@ -471 +476 @@
 
                 // Add the requested structure information
-                Element base_node = createDocNode(doc_id); //, false, false);
+                Element base_node = createDocNode(result_doc, doc_id); //, false, false);
 
                 //Ancestors: continually add parent nodes until the root is reached
@@ -484 +489 @@
                         if (parent_id == null)
                             break; // no parent
-                        Element parent_node = createDocNode(parent_id);
+                        Element parent_node = createDocNode(result_doc, parent_id);
                         parent_node.appendChild(top_node);
                         current_id = parent_id;//.getAttribute(GSXML.NODE_ID_ATT);
@@ -496 +501 @@
                     if (parent_id != null)
                     {
-                        Element parent_node = createDocNode(parent_id);
+                      Element parent_node = createDocNode(result_doc, parent_id);
                         parent_node.appendChild(base_node);
                         top_node = parent_node;
@@ -541 +546 @@
     {
         // Create a new (empty) result message
-        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, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -564 +570 @@
 
         // copy the request doc node list to the response
-        Element response_node_list = (Element) this.doc.importNode(query_doc_list, true);
+        Element response_node_list = (Element) result_doc.importNode(query_doc_list, true);
         result.appendChild(response_node_list);
 
-        NodeList request_nodes = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
-        if (request_nodes.getLength() == 0)
-        {
-            GSXML.addError(this.doc, result, "DocumentContentRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
-            return result;
-        }
-
-        //Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        NodeList doc_nodes = GSXML.getChildrenByTagName(response_node_list, GSXML.DOC_NODE_ELEM);
+        if (doc_nodes.getLength() == 0)
+        {
+            GSXML.addError(result, "DocumentContentRetrieve: no " + GSXML.DOC_NODE_ELEM + " found in the " + GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            return result;
+        }
+
+        //Element doc_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         //result.appendChild(doc_list);
 
@@ -583 +589 @@
         //String[] is_externals = GSXML.getAttributeValuesFromList(query_doc_list, "externalURL");
 
-        for (int i = 0; i < request_nodes.getLength(); i++)
-        {
-            Element request_node = (Element) request_nodes.item(i);
-            String node_id = request_node.getAttribute(GSXML.NODE_ID_ATT);
+        for (int i = 0; i < doc_nodes.getLength(); i++)
+        {
+            Element doc_node = (Element) doc_nodes.item(i);
+            String node_id = doc_node.getAttribute(GSXML.NODE_ID_ATT);
             
             if (node_id.equals(""))
             {
-                node_id = getGreenstoneIdFromHref(request_node);
+                node_id = getGreenstoneIdFromHref(doc_node);
                 if (node_id == null)
                 {
                     // **** TODO, is this good enough???
-                    request_node.setAttribute("external_link", "true");
+                    doc_node.setAttribute("external_link", "true");
                     continue;
                 }
-                request_node.setAttribute(GSXML.NODE_ID_ATT, node_id);
+                doc_node.setAttribute(GSXML.NODE_ID_ATT, node_id);
             }
 
@@ -612 +618 @@
             try
             {
-                Element node_content = getNodeContent(node_id, lang);
+              Element node_content = getNodeContent(result_doc, node_id, lang);
                 if (node_content != null)
                 {
-                    request_node.appendChild(node_content);
+                  doc_node.appendChild(node_content);
                 }
             }
             catch (GSException e)
             {
-                GSXML.addError(this.doc, result, e.getMessage());
+                GSXML.addError(result, e.getMessage());
                 return result;
             }
@@ -631 +637 @@
      * <docNode nodeId='xxx' nodeType='leaf' docType='hierarchy'/>
      */
-    protected Element createDocNode(String node_id)
-    {
-        return this.gs_doc.createDocNode(node_id);
+  protected Element createDocNode(Document doc, String node_id)
+    {
+      return this.gs_doc.createDocNode(doc, node_id);
     }
 
@@ -759 +765 @@
      * <metadataList><metadata name="xxx">value</metadata></metadataList>
      */
-  abstract protected Element getMetadataList(String doc_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException;
+  abstract protected Element getMetadataList(Document doc, String doc_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException;
 
     /**
@@ -765 +771 @@
      * <nodeContent>text content or other elements</nodeContent> can return
      */
-    abstract protected Element getNodeContent(String doc_id, String lang) throws GSException;
+  abstract protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException;
 
     /**

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

@@ -127 +127 @@
         }
 
-        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem);
+        gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, this.index_stem);
         if (!gs_doc_db.isValid())
         {
@@ -174 +174 @@
      * name="xxx">value</metadata></metadataList>
      */
-  protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException
-    {
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+  protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException
+    {
+        Element metadata_list = doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         DBInfo info = this.coll_db.getInfo(node_id);
         if (info == null)
@@ -195 +195 @@
                 for (int i = 0; i < values.size(); i++)
                 {
-                  GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
+                  GSXML.addMetadata(metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
                 }
             }
@@ -213 +213 @@
             {
               // some of these may be parent/ancestor. does resolve need a different id???
-              GSXML.addMetadata(this.doc, metadata_list, meta_name,  this.macro_resolver.resolve(values.elementAt(j), lang, MacroResolver.SCOPE_META, node_id));
+              GSXML.addMetadata(metadata_list, meta_name,  this.macro_resolver.resolve(values.elementAt(j), lang, MacroResolver.SCOPE_META, node_id));
             }
             }
@@ -295 +295 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    abstract protected Element getNodeContent(String doc_id, String lang) throws GSException;
+  abstract protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException;
 
 

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

@@ -26 +26 @@
 import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -226 +228 @@
         {
             // set up short_service_info_ - for now just has id and type - name will be added in on the fly
-            Element fq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element fq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             fq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
             fq_service.setAttribute(GSXML.NAME_ATT, FIELD_QUERY_SERVICE);
@@ -239 +241 @@
         if (this.advanced_form_search)
         {
-            Element afq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element afq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             afq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
             afq_service.setAttribute(GSXML.NAME_ATT, ADVANCED_FIELD_QUERY_SERVICE);
@@ -252 +254 @@
         if (this.raw_search)
         {
-            Element rq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element rq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
             rq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
             rq_service.setAttribute(GSXML.NAME_ATT, RAW_QUERY_SERVICE);
@@ -299 +301 @@
     }
   }
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
         // should we check that the service is actually on offer? presumably we wont get asked for services that we haven't advertised previously.
@@ -305 +307 @@
         if (!service_id.equals(FIELD_QUERY_SERVICE) && !service_id.equals(ADVANCED_FIELD_QUERY_SERVICE) && !service_id.equals(RAW_QUERY_SERVICE))
         {
-            return super.getServiceDescription(service_id, lang, subset);
-        }
-
-        Element service = this.doc.createElement(GSXML.SERVICE_ELEM);
+          return super.getServiceDescription(doc, service_id, lang, subset);
+        }
+
+        Element service = doc.createElement(GSXML.SERVICE_ELEM);
         service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
         service.setAttribute(GSXML.NAME_ATT, service_id);
         if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
         {
-            service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service_id + ".name", lang)));
-            service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service_id + ".submit", lang)));
-            service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(service_id + ".description", lang)));
+            service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service_id + ".name", lang)));
+            service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service_id + ".submit", lang)));
+            service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(service_id + ".description", lang)));
 
         }
         if (subset == null || subset.equals(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER))
         {
-            Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+            Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
             service.appendChild(param_list);
             if (service_id.equals(FIELD_QUERY_SERVICE))
@@ -346 +348 @@
                 Element multiparam = null;
                 Element param = null;
-                multiparam = GSXML.createParameterDescription(this.doc, SIMPLE_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
+                multiparam = GSXML.createParameterDescription(doc, SIMPLE_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
                 multiparam.setAttribute("occurs", "4");
                 param_list.appendChild(multiparam);
@@ -376 +378 @@
                 Element param = null;
 
-                multiparam = GSXML.createParameterDescription(this.doc, ADVANCED_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
+                multiparam = GSXML.createParameterDescription(doc, ADVANCED_FIELD_PARAM, "", GSXML.PARAM_TYPE_MULTI, null, null, null);
                 multiparam.setAttribute("occurs", "4");
                 param_list.appendChild(multiparam);
@@ -431 +433 @@
     protected void createParameter(String name, Element param_list, String lang)
     {
+      Document doc = param_list.getOwnerDocument();
         Element param = null;
         String param_default = paramDefaults.get(name);
@@ -441 +444 @@
             {
                 // the first one is the default
-                //param = GSXML.createParameterDescription2(this.doc, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)level_ids.get(0), level_ids, level_names);
-                param = GSXML.createParameterDescription2(this.doc, LEVEL_PARAM, getTextString("param." + LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, this.default_level, level_ids, level_names);
+                //param = GSXML.createParameterDescription2(doc, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)level_ids.get(0), level_ids, level_names);
+                param = GSXML.createParameterDescription2(doc, LEVEL_PARAM, getTextString("param." + LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, this.default_level, level_ids, level_names);
             }
             else
             {
                 // we need to set the level, but hidden, in case there is an invalid level saved
-                //param = GSXML.createParameterDescription(this.doc, LEVEL_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, (String)level_ids.get(0), null, null);
-                param = GSXML.createParameterDescription(this.doc, LEVEL_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, this.default_level, null, null);
+                //param = GSXML.createParameterDescription(doc, LEVEL_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, (String)level_ids.get(0), null, null);
+                param = GSXML.createParameterDescription(doc, LEVEL_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, this.default_level, null, null);
             }
         }
@@ -456 +459 @@
             String[] vals1_texts = { getTextString("param." + RANK_PARAM + "." + RANK_PARAM_RANK, lang), getTextString("param." + RANK_PARAM + "." + RANK_PARAM_NONE, lang) };
 
-            param = GSXML.createParameterDescription(this.doc, RANK_PARAM, getTextString("param." + RANK_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals1, vals1_texts);
+            param = GSXML.createParameterDescription(doc, RANK_PARAM, getTextString("param." + RANK_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals1, vals1_texts);
 
         }
         else if (name.equals(FIELD_QUERY_PARAM))
         {
-            param = GSXML.createParameterDescription(this.doc, FIELD_QUERY_PARAM, getTextString("param." + FIELD_QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+            param = GSXML.createParameterDescription(doc, FIELD_QUERY_PARAM, getTextString("param." + FIELD_QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
 
         }
@@ -468 +471 @@
             String[] bool_ops = { "0", "1" };
             String[] bool_texts = { getTextString("param.boolean.off", lang, "AbstractTextSearch"), getTextString("param.boolean.on", lang, "AbstractTextSearch") };
-            param = GSXML.createParameterDescription(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_BOOLEAN, param_default, bool_ops, bool_texts);
+            param = GSXML.createParameterDescription(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_BOOLEAN, param_default, bool_ops, bool_texts);
 
         }
@@ -481 +484 @@
             // org.greenstone.gsdl3.service.AbstractGS2FieldSearch.createParameter(AbstractGS2FieldSearch.java:362)
             // Changed from:
-            // param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names );
+            // param = GSXML.createParameterDescription2(doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names );
             String default_value = (fields.size() > 0) ? fields.get(0) : null;
             // don't want to access element 0 if fields.size()==0, and
             // GSXML.createParameterDescription2 checks for default_value==null condition
-            param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, default_value, fields, field_names);
+            param = GSXML.createParameterDescription2(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, default_value, fields, field_names);
 
         }
@@ -494 +497 @@
             String[] val_texts = { getTextString("param." + FIELD_COMBINE_PARAM + "." + FIELD_COMBINE_PARAM_AND, lang), getTextString("param." + FIELD_COMBINE_PARAM + "." + FIELD_COMBINE_PARAM_OR, lang), getTextString("param." + FIELD_COMBINE_PARAM + "." + FIELD_COMBINE_PARAM_NOT, lang) };
 
-            param = GSXML.createParameterDescription(this.doc, FIELD_COMBINE_PARAM, "", GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals, val_texts);
+            param = GSXML.createParameterDescription(doc, FIELD_COMBINE_PARAM, "", GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals, val_texts);
             param.setAttribute(GSXML.PARAM_IGNORE_POS_ATT, "0");
         }
@@ -596 +599 @@
 
         // Create a new (empty) result message
-        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, service_name);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -652 +656 @@
         // Create a metadata list to store information about the query results
         // should we be using metadataList? or something else?
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(metadata_list);
 
@@ -658 +662 @@
         long totalDocs = numDocsMatched(query_result);
 
-        GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "" + totalDocs);
+        GSXML.addMetadata(metadata_list, "numDocsMatched", "" + totalDocs);
 
         // Create a document list to store the matching documents, and add them
@@ -675 +679 @@
             }
         }
-        GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", "" + docs_returned);
+        GSXML.addMetadata(metadata_list, "numDocsReturned", "" + docs_returned);
 
         // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query
-        GSXML.addMetadata(this.doc, metadata_list, "query", query);
+        GSXML.addMetadata(metadata_list, "query", query);
         if (docs.length > 0)
         {
-            Element document_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+            Element document_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
             result.appendChild(document_list);
             for (int d = 0; d < docs.length; d++)
             {
                 String doc_id = internalNum2OID(docs[d]);
-                Element doc_node = createDocNode(doc_id, doc_ranks[d]);
+                Element doc_node = createDocNode(result_doc, doc_id, doc_ranks[d]);
                 document_list.appendChild(doc_node);
             }
@@ -692 +696 @@
 
         // Create a term list to store the term information, and add it
-        Element term_list = this.doc.createElement(GSXML.TERM_ELEM + GSXML.LIST_MODIFIER);
+        Element term_list = result_doc.createElement(GSXML.TERM_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(term_list);
         addTermInfo(term_list, params, query_result);
@@ -701 +705 @@
             if(facets != null)
             {
-                Element facet_list = this.doc.createElement(GSXML.FACET_ELEM + GSXML.LIST_MODIFIER);
+                Element facet_list = result_doc.createElement(GSXML.FACET_ELEM + GSXML.LIST_MODIFIER);
                 result.appendChild(facet_list);
 
                 for(FacetWrapper currentFacet : facets)
                 {
-                    Element facet_elem = this.doc.createElement(GSXML.FACET_ELEM);
+                    Element facet_elem = result_doc.createElement(GSXML.FACET_ELEM);
                     facet_elem.setAttribute(GSXML.NAME_ATT, currentFacet.getName());
                     facet_list.appendChild(facet_elem);
@@ -717 +721 @@
                         if(countValue > 0)
                         {
-                            Element count_elem = this.doc.createElement(GSXML.COUNT_ELEM);
+                            Element count_elem = result_doc.createElement(GSXML.COUNT_ELEM);
                             count_elem.setAttribute(GSXML.NAME_ATT, countName);
                             count_elem.setTextContent("" + countValue);

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

@@ -108 +108 @@
 
         // replaces default AbstractSearch version with one tied to database
-        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem);
+        gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, this.index_stem);
         if (!gs_doc_db.isValid())
         {

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

@@ -28 +28 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -106 +107 @@
         //    will be added in if the list is requested.
 
-        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);
@@ -142 +143 @@
         if (format != null)
         {
-            this.format_info_map.put(QUERY_SERVICE, this.doc.importNode(format, true));
+            this.format_info_map.put(QUERY_SERVICE, this.desc_doc.importNode(format, true));
         }
 
@@ -163 +164 @@
 
         // Base line for document (might be overriden by sub-classes)
-        gs_doc = new BasicDocument(this.doc, this.default_document_type);
+        gs_doc = new BasicDocument(this.default_document_type);
 
         return true;
@@ -184 +185 @@
      * other services they need to provide their own descriptions
      */
-    protected Element getServiceDescription(String service, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
         if (!service.equals(QUERY_SERVICE))
@@ -191 +192 @@
         }
 
-        Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element tq_service = doc.createElement(GSXML.SERVICE_ELEM);
         tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
         tq_service.setAttribute(GSXML.NAME_ATT, QUERY_SERVICE);
         if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
         {
-            tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getServiceName(QUERY_SERVICE, lang)));
-            tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getServiceSubmit(QUERY_SERVICE, lang)));
-            tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getServiceDescription(QUERY_SERVICE, lang)));
+            tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getServiceName(QUERY_SERVICE, lang)));
+            tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getServiceSubmit(QUERY_SERVICE, lang)));
+            tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getServiceDescription(QUERY_SERVICE, lang)));
         }
         if (subset == null || subset.equals(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER))
         {
-            Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+            Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
             addCustomQueryParams(param_list, lang);
             addStandardQueryParams(param_list, lang);
@@ -282 +283 @@
     protected boolean createParameterChain(String name, Element param_list, String lang, String default_value)
     {
+      Document doc = param_list.getOwnerDocument();
         Element param = null;
         String param_default = default_value;
@@ -290 +292 @@
         if (name.equals(QUERY_PARAM) || name.equals(RAW_PARAM))
         {
-            param = GSXML.createParameterDescription(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_STRING, param_default, null, null);
+            param = GSXML.createParameterDescription(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_STRING, param_default, null, null);
             param_list.appendChild(param);
             return true;
@@ -309 +311 @@
                 param_default = this.default_index;
             }
-            param = GSXML.createParameterDescription2(this.doc, INDEX_PARAM, getTextString("param." + INDEX_PARAM, lang), param_type, param_default, index_ids, index_names);
+            param = GSXML.createParameterDescription2(doc, INDEX_PARAM, getTextString("param." + INDEX_PARAM, lang), param_type, param_default, index_ids, index_names);
             param_list.appendChild(param);
             return true;
@@ -315 +317 @@
         else if (name.equals(MAXDOCS_PARAM))
         {
-            param = GSXML.createParameterDescription(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_INTEGER, param_default, null, null);
+            param = GSXML.createParameterDescription(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_INTEGER, param_default, null, null);
             param_list.appendChild(param);
             return true;
@@ -321 +323 @@
         else if (name.equals(HITS_PER_PAGE_PARAM))
         {
-            param = GSXML.createParameterDescription(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_INTEGER, param_default, null, null);
+            param = GSXML.createParameterDescription(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_INTEGER, param_default, null, null);
             param_list.appendChild(param);
             return true;
@@ -328 +330 @@
         {
             // start page - set to 1 for the search page
-            param = GSXML.createParameterDescription(this.doc, START_PAGE_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, param_default, null, null);
+            param = GSXML.createParameterDescription(doc, START_PAGE_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, param_default, null, null);
             param_list.appendChild(param);
             return true;
@@ -343 +345 @@
      * rank='0.23'/>
      */
-    protected Element createDocNode(String node_id, String rank)
-    {
-        return this.gs_doc.createDocNode(node_id, rank);
+  protected Element createDocNode(Document doc, String node_id, String rank)
+    {
+      return this.gs_doc.createDocNode(doc, node_id, rank);
     }
 

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

@@ -24 +24 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.util.GSXML;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -90 +92 @@
     protected boolean createParameterChain(String name, Element param_list, String lang, String default_value)
     {
+      Document doc = param_list.getOwnerDocument();
         Element param = null;
         String param_default = default_value;
@@ -120 +123 @@
                 param_default = this.default_index_subcollection;
             }
-            param = GSXML.createParameterDescription2(this.doc, INDEX_SUBCOLLECTION_PARAM, getTextString("param." + INDEX_SUBCOLLECTION_PARAM, lang), param_type, param_default, index_sub_ids, index_sub_names);
+            param = GSXML.createParameterDescription2(doc, INDEX_SUBCOLLECTION_PARAM, getTextString("param." + INDEX_SUBCOLLECTION_PARAM, lang), param_type, param_default, index_sub_ids, index_sub_names);
             param_list.appendChild(param);
             return true;
@@ -141 +144 @@
                 param_default = this.default_index_language;
             }
-            param = GSXML.createParameterDescription2(this.doc, INDEX_LANGUAGE_PARAM, getTextString("param." + INDEX_LANGUAGE_PARAM, lang), param_type, param_default, index_lang_ids, index_lang_names);
+            param = GSXML.createParameterDescription2(doc, INDEX_LANGUAGE_PARAM, getTextString("param." + INDEX_LANGUAGE_PARAM, lang), param_type, param_default, index_lang_ids, index_lang_names);
             param_list.appendChild(param);
             return true;
@@ -148 +151 @@
         String[] bool_ops = {"0", "1"};
         String[] bool_texts = {getTextString("param.boolean.off", lang),getTextString("param.boolean.on", lang)}; 
-        param = GSXML.createParameterDescription(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_BOOLEAN, param_default, bool_ops, bool_texts);
+        param = GSXML.createParameterDescription(doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_BOOLEAN, param_default, bool_ops, bool_texts);
         param_list.appendChild(param);
         return true;
@@ -155 +158 @@
         String[] vals = {MATCH_PARAM_SOME, MATCH_PARAM_ALL };
         String[] val_texts = {getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_SOME, lang), getTextString("param."+MATCH_PARAM+"."+MATCH_PARAM_ALL, lang)}; 
-        param = GSXML.createParameterDescription(this.doc, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals, val_texts);
+        param = GSXML.createParameterDescription(doc, MATCH_PARAM, getTextString("param."+MATCH_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, param_default, vals, val_texts);
         param_list.appendChild(param);
         return true;

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

@@ -29 +29 @@
 import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.UserContext;
-
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -72 +74 @@
         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]);
@@ -78 +80 @@
         }
         
-        _GSDM = new GSDocumentModel(this.site_home, this.doc, this.router);
+        _GSDM = new GSDocumentModel(this.site_home, this.router);
 
         return true;
     }
 
-    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++)
@@ -89 +91 @@
             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]);
@@ -106 +108 @@
     {
         // Create a new (empty) result message
-        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, ARCHIVE_GET_DOCUMENT_FILE_PATH);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -116 +119 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_GET_DOCUMENT_FILE_PATH + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_GET_DOCUMENT_FILE_PATH + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -126 +129 @@
         String filePath = _GSDM.archiveGetDocumentFilePath(oid, collection, userContext);
         
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(GSXML.createMetadataElement(this.doc, "docfilepath", filePath)); //TODO: Replace "docfilepath" with a constant 
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, "docfilepath", filePath)); //TODO: Replace "docfilepath" with a constant 
         result.appendChild(metadataList);
 
@@ -136 +139 @@
     {
         //Create a new (empty) result message
-        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, ARCHIVE_GET_SOURCE_FILE_OID);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -146 +150 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_GET_SOURCE_FILE_OID + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_GET_SOURCE_FILE_OID + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -160 +164 @@
         }
 
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(GSXML.createMetadataElement(this.doc, GSXML.NODE_ID_ATT, oid));
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, GSXML.NODE_ID_ATT, oid));
         result.appendChild(metadataList);
 
@@ -170 +174 @@
     {
         //Create a new (empty) result message
-        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, ARCHIVE_CHECK_DOCUMENT_OR_SECTION_EXISTS);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -180 +185 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_CHECK_DOCUMENT_OR_SECTION_EXISTS + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_CHECK_DOCUMENT_OR_SECTION_EXISTS + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -202 +207 @@
     {
         //Create a new (empty) result message
-        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, ARCHIVE_WRITE_ENTRY_TO_DATABASE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -212 +218 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_WRITE_ENTRY_TO_DATABASE + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_WRITE_ENTRY_TO_DATABASE + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -262 +268 @@
     {
         //Create a new (empty) result message
-        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, ARCHIVE_REMOVE_ENTRY_FROM_DATABASE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -272 +279 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_REMOVE_ENTRY_FROM_DATABASE + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_REMOVE_ENTRY_FROM_DATABASE + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -305 +312 @@
     {
         //Create a new (empty) result message
-        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, ARCHIVE_GET_ASSOCIATED_IMPORT_FILES);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -315 +323 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, ARCHIVE_GET_ASSOCIATED_IMPORT_FILES + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, ARCHIVE_GET_ASSOCIATED_IMPORT_FILES + ": Missing " + GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -329 +337 @@
         }
         
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(GSXML.createMetadataElement(this.doc, "srcfile", assocFiles.get(0)));
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, "srcfile", assocFiles.get(0)));
 
         for (int i = 1; i < assocFiles.size(); i++)
         {
-            metadataList.appendChild(GSXML.createMetadataElement(this.doc, "assocfile", assocFiles.get(i)));
+            metadataList.appendChild(GSXML.createMetadataElement(result_doc, "assocfile", assocFiles.get(i)));
         }
 

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

@@ -26 +26 @@
 import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
 import org.greenstone.gsdl3.util.UserContext;
-
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element; 
 
@@ -57 +59 @@
         this.config_info = info;
         
-        Element documentFilePathRetrieveService = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element documentFilePathRetrieveService = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         documentFilePathRetrieveService.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         documentFilePathRetrieveService.setAttribute(GSXML.NAME_ATT, DOCUMENT_FILE_PATH_RETRIEVE_SERVICE);
         this.short_service_info.appendChild(documentFilePathRetrieveService);
         
-        Element associatedImportFilesRetrieveService = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element associatedImportFilesRetrieveService = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         associatedImportFilesRetrieveService.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         associatedImportFilesRetrieveService.setAttribute(GSXML.NAME_ATT, ASSOCIATED_IMPORT_FILES_RETRIEVE_SERVICE);
         this.short_service_info.appendChild(associatedImportFilesRetrieveService);
         
-        Element sourceFileDocIDRetrieveService = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element sourceFileDocIDRetrieveService = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         sourceFileDocIDRetrieveService.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         sourceFileDocIDRetrieveService.setAttribute(GSXML.NAME_ATT, SOURCE_FILE_OID_RETRIEVE);
@@ -75 +77 @@
     }
     
-    protected Element getServiceDescription(String service_id, String lang, String subset) 
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset) 
     {
         if (service_id.equals(DOCUMENT_FILE_PATH_RETRIEVE_SERVICE)) 
         {
-            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, DOCUMENT_FILE_PATH_RETRIEVE_SERVICE);
@@ -86 +88 @@
         else if (service_id.equals(ASSOCIATED_IMPORT_FILES_RETRIEVE_SERVICE)) 
         {
-            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, ASSOCIATED_IMPORT_FILES_RETRIEVE_SERVICE);
@@ -93 +95 @@
         else if (service_id.equals(SOURCE_FILE_OID_RETRIEVE))
         {
-            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, SOURCE_FILE_OID_RETRIEVE);
@@ -104 +106 @@
     {
         // Create a new (empty) result message
-        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, DOCUMENT_FILE_PATH_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -113 +116 @@
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list == null) {
-            GSXML.addError(this.doc, result, "DocumentFilePathRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentFilePathRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;  
         }
@@ -130 +133 @@
             "doc.xml";
 
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(createMetadataElement("docfilepath", docFilePath));
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, "docfilepath", docFilePath));
         result.appendChild(metadataList);
         
@@ -140 +143 @@
     {
         //Create a new (empty) result message
-        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, SOURCE_FILE_OID_RETRIEVE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -150 +154 @@
         if (param_list == null) 
         {
-            GSXML.addError(this.doc, result, "DocumentFilePathRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "DocumentFilePathRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;  
         }
@@ -201 +205 @@
         String oid = info.getInfo("oid");
         
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(createMetadataElement("oid", oid));
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, "oid", oid));
         result.appendChild(metadataList);
         
@@ -211 +215 @@
     {
         //Create a new (empty) result message
-        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, ASSOCIATED_IMPORT_FILES_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -221 +226 @@
         if (param_list == null) 
         {
-            GSXML.addError(this.doc, result, "AssociatedImportFilesRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, "AssociatedImportFilesRetrieve: missing "+ GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER, GSXML.ERROR_TYPE_SYNTAX);
             return result;  
         }
@@ -272 +277 @@
         Vector<String> data = info.getMultiInfo("assoc-file");
         
-        Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
-        metadataList.appendChild(createMetadataElement("srcfile", srcFile));
+        Element metadataList = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        metadataList.appendChild(GSXML.createMetadataElement(result_doc, "srcfile", srcFile));
         
         for (int i = 0; i < data.size(); i++)
         {
-            metadataList.appendChild(createMetadataElement("assocfile", data.get(i)));
+          metadataList.appendChild(GSXML.createMetadataElement(result_doc, "assocfile", data.get(i)));
         }
         
@@ -285 +290 @@
     }
     
-    public Element createMetadataElement(String name, String value)
-    {
-        Element metaElem = this.doc.createElement(GSXML.METADATA_ELEM);
-        metaElem.setAttribute("name", name);
-        metaElem.setAttribute("value", value);
-        return metaElem;
-    }
     
     public String getAssocFilePathFromDocID(String oid, String collection, UserContext userContext)
     {
-        Element mr_query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_query_request = GSXML.createBasicRequest (this.doc, GSXML.REQUEST_TYPE_PAGE, collection + "/DocumentMetadataRetrieve", userContext);
+      Document doc = XMLConverter.newDOM();
+        Element mr_query_message = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element mr_query_request = GSXML.createBasicRequest (doc, GSXML.REQUEST_TYPE_PAGE, collection + "/DocumentMetadataRetrieve", userContext);
         mr_query_message.appendChild(mr_query_request);
         
-        Element paramList = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-        paramList.appendChild(createMetadataElement("metadata", "assocfilepath"));
+        Element paramList = doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        paramList.appendChild(GSXML.createMetadataElement(doc, "metadata", "assocfilepath"));
         
         mr_query_request.appendChild(paramList);
 
-        Element docListElem = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-        Element docElem = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element docListElem = doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        Element docElem = doc.createElement(GSXML.DOC_NODE_ELEM);
         docElem.setAttribute(GSXML.NODE_ID_ATT, oid);
         docListElem.appendChild(docElem);
@@ -324 +323 @@
     {
         //Find out what kind of database we have
-        Element dbTypeMessage = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element dbTypeRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, collection, userContext);
+      Document doc = XMLConverter.newDOM();
+        Element dbTypeMessage = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element dbTypeRequest = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, collection, userContext);
         dbTypeMessage.appendChild(dbTypeRequest);
         Element dbTypeResponse = (Element)this.router.process(dbTypeMessage);

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

@@ -19 +19 @@
 import org.greenstone.gsdl3.util.UserQueryResult;
 import org.greenstone.gsdl3.util.UserTermInfo;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.greenstone.util.GlobalProperties;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -168 +171 @@
 
         // set up Authentication service info - for now just has name and type
-        Element authentication_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element authentication_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         authentication_service.setAttribute(GSXML.TYPE_ATT, "authen");
         authentication_service.setAttribute(GSXML.NAME_ATT, AUTHENTICATION_SERVICE);
         this.short_service_info.appendChild(authentication_service);
 
-        Element getUserInformation_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element getUserInformation_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         getUserInformation_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         getUserInformation_service.setAttribute(GSXML.NAME_ATT, GET_USER_INFORMATION_SERVICE);
         this.short_service_info.appendChild(getUserInformation_service);
 
-        Element changeEditMode_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element changeEditMode_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         changeEditMode_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         changeEditMode_service.setAttribute(GSXML.NAME_ATT, CHANGE_USER_EDIT_MODE_SERVICE);
         this.short_service_info.appendChild(changeEditMode_service);
         
-        Element remoteAuthentication_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element remoteAuthentication_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         remoteAuthentication_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         remoteAuthentication_service.setAttribute(GSXML.NAME_ATT, REMOTE_AUTHENTICATION_SERVICE);
@@ -214 +217 @@
     }
 
-    protected Element getServiceDescription(String service_id, String lang, String subset)
-    {
-
-        Element authen_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
+    {
+
+        Element authen_service = doc.createElement(GSXML.SERVICE_ELEM);
 
         if (service_id.equals(AUTHENTICATION_SERVICE))
@@ -246 +249 @@
         if (service_id.equals(AUTHENTICATION_SERVICE) && (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER)))
         {
-            authen_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getServiceName(service_id, lang)));
-            authen_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getServiceDescription(service_id, lang)));
+            authen_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getServiceName(service_id, lang)));
+            authen_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getServiceDescription(service_id, lang)));
         }
         return authen_service;
@@ -270 +273 @@
     {
         // Create a new (empty) result message
-        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, CHANGE_USER_EDIT_MODE_SERVICE);
@@ -278 +282 @@
         if (paramList == null)
         {
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
             return result;
         }
@@ -362 +366 @@
             }
         }
-        
-        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, REMOTE_AUTHENTICATION_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);        
-        Element s = GSXML.createTextElement(this.doc, GSXML.STATUS_ELEM, message);
+        Element s = GSXML.createTextElement(result_doc, GSXML.STATUS_ELEM, message);
         result.appendChild(s);
         return result;
@@ -374 +378 @@
     {
         // Create a new (empty) result message
-        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, GET_USER_INFORMATION_SERVICE);
@@ -382 +387 @@
         if (paramList == null)
         {
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
             return result;
         }
@@ -392 +397 @@
         if (username == null)
         {
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_USERNAME_NOT_SPECIFIED));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_USERNAME_NOT_SPECIFIED));
             return result;
         }
@@ -405 +410 @@
         if (terms.size() == 0)
         {
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_REQUESTED_USER_NOT_FOUND));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_REQUESTED_USER_NOT_FOUND));
             return result;
         }
 
         UserTermInfo userInfo = terms.get(0);
-        Element userInfoList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element userInfoList = result_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(userInfoList);
 
-        Element usernameField = GSXML.createParameter(this.doc, "username", userInfo.username);
-        Element passwordField = GSXML.createParameter(this.doc, "password", userInfo.password);
-        Element groupsField = GSXML.createParameter(this.doc, "groups", userInfo.groups);
-        Element accountStatusField = GSXML.createParameter(this.doc, "accountstatus", userInfo.accountstatus);
-        Element commentField = GSXML.createParameter(this.doc, "comment", userInfo.comment);
+        Element usernameField = GSXML.createParameter(result_doc, "username", userInfo.username);
+        Element passwordField = GSXML.createParameter(result_doc, "password", userInfo.password);
+        Element groupsField = GSXML.createParameter(result_doc, "groups", userInfo.groups);
+        Element accountStatusField = GSXML.createParameter(result_doc, "accountstatus", userInfo.accountstatus);
+        Element commentField = GSXML.createParameter(result_doc, "comment", userInfo.comment);
 
         if (editEnabled != null)
         {
-            Element editEnabledElem = GSXML.createParameter(this.doc, "editEnabled", editEnabled);
+            Element editEnabledElem = GSXML.createParameter(result_doc, "editEnabled", editEnabled);
             userInfoList.appendChild(editEnabledElem);
         }
@@ -441 +446 @@
 
         // Create a new (empty) result message
-        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, AUTHENTICATION_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
 
         // Create an Authentication node put into the result
-        Element authenNode = this.doc.createElement(GSXML.AUTHEN_NODE_ELEM);
+        Element authenNode = result_doc.createElement(GSXML.AUTHEN_NODE_ELEM);
         result.appendChild(authenNode);
-        result.appendChild(getCollectList(this.site_home + File.separatorChar + "collect"));
+        result.appendChild(getCollectList(result_doc, this.site_home + File.separatorChar + "collect"));
 
         // Create a service node added into the Authentication node
-        Element serviceNode = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element serviceNode = result_doc.createElement(GSXML.SERVICE_ELEM);
         authenNode.appendChild(serviceNode);
 
@@ -459 +465 @@
         {
             serviceNode.setAttribute("operation", LOGIN);
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_REQUEST_HAS_NO_PARAM_LIST));
             return result; // Return the empty result
         }
@@ -473 +479 @@
         {
             serviceNode.setAttribute("operation", LOGIN);
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_NOT_LOGGED_IN));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_NOT_LOGGED_IN));
             return result;
         }
@@ -486 +492 @@
         {
             serviceNode.setAttribute("operation", LOGIN);
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_NOT_LOGGED_IN));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_NOT_LOGGED_IN));
             return result;
         }
@@ -493 +499 @@
         {
             serviceNode.setAttribute("operation", LOGIN);
-            GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_ADMIN_NOT_LOGGED_IN));
+            GSXML.addError(result, _errorMessageMap.get(ERROR_ADMIN_NOT_LOGGED_IN));
             return result;
         }
@@ -502 +508 @@
             if (error != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
         }
@@ -518 +524 @@
             if ((error = checkUsername(newUsername)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -525 +531 @@
             if ((error = checkPassword(newPassword)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -535 +541 @@
             {
                 serviceNode.setAttribute("operation", ADD_USER);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
             else
@@ -553 +559 @@
             if ((error = checkUsername(newUsername)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -560 +566 @@
             if ((error = checkPassword(newPassword)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -584 +590 @@
                     {
                         serviceNode.setAttribute("operation", REGISTER);
-                        GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
+                        GSXML.addError(result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
                         return result;
                     }
@@ -593 +599 @@
                     {
                         serviceNode.setAttribute("operation", REGISTER);
-                        GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
+                        GSXML.addError(result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
                         return result;
                     }
@@ -606 +612 @@
             {
                 serviceNode.setAttribute("operation", REGISTER);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
         }
@@ -623 +629 @@
             if ((error = checkUsername(newUsername)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -636 +642 @@
                 if ((error = checkPassword(newPassword)) != NO_ERROR)
                 {
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    GSXML.addError(result, _errorMessageMap.get(error));
                     return result;
                 }
@@ -654 +660 @@
                 {
                     serviceNode.setAttribute("operation", EDIT_USER);
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    GSXML.addError(result, _errorMessageMap.get(error));
                 }
                 return result;
@@ -663 +669 @@
             {
                 serviceNode.setAttribute("operation", EDIT_USER);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
             else
@@ -684 +690 @@
                 addUserInformationToNode(previousUsername, serviceNode);
                 serviceNode.setAttribute("operation", ACCOUNT_SETTINGS);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_USER_ALREADY_EXISTS));
+                GSXML.addError(result, _errorMessageMap.get(ERROR_USER_ALREADY_EXISTS));
                 return result;
             }
@@ -698 +704 @@
                     addUserInformationToNode(previousUsername, serviceNode);
                     serviceNode.setAttribute("operation", ACCOUNT_SETTINGS);
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_INCORRECT_PASSWORD), "Incorrect Password");
+                    GSXML.addError(result, _errorMessageMap.get(ERROR_INCORRECT_PASSWORD), "Incorrect Password");
                     return result;
                 }
@@ -706 +712 @@
                 if ((error = checkPassword(newPassword)) != NO_ERROR)
                 {
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    GSXML.addError(result, _errorMessageMap.get(error));
                     return result;
                 }
@@ -721 +727 @@
             if ((error = checkUsername(newUsername)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -741 +747 @@
                     addUserInformationToNode(previousUsername, serviceNode);
                     serviceNode.setAttribute("operation", ACCOUNT_SETTINGS);
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                    GSXML.addError(result, _errorMessageMap.get(error));
                 }
                 return result;
@@ -749 +755 @@
             if (error != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
 
@@ -767 +773 @@
             if (user_name == null || oldPassword == null || newPassword == null)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get("missing compulsory parameters: username, oldPassword, or newPassword"));
+                GSXML.addError(result, _errorMessageMap.get("missing compulsory parameters: username, oldPassword, or newPassword"));
                 return result;
             }
@@ -775 +781 @@
             {
                 addUserInformationToNode(user_name, serviceNode);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_INCORRECT_PASSWORD), "Incorrect Password");
+                GSXML.addError(result, _errorMessageMap.get(ERROR_INCORRECT_PASSWORD), "Incorrect Password");
                 return result;
             }
@@ -783 +789 @@
             if ((error = checkPassword(newPassword)) != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
                 return result;
             }
@@ -794 +800 @@
             if (info != "succeed")
             {//see DerbyWrapper.modifyUserInfo
-                GSXML.addError(this.doc, result, _errorMessageMap.get(info));
+                GSXML.addError(result, _errorMessageMap.get(info));
                 return result;
             }
@@ -804 +810 @@
             if (error != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
         }
@@ -814 +820 @@
             {
                 serviceNode.setAttribute("operation", "");
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_USERNAME_NOT_SPECIFIED));
+                GSXML.addError(result, _errorMessageMap.get(ERROR_USERNAME_NOT_SPECIFIED));
                 return result;
             }
@@ -821 +827 @@
             {
                 serviceNode.setAttribute("operation", LOGIN);
-                GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_NOT_AUTHORISED));
+                GSXML.addError(result, _errorMessageMap.get(ERROR_NOT_AUTHORISED));
                 return result;
             }
@@ -827 +833 @@
             if (error != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
         }
@@ -861 +867 @@
             if (_recaptchaPublicKey != null && _recaptchaPrivateKey != null)
             {
-                Element recaptchaElem = this.doc.createElement("recaptcha");
+                Element recaptchaElem = result_doc.createElement("recaptcha");
                 recaptchaElem.setAttribute("publicKey", _recaptchaPublicKey);
                 recaptchaElem.setAttribute("privateKey", _recaptchaPrivateKey);
@@ -873 +879 @@
             if (error != NO_ERROR)
             {
-                GSXML.addError(this.doc, result, _errorMessageMap.get(error));
+                GSXML.addError(result, _errorMessageMap.get(error));
             }
             addUserInformationToNode(null, serviceNode);
@@ -985 +991 @@
         if (userQueryResult != null)
         {
-            Element user_node = getUserNode(userQueryResult);
+          Element user_node = getUserNodeList(serviceNode.getOwnerDocument(), userQueryResult);
             serviceNode.appendChild(user_node);
             return NO_ERROR;
@@ -1114 +1120 @@
     }
 
-    private Element getUserNode(UserQueryResult userQueryResult)
-    {
-        Element user_list_node = this.doc.createElement(GSXML.USER_NODE_ELEM + "List");
+  private Element getUserNodeList(Document doc, UserQueryResult userQueryResult)
+    {
+        Element user_list_node = doc.createElement(GSXML.USER_NODE_ELEM + GSXML.LIST_MODIFIER);
 
         Vector userInfo = userQueryResult.users;
@@ -1122 +1128 @@
         for (int i = 0; i < userQueryResult.getSize(); i++)
         {
-            Element user_node = this.doc.createElement(GSXML.USER_NODE_ELEM);
+            Element user_node = doc.createElement(GSXML.USER_NODE_ELEM);
             String username = ((UserTermInfo) userInfo.get(i)).username;
             String groups = ((UserTermInfo) userInfo.get(i)).groups;
@@ -1139 +1145 @@
     }
 
-    private Element getCollectList(String collect)
-    {
-        Element collect_list_node = this.doc.createElement(GSXML.COLLECTION_ELEM + "List");
+  private Element getCollectList(Document doc, String collect)
+    {
+        Element collect_list_node = doc.createElement(GSXML.COLLECTION_ELEM + GSXML.LIST_MODIFIER);
         File[] collect_dir = (new File(collect)).listFiles();
         if (collect_dir != null && collect_dir.length > 0)
@@ -1149 +1155 @@
                 if (collect_dir[i].isDirectory() && (!collect_dir[i].getName().startsWith(".svn")))
                 {
-                    Element collect_node = this.doc.createElement(GSXML.COLLECTION_ELEM);
-                    collect_node.setAttribute("name", collect_dir[i].getName());
+                    Element collect_node = doc.createElement(GSXML.COLLECTION_ELEM);
+                    collect_node.setAttribute(GSXML.NAME_ATT, collect_dir[i].getName());
                     collect_list_node.appendChild(collect_node);
                 }

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

@@ -27 +27 @@
 import java.util.Iterator;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -34 +35 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 
 import java.io.Serializable;
@@ -111 +113 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element add_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element add_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         add_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         add_service.setAttribute(GSXML.NAME_ATT, ADD_ITEM_SERVICE);
@@ -117 +119 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element disp_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element disp_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         disp_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         disp_service.setAttribute(GSXML.NAME_ATT, DISPLAY_ITEMS_SERVICE);
@@ -123 +125 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element num_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element num_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         num_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         num_service.setAttribute(GSXML.NAME_ATT, ITEM_NUM_SERVICE);
@@ -129 +131 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element delete_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element delete_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         delete_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         delete_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEMS_SERVICE);
@@ -135 +137 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element deleteone_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element deleteone_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         deleteone_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         deleteone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE);
@@ -141 +143 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element mail_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element mail_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         mail_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         mail_service.setAttribute(GSXML.NAME_ATT, SEND_MAIL_SERVICE);
@@ -151 +153 @@
 
     /** returns a specific service description */
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
 
         if (service_id.equals(ADD_ITEM_SERVICE))
         {
-            Element add_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element add_service = doc.createElement(GSXML.SERVICE_ELEM);
             add_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             add_service.setAttribute(GSXML.NAME_ATT, ADD_ITEM_SERVICE);
@@ -164 +166 @@
         {
 
-            Element disp_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element disp_service = doc.createElement(GSXML.SERVICE_ELEM);
             disp_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             disp_service.setAttribute(GSXML.NAME_ATT, DISPLAY_ITEMS_SERVICE);
@@ -173 +175 @@
         {
 
-            Element num_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element num_service = doc.createElement(GSXML.SERVICE_ELEM);
             num_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             num_service.setAttribute(GSXML.NAME_ATT, ITEM_NUM_SERVICE);
@@ -182 +184 @@
         {
 
-            Element del_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element del_service = doc.createElement(GSXML.SERVICE_ELEM);
             del_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             del_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEMS_SERVICE);
@@ -191 +193 @@
         {
 
-            Element delone_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element delone_service = doc.createElement(GSXML.SERVICE_ELEM);
             delone_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             delone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE);
@@ -200 +202 @@
         {
 
-            Element mail_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element mail_service = doc.createElement(GSXML.SERVICE_ELEM);
             mail_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             mail_service.setAttribute(GSXML.NAME_ATT, SEND_MAIL_SERVICE);
@@ -214 +216 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -242 +245 @@
                 Item newItem = generateItem(collection, item);
                 items.put(item, newItem);
-                result.appendChild(newItem.wrapIntoElement());
+                result.appendChild(newItem.wrapIntoElement(result_doc));
             }
         }
@@ -251 +254 @@
             items.put(item, newItem);
             docsMap.put(collection, items);
-            result.appendChild(newItem.wrapIntoElement());
+            result.appendChild(newItem.wrapIntoElement(result_doc));
         }
 
@@ -307 +310 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -363 +367 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -413 +418 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         int size = 0;
@@ -427 +433 @@
             {
                 Item item = (Item) values.next();
-                result.appendChild(item.wrapIntoElement());
-            }
-        }
-
-        Element selement = this.doc.createElement("size");
+                result.appendChild(item.wrapIntoElement(result_doc));
+            }
+        }
+
+        Element selement = result_doc.createElement("size");
         selement.setAttribute("value", size + "");
         result.appendChild(selement);
@@ -442 +448 @@
 
         // Build a request to obtain some document metadata
-        Element dm_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
+      Document doc = XMLConverter.newDOM();
+        Element dm_message = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element dm_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
         dm_message.appendChild(dm_request);
 
@@ -452 +459 @@
         meta_names.add("Date");
 
-        Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
 
         Element param = null;
@@ -459 +466 @@
         {
             String name = i.next();
-            param = this.doc.createElement(GSXML.PARAM_ELEM);
+            param = doc.createElement(GSXML.PARAM_ELEM);
             param_list.appendChild(param);
             param.setAttribute(GSXML.NAME_ATT, "metadata");
@@ -469 +476 @@
 
         // create the doc node list for the metadata request
-        Element dm_doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element dm_doc_list = doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         dm_request.appendChild(dm_doc_list);
 
@@ -475 +482 @@
         {
             // Add the documentNode to the list
-            Element dm_doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+            Element dm_doc_node = doc.createElement(GSXML.DOC_NODE_ELEM);
             dm_doc_list.appendChild(dm_doc_node);
             dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, ids.next());
@@ -489 +496 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         Iterator<String> keys = docsMap.keySet().iterator();
@@ -499 +507 @@
             Iterator itemItr = items.values().iterator();
 
-            Element collectionNode = this.doc.createElement("berryList");
+            Element collectionNode = result_doc.createElement("berryList");
             collectionNode.setAttribute("name", collection);
             result.appendChild(collectionNode);
@@ -506 +514 @@
             {
                 Item item = (Item) itemItr.next();
-                Element itemElement = this.doc.createElement("item");
+                Element itemElement = result_doc.createElement("item");
 
                 collectionNode.appendChild(itemElement);
@@ -524 +532 @@
     {
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -606 +615 @@
 
             logger.info("\nMail was sent successfully.");
-            result.appendChild(this.doc.createTextNode("Mail was sent successfully."));
+            result.appendChild(result_doc.createTextNode("Mail was sent successfully."));
         }
         catch (Exception e)
         {
             e.printStackTrace();
-            result.appendChild(this.doc.createTextNode(e.getMessage()));
+            result.appendChild(result_doc.createTextNode(e.getMessage()));
         }
 
@@ -651 +660 @@
         }
 
-        public Element wrapIntoElement()
+        public Element wrapIntoElement(Document doc)
         {
             Element itemElement = doc.createElement("item");

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);

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

@@ -29 +29 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -65 +68 @@
         logger.info("Configuring CrossCollectionSearch...");
         // query service
-        Element ccs_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element ccs_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         ccs_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
         ccs_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
@@ -71 +74 @@
 
         // metadata service
-        Element dmr_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element dmr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dmr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -80 +83 @@
         if (format_info != null)
         {
-            this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format_info, true));
+            this.format_info_map.put(TEXT_QUERY_SERVICE, this.desc_doc.importNode(format_info, true));
         }
         else
@@ -91 +94 @@
             }
             format_string += "</xsl:attribute><gsf:icon/></a></td><td><gsf:metadata name='Title'/> (<xsl:value-of select='@collection'/>) </td></gsf:template></format>";
-            this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(this.converter.getDOM(format_string).getDocumentElement(), true));
+            this.format_info_map.put(TEXT_QUERY_SERVICE, this.desc_doc.importNode(this.converter.getDOM(format_string).getDocumentElement(), true));
         }
         return true;
     }
 
-    protected Element getServiceDescription(String service, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
         if (service.equals(TEXT_QUERY_SERVICE))
         {
 
-            Element ccs_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element ccs_service = doc.createElement(GSXML.SERVICE_ELEM);
             ccs_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
             ccs_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
@@ -108 +111 @@
             if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
             {
-                ccs_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE + ".name", lang)));
-                ccs_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE + ".submit", lang)));
-                ccs_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE + ".description", lang)));
+                ccs_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE + ".name", lang)));
+                ccs_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE + ".submit", lang)));
+                ccs_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE + ".description", lang)));
             }
             // param info
             if (subset == null || subset.equals(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER))
             {
-                Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+                Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
                 // collection list
                 if (coll_ids_list == null)
@@ -125 +128 @@
                     addCollectionNames(lang);
                 }
-                Element param = GSXML.createParameterDescription(this.doc, COLLECTION_PARAM, getTextString("param." + COLLECTION_PARAM, lang), GSXML.PARAM_TYPE_ENUM_MULTI, "all", coll_ids_list, coll_names_map.get(lang));
+                Element param = GSXML.createParameterDescription(doc, COLLECTION_PARAM, getTextString("param." + COLLECTION_PARAM, lang), GSXML.PARAM_TYPE_ENUM_MULTI, "all", coll_ids_list, coll_names_map.get(lang));
                 param_list.appendChild(param);
                 // query param
-                param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param." + QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+                param = GSXML.createParameterDescription(doc, QUERY_PARAM, getTextString("param." + QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
                 param_list.appendChild(param);
                 ccs_service.appendChild(param_list);
@@ -137 +140 @@
         }
         // these ones are probably never called, but put them here just in case
-        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, service);
@@ -147 +150 @@
     {
         // Create a new (empty) result message
-        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, TEXT_QUERY_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -173 +177 @@
         }
 
-        Element query_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Document msg_doc = XMLConverter.newDOM();
+        Element query_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
         // we are sending the same request to each collection - build up the to
         // attribute for the request
@@ -187 +192 @@
         }
         // send the query to all colls
-        Element query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to_att.toString(), userContext);
+        Element query_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PROCESS, to_att.toString(), userContext);
         query_message.appendChild(query_request);
         // should we add params individually?
-        Element new_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element new_param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         query_request.appendChild(new_param_list);
-        new_param_list.appendChild(this.doc.importNode(GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, QUERY_PARAM), true));
+        new_param_list.appendChild(msg_doc.importNode(GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, QUERY_PARAM), true));
         Element query_result = (Element) this.router.process(query_message);
 
@@ -215 +220 @@
         }
 
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(metadata_list);
-        GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", "" + numDocsReturned);
-        //GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+numDocsMatched);
-
-        Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        GSXML.addMetadata(metadata_list, "numDocsReturned", "" + numDocsReturned);
+        //GSXML.addMetadata(metadata_list, "numDocsMatched", ""+numDocsMatched);
+
+        Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(doc_node_list);
 
@@ -240 +245 @@
                 {
 
-                    doc_node_list.appendChild(this.doc.importNode(this_node, true));
+                    doc_node_list.appendChild(result_doc.importNode(this_node, true));
                 }
                 else
@@ -267 +272 @@
 
         // first, get the message router info
-        Element coll_list_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext); // uid
+        Document msg_doc = XMLConverter.newDOM();
+        Element coll_list_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        Element coll_list_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, "", userContext); // uid
         coll_list_message.appendChild(coll_list_request);
         logger.debug("coll list request = " + this.converter.getPrettyString(coll_list_request));
@@ -283 +289 @@
         NodeList colls = coll_list_response.getElementsByTagName(GSXML.COLLECTION_ELEM);
         // we can send the same request to multiple collections at once by using a comma separated list
-        Element metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element metadata_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
         StringBuffer colls_sb = new StringBuffer();
         for (int i = 0; i < colls.getLength(); i++)
@@ -298 +304 @@
         }
 
-        Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, colls_sb.toString(), userContext);
+        Element metadata_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, colls_sb.toString(), userContext);
         metadata_message.appendChild(metadata_request);
         logger.debug("metadata request = " + this.converter.getPrettyString(metadata_message));
@@ -352 +358 @@
 
         // need to request MR for collection descriptions
-        Element metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Document msg_doc = XMLConverter.newDOM();
+        Element metadata_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
 
         // get a comma separated list of coll ids to send to MR
@@ -365 +372 @@
             colls_sb.append(coll_ids_list[i]);
         }
-        Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, colls_sb.toString(), userContext);
+        Element metadata_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, colls_sb.toString(), userContext);
         // param_list to request just displayTextList
-        Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-        Element param = GSXML.createParameter(this.doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+        Element param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element param = GSXML.createParameter(msg_doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
         param_list.appendChild(param);
         metadata_request.appendChild(param_list);
@@ -393 +400 @@
     {
         // Create a new (empty) result message
-        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, DOCUMENT_METADATA_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -414 +422 @@
 
         // the resulting doc node list
-        Element result_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element result_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(result_node_list);
 
-        // get all the metadata params
-        Element new_param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-        Element param = GSXML.createParameter(this.doc, "metadata", "Title");
-        new_param_list.appendChild(param);
 
         // organise the nodes into collection lists
@@ -432 +436 @@
             if (coll_items == null)
             {
-                coll_items = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+                coll_items = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
                 coll_map.put(coll_name, coll_items);
             }
-            coll_items.appendChild(this.doc.importNode(doc_node, true));
+            coll_items.appendChild(result_doc.importNode(doc_node, true));
         }
 
         // create teh individual requests
-        Element meta_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Document msg_doc = XMLConverter.newDOM();
+        Element meta_request_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        // get all the metadata params
+        Element new_param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element param = GSXML.createParameter(msg_doc, "metadata", "Title");
+        new_param_list.appendChild(param);
+
         Set mapping_set = coll_map.entrySet();
         Iterator iter = mapping_set.iterator();
@@ -448 +458 @@
             String cname = (String) e.getKey();
             Element doc_nodes = (Element) e.getValue();
-            Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(cname, DOCUMENT_METADATA_RETRIEVE_SERVICE), userContext);
-            meta_request.appendChild(doc_nodes);
+            Element meta_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PROCESS, GSPath.appendLink(cname, DOCUMENT_METADATA_RETRIEVE_SERVICE), userContext);
+            meta_request.appendChild(msg_doc.importNode(doc_nodes, true));
             meta_request.appendChild(new_param_list.cloneNode(true));
             meta_request_message.appendChild(meta_request);
@@ -456 +466 @@
 
         Node meta_result_node = this.router.process(meta_request_message);
-        Element meta_result = this.converter.nodeToElement(meta_result_node);
+        Element meta_result = GSXML.nodeToElement(meta_result_node);
 
         // now need to put the doc nodes back in the right order
@@ -472 +482 @@
         {
             Element doc_node = (Element) query_doc_list.item(i);
-            Element new_node = (Element) this.doc.importNode(doc_node, false);
+            Element new_node = (Element) result_doc.importNode(doc_node, false);
             result_node_list.appendChild(new_node);
             String coll_name = doc_node.getAttribute("collection");

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

@@ -52 +52 @@
         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]);
@@ -61 +61 @@
     }
 
-    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++)
@@ -67 +67 @@
             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]);
@@ -79 +79 @@
     protected Element processResolveCallTemplate(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, RESOLVE_CALL_TEMPLATE);
+        Document result_doc = XMLConverter.newDOM();
+
+        Element result = GSXML.createBasicResponse(result_doc, RESOLVE_CALL_TEMPLATE);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, RESOLVE_CALL_TEMPLATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, RESOLVE_CALL_TEMPLATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -99 +101 @@
         if (!found)
         {
-            GSXML.addError(this.doc, result, "This user does not have the required permissions to perform this action.");
+            GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
         }
@@ -108 +110 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, RESOLVE_CALL_TEMPLATE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, RESOLVE_CALL_TEMPLATE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -142 +144 @@
                 Element debugElement = (Element) current.getElementsByTagName("debug").item(0);
 
-                Element requestedTemplate = this.doc.createElement("requestedTemplate");
+                Element requestedTemplate = result_doc.createElement("requestedTemplate");
                 requestedTemplate.setTextContent(debugElement.getAttribute("filename"));
                 result.appendChild(requestedTemplate);
@@ -153 +155 @@
     protected Element processGetXMLTemplateFromFile(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, GET_TEMPLATE_FROM_XML_FILE);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, GET_TEMPLATE_FROM_XML_FILE);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, GET_TEMPLATE_FROM_XML_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_TEMPLATE_FROM_XML_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -173 +176 @@
         if (!found)
         {
-            GSXML.addError(this.doc, result, "This user does not have the required permissions to perform this action.");
+            GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
         }
@@ -182 +185 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -210 +213 @@
         else
         {
-            GSXML.addError(this.doc, result, "A valid namespace was not specified.");
+            GSXML.addError(result, "A valid namespace was not specified.");
             return result;
         }
@@ -257 +260 @@
                         fixAttributes(template);
 
-                        Element requestedTemplate = this.doc.createElement("requestedNameTemplate");
-                        requestedTemplate.appendChild(this.doc.importNode(template, true));
+                        Element requestedTemplate = result_doc.createElement("requestedNameTemplate");
+                        requestedTemplate.appendChild(result_doc.importNode(template, true));
                         result.appendChild(requestedTemplate);
                     }
@@ -274 +277 @@
                         fixAttributes(template);
 
-                        Element requestedTemplate = this.doc.createElement("requestedMatchTemplate");
-                        requestedTemplate.appendChild(this.doc.importNode(template, true));
+                        Element requestedTemplate = result_doc.createElement("requestedMatchTemplate");
+                        requestedTemplate.appendChild(result_doc.importNode(template, true));
                         result.appendChild(requestedTemplate);
                     }
@@ -306 +309 @@
     protected Element processSaveXMLTemplateToFile(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, SAVE_TEMPLATE_TO_XML_FILE);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, SAVE_TEMPLATE_TO_XML_FILE);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -326 +330 @@
         if (!foundGroup)
         {
-            GSXML.addError(this.doc, result, "This user does not have the required permissions to perform this action.");
+            GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
         }
@@ -335 +339 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -364 +368 @@
         else
         {
-            GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + ": The specified namespace was not valid", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + ": The specified namespace was not valid", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -441 +445 @@
             if (!found)
             {
-                GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + ": Could not save as the specified template could not be found", GSXML.ERROR_TYPE_SYNTAX);
+                GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + ": Could not save as the specified template could not be found", GSXML.ERROR_TYPE_SYNTAX);
             }
             else
@@ -457 +461 @@
                 catch (Exception ex)
                 {
-                    GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + ": There was an error writing out the XML file", GSXML.ERROR_TYPE_SYNTAX);
+                    GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + ": There was an error writing out the XML file", GSXML.ERROR_TYPE_SYNTAX);
                 }
 
@@ -464 +468 @@
         else
         {
-            GSXML.addError(this.doc, result, SAVE_TEMPLATE_TO_XML_FILE + "File: " + xslFile.getAbsolutePath() + " does not exist", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, SAVE_TEMPLATE_TO_XML_FILE + "File: " + xslFile.getAbsolutePath() + " does not exist", GSXML.ERROR_TYPE_SYNTAX);
         }
 
@@ -472 +476 @@
     protected Element processGetTemplateListFromFile(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, GET_TEMPLATE_LIST_FROM_FILE);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, GET_TEMPLATE_LIST_FROM_FILE);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, GET_TEMPLATE_LIST_FROM_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_TEMPLATE_LIST_FROM_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -492 +497 @@
         if (!found)
         {
-            GSXML.addError(this.doc, result, "This user does not have the required permissions to perform this action.");
+            GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
         }
@@ -501 +506 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -517 +522 @@
         if (locationName == null || locationName.length() == 0)
         {
-            GSXML.addError(this.doc, result, "Parameter \"locationName\" was null or empty.");
+            GSXML.addError(result, "Parameter \"locationName\" was null or empty.");
             return result;
         }
@@ -534 +539 @@
             }
 
-            Element templateList = this.doc.createElement("templateList");
+            Element templateList = result_doc.createElement("templateList");
             StringBuilder templateListString = new StringBuilder("[");
 
@@ -574 +579 @@
         else
         {
-            GSXML.addError(this.doc, result, "File: " + xslFile.getAbsolutePath() + " does not exist");
+            GSXML.addError(result, "File: " + xslFile.getAbsolutePath() + " does not exist");
             return result;
         }
@@ -583 +588 @@
     protected Element processGetXSLTFilesForCollection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, GET_XSLT_FILES_FOR_COLLECTION);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, GET_XSLT_FILES_FOR_COLLECTION);
 
         if (request == null)
         {
-            GSXML.addError(this.doc, result, GET_XSLT_FILES_FOR_COLLECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_XSLT_FILES_FOR_COLLECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -603 +609 @@
         if (!found)
         {
-            GSXML.addError(this.doc, result, "This user does not have the required permissions to perform this action.");
+            GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
         }
@@ -612 +618 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, GET_TEMPLATE_FROM_XML_FILE + ": No param list specified", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -622 +628 @@
         String collectionName = (String) params.get("collectionName");
 
-        Element fileList = this.doc.createElement("fileListJSON");
+        Element fileList = result_doc.createElement("fileListJSON");
         StringBuilder fileListString = new StringBuilder("[");
 

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

@@ -25 +25 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 
 import org.w3c.dom.Document;
@@ -82 +83 @@
         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]);
@@ -88 +89 @@
         }
         
-        _GSDM = new GSDocumentModel(this.site_home, this.doc, this.router);
+        _GSDM = new GSDocumentModel(this.site_home, this.router);
 
         return true;
     }
 
-    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++)
@@ -99 +100 @@
             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]);
@@ -115 +116 @@
     protected Element processDocXMLCreateEmptyFile(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_CREATE_EMPTY_FILE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_CREATE_EMPTY_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_CREATE_EMPTY_FILE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_CREATE_EMPTY_FILE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -144 +146 @@
     protected Element processDocXMLGetMetadata(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_GET_METADATA);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_GET_METADATA + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_GET_METADATA);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_GET_METADATA + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -171 +174 @@
             for(Element metadataValue : metadataValues)
             {
-                Element metadataElem = this.doc.createElement(GSXML.METADATA_ELEM);
+                Element metadataElem = result_doc.createElement(GSXML.METADATA_ELEM);
                 metadataElem.setAttribute(GSXML.NAME_ATT, metadataName);
                 metadataElem.setAttribute(GSXML.VALUE_ATT, metadataValue.getFirstChild().getNodeValue());
@@ -183 +186 @@
     protected Element processDocXMLSetMetadata(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_SET_METADATA);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_SET_METADATA + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_SET_METADATA);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_SET_METADATA + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -232 +236 @@
                 catch(Exception ex)
                 {
-                    GSXML.addError(this.doc, result, DOC_XML_SET_METADATA + ": Error converting the position attribute to an integer", GSXML.ERROR_TYPE_SYNTAX);
+                    GSXML.addError(result, DOC_XML_SET_METADATA + ": Error converting the position attribute to an integer", GSXML.ERROR_TYPE_SYNTAX);
                     return result;
                 }
@@ -252 +256 @@
             else
             {
-                GSXML.addError(this.doc, result, DOC_XML_SET_METADATA + ": A position or previous value was not given", GSXML.ERROR_TYPE_SYNTAX);
+                GSXML.addError(result, DOC_XML_SET_METADATA + ": A position or previous value was not given", GSXML.ERROR_TYPE_SYNTAX);
                 return result;
             }
@@ -262 +266 @@
     protected Element processDocXMLCreateSection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_CREATE_SECTION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_CREATE_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_CREATE_SECTION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_CREATE_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -291 +296 @@
     protected Element processDocXMLDeleteSection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_DELETE_SECTION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_DELETE_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_DELETE_SECTION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_DELETE_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -320 +326 @@
     protected Element processDocXMLGetSection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_GET_SECTION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_GET_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_GET_SECTION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_GET_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -349 +356 @@
     protected Element processDocXMLSetSection(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_SET_SECTION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_SET_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_SET_SECTION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_SET_SECTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -394 +402 @@
     protected Element processDocXMLGetText(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_GET_TEXT);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_GET_TEXT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_GET_TEXT);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_GET_TEXT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -420 +429 @@
             if (content == null)
             {
-                result.appendChild(this.doc.createElement(GSXML.DOCXML_CONTENT_ELEM));
+                result.appendChild(result_doc.createElement(GSXML.DOCXML_CONTENT_ELEM));
             }
             else
             {
-                Element contentElem = this.doc.createElement(GSXML.DOCXML_CONTENT_ELEM);
-                Node textNode = this.doc.createTextNode(content);
+                Element contentElem = result_doc.createElement(GSXML.DOCXML_CONTENT_ELEM);
+                Node textNode = result_doc.createTextNode(content);
                 contentElem.appendChild(textNode);
                 result.appendChild(contentElem); 
@@ -436 +445 @@
     protected Element processDocXMLSetText(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOC_XML_SET_TEXT);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOC_XML_SET_TEXT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOC_XML_SET_TEXT);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOC_XML_SET_TEXT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }

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

@@ -27 +27 @@
 import java.util.Iterator;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -35 +36 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
 
 import java.net.InetAddress;
@@ -115 +117 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element add_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element add_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         add_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         add_service.setAttribute(GSXML.NAME_ATT, ADD_ITEM_SERVICE);
@@ -121 +123 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element disp_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element disp_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         disp_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         disp_service.setAttribute(GSXML.NAME_ATT, DISPLAY_ITEMS_SERVICE);
@@ -127 +129 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element num_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element num_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         num_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         num_service.setAttribute(GSXML.NAME_ATT, ITEM_NUM_SERVICE);
@@ -133 +135 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element delete_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element delete_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         delete_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         delete_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEMS_SERVICE);
@@ -139 +141 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element deleteone_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element deleteone_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         deleteone_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         deleteone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE);
@@ -145 +147 @@
         
         // set up short_service_info_ - for now just has name and type
-        Element deleteall_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element deleteall_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         deleteall_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         deleteall_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE);
@@ -151 +153 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element merge_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element merge_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         merge_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
         merge_service.setAttribute(GSXML.NAME_ATT, MERGE_ITEM_SERVICE);
@@ -160 +162 @@
 
     /** returns a specific service description */
-    protected Element getServiceDescription(String service_id, String lang, String subset)
+  protected Element getServiceDescription(Document doc, String service_id, String lang, String subset)
     {
         if (service_id.equals(ADD_ITEM_SERVICE))
         {
-            Element add_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element add_service = doc.createElement(GSXML.SERVICE_ELEM);
             add_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             add_service.setAttribute(GSXML.NAME_ATT, ADD_ITEM_SERVICE);
@@ -172 +174 @@
         {
 
-            Element disp_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element disp_service = doc.createElement(GSXML.SERVICE_ELEM);
             disp_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             disp_service.setAttribute(GSXML.NAME_ATT, DISPLAY_ITEMS_SERVICE);
@@ -181 +183 @@
         {
 
-            Element num_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element num_service = doc.createElement(GSXML.SERVICE_ELEM);
             num_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             num_service.setAttribute(GSXML.NAME_ATT, ITEM_NUM_SERVICE);
@@ -190 +192 @@
         {
 
-            Element del_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element del_service = doc.createElement(GSXML.SERVICE_ELEM);
             del_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             del_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEMS_SERVICE);
@@ -199 +201 @@
         {
 
-            Element clear_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element clear_service = doc.createElement(GSXML.SERVICE_ELEM);
             clear_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             clear_service.setAttribute(GSXML.NAME_ATT, CLEAR_ITEMS_SERVICE);
@@ -208 +210 @@
         {
 
-            Element delone_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element delone_service = doc.createElement(GSXML.SERVICE_ELEM);
             delone_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             delone_service.setAttribute(GSXML.NAME_ATT, DELETE_ITEM_SERVICE);
@@ -215 +217 @@
         if (service_id.equals(MERGE_ITEM_SERVICE))
         {
-            Element merge_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element merge_service = doc.createElement(GSXML.SERVICE_ELEM);
             merge_service.setAttribute(GSXML.TYPE_ATT, "gather"); // what??
             merge_service.setAttribute(GSXML.NAME_ATT, MERGE_ITEM_SERVICE);
@@ -229 +231 @@
         //System.err.println("DOCSMAP = " + docsMap);
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -261 +264 @@
                 Item newItem = generateItem(collection, item);
                 items.put(item, newItem);
-                result.appendChild(newItem.wrapIntoElement());
+                result.appendChild(newItem.wrapIntoElement(result_doc));
             }
         }
@@ -270 +273 @@
             items.put(item, newItem);
             docsMap.put(collection, items);
-            result.appendChild(newItem.wrapIntoElement());
+            result.appendChild(newItem.wrapIntoElement(result_doc));
         }
 
@@ -423 +426 @@
     {
         Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request);
-        
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
         
         // Get the parameters of the request
@@ -451 +454 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -509 +513 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         // Get the parameters of the request
@@ -560 +565 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         int size = 0;
@@ -574 +580 @@
             {
                 Item item = (Item) values.next();
-                result.appendChild(item.wrapIntoElement());
-            }
-        }
-
-        Element selement = this.doc.createElement("size");
+                result.appendChild(item.wrapIntoElement(result_doc));
+            }
+        }
+
+        Element selement = result_doc.createElement("size");
         selement.setAttribute("value", size + "");
         result.appendChild(selement);
@@ -585 +591 @@
     }
 
-    private Element getDocumentMetadata(String to, UserContext userContext, Iterator<String> ids)
+  private Element getDocumentMetadata(String to, UserContext userContext, Iterator<String> ids)
     {
 
         // Build a request to obtain some document metadata
-        Element dm_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element dm_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
+      Document msg_doc = XMLConverter.newDOM();
+        Element dm_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
+        Element dm_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
         dm_message.appendChild(dm_request);
 
@@ -599 +606 @@
         meta_names.add("Date");
 
-        Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        Element param_list = msg_doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
 
         Element param = null;
@@ -606 +613 @@
         {
             String name = i.next();
-            param = this.doc.createElement(GSXML.PARAM_ELEM);
+            param = msg_doc.createElement(GSXML.PARAM_ELEM);
             param_list.appendChild(param);
             param.setAttribute(GSXML.NAME_ATT, "metadata");
@@ -615 +622 @@
 
         // create the doc node list for the metadata request
-        Element dm_doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element dm_doc_list = msg_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         dm_request.appendChild(dm_doc_list);
 
@@ -621 +628 @@
         {
             // Add the documentNode to the list
-            Element dm_doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+            Element dm_doc_node = msg_doc.createElement(GSXML.DOC_NODE_ELEM);
             dm_doc_list.appendChild(dm_doc_node);
             dm_doc_node.setAttribute(GSXML.NODE_ID_ATT, ids.next());
@@ -634 +641 @@
 
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
         Iterator<String> keys = docsMap.keySet().iterator();
@@ -644 +652 @@
             Iterator itemItr = items.values().iterator();
 
-            Element collectionNode = this.doc.createElement("documentList");
+            Element collectionNode = result_doc.createElement("documentList");
             collectionNode.setAttribute("name", collection);
             result.appendChild(collectionNode);
@@ -651 +659 @@
             {
                 Item item = (Item) itemItr.next();
-                Element itemElement = this.doc.createElement("item");
+                Element itemElement = result_doc.createElement("item");
 
                 collectionNode.appendChild(itemElement);
@@ -698 +706 @@
         }
 
-        public Element wrapIntoElement()
+        public Element wrapIntoElement(Document doc)
         {
             Element itemElement = doc.createElement("item");

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

@@ -40 +40 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.UserContext;
-
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -84 +86 @@
         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]);
@@ -90 +92 @@
         }
 
-        _GSDM = new GSDocumentModel(this.site_home, this.doc, this.router);
+        _GSDM = new GSDocumentModel(this.site_home, this.router);
 
         return true;
     }
 
-    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++)
@@ -101 +103 @@
             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]);
@@ -117 +119 @@
     protected Element processDocumentCreate(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_CREATE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_CREATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_CREATE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_CREATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -148 +151 @@
     protected Element processDocumentDelete(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_DELETE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_DELETE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_DELETE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_DELETE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -178 +182 @@
     protected Element processDocumentDuplicate(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_DUPLICATE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_DUPLICATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_DUPLICATE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_DUPLICATE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -211 +216 @@
     protected Element processDocumentGetInformation(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_GET_INFORMATION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_GET_INFORMATION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_GET_INFORMATION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_GET_INFORMATION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -249 +255 @@
     protected Element processDocumentMove(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_MOVE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_MOVE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_MOVE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_MOVE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -281 +288 @@
     protected Element processDocumentMerge(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_MERGE);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_MERGE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_MERGE);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_MERGE + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -312 +320 @@
     protected Element processDocumentSplit(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_SPLIT);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_SPLIT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_SPLIT);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_SPLIT + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -338 +347 @@
             catch (Exception ex)
             {
-                GSXML.addError(this.doc, result, DOCUMENT_SPLIT + ": The split point was not an integer", GSXML.ERROR_TYPE_SYNTAX);
+                GSXML.addError(result, DOCUMENT_SPLIT + ": The split point was not an integer", GSXML.ERROR_TYPE_SYNTAX);
                 return result;
             }
@@ -354 +363 @@
     protected Element processDocumentExecuteTransaction(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, DOCUMENT_EXECUTE_TRANSACTION);
-
-        if (request == null)
-        {
-            GSXML.addError(this.doc, result, DOCUMENT_EXECUTE_TRANSACTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, DOCUMENT_EXECUTE_TRANSACTION);
+
+        if (request == null)
+        {
+            GSXML.addError(result, DOCUMENT_EXECUTE_TRANSACTION + ": Request is null", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -367 +377 @@
         if (param_list == null)
         {
-            GSXML.addError(this.doc, result, DOCUMENT_EXECUTE_TRANSACTION + ": Request has no parameter list", GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(result, DOCUMENT_EXECUTE_TRANSACTION + ": Request has no parameter list", GSXML.ERROR_TYPE_SYNTAX);
             return result;
         }
@@ -419 +429 @@
 
                     //_GSDM.documentCreate(oid, collection, userContext); <--- Maybe go back to this
-                    _GSDM.documentXMLSetSection(oid, collection, this.doc.createElement(GSXML.DOCXML_SECTION_ELEM), _GSDM.operationStringToInt(subOperation), userContext);
+                    _GSDM.documentXMLSetSection(oid, collection, result_doc.createElement(GSXML.DOCXML_SECTION_ELEM), _GSDM.operationStringToInt(subOperation), userContext);
                 }
                 else if (operation.equals("delete"))

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp

@@ -185 +185 @@
             
             if (fedora_url != null) {
-            GSXML.addMetadata(this.doc, metadata_list, "URL", fedora_url);
+            GSXML.addMetadata( metadata_list, "URL", fedora_url);
             }
             if (o.getDescription() != null) {
-            GSXML.addMetadata(this.doc, metadata_list, "Description", description[0]);
+            GSXML.addMetadata(metadata_list, "Description", description[0]);
             }
             if (title[0] != null) {
-            GSXML.addMetadata(this.doc, metadata_list, "Title", title[0]);
+            GSXML.addMetadata(metadata_list, "Title", title[0]);
             }
         }
@@ -211 +211 @@
     // Add a metadata element specifying the number of matching documents
     //logger.info("FedoraSearch Number of Documents:" + matchNum);
-    GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+matchNum);
+    GSXML.addMetadata(metadata_list, "numDocsMatched", ""+matchNum);
     
     return result;

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

@@ -87 +87 @@
     extends ServiceRack implements OID.OIDTranslatable
 {
+
+    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.FedoraServiceProxy.class.getName());
+    protected MacroResolver macro_resolver = null;
+
+
+    /** The handle to the fedora connection */
+    private DigitalLibraryServicesAPIA fedoraServicesAPIA;
+
+    private String prevLanguage = "";
+
+    public void cleanUp() { 
+    super.cleanUp();
+    }
+    
+    /** sets the message router */
+    public void setMessageRouter(MessageRouter m) {
+       this.router = m;
+       setLibraryName(m.getLibraryName());
+    }
+
+    /** the no-args constructor */
+    public FedoraServiceProxy() {
+    super();
+
+    this.macro_resolver = new BasicTextMacroResolver();
+    }
+    
+
+    /* configure the service module
+     *
+     * @param info the XML node <serviceRack name="XXX"/> with name equal
+     * to the class name (of the subclass)
+     *
+     * must configure short_service_info_ and service_info_map_
+     * @return true if configured ok
+     * must be implemented in subclasses
+     */
+    /*public boolean configure(Element info) {
+    return configure(info, null);
+    }*/
+    
+    public boolean configure(Element info, Element extra_info) {
+    // set up the class loader
+        
+    if (!super.configure(info, extra_info)){
+        return false;
+    }
+
+    // Try to instantiate a Fedora dl handle
+    try {
+        // Fedora connection settings defaults. 
+        // Read host and port from global.properties, since by default, we expect the Greenstone server to be used
+        Properties globalProperties = new Properties();
+        globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
+        String host = globalProperties.getProperty("tomcat.server", "localhost");
+        String port = globalProperties.getProperty("tomcat.port", "8383");
+        String protocol = "http";
+        String username = "fedoraIntCallUser"; //"fedoraAdmin"
+        String password = "changeme"; //"<user password>"
+
+        // See if buildConfig.xml overrides any of the defaults
+        // info is the <serviceRack> Element from buildConfig.xml (extra_info are the Elements of collectionConfig.xml)
+
+        NodeList nodes = info.getElementsByTagName("fedoraConnection");
+        if(nodes != null && nodes.getLength() > 0) {
+
+        Element fedoraElement = (Element)nodes.item(0);
+        if(fedoraElement.hasAttribute("protocol")) {
+            protocol = fedoraElement.getAttribute("protocol");
+        }       
+        if(fedoraElement.hasAttribute("host")) {
+            host = fedoraElement.getAttribute("host");
+        }
+        if(fedoraElement.hasAttribute("port")) {
+            port = fedoraElement.getAttribute("port");
+        }
+        if(fedoraElement.hasAttribute("username")) {
+            username = fedoraElement.getAttribute("username");
+        }
+        if(fedoraElement.hasAttribute("password")) {
+            password = fedoraElement.getAttribute("password");
+        }       
+        }   
+
+        fedoraServicesAPIA = new FedoraServicesAPIA(protocol, host, Integer.parseInt(port), username, password);
+
+    } catch(org.greenstone.fedora.services.FedoraGS3Exception.CancelledException e) {
+        // The user pressed cancel in the fedora services instantiation dialog
+        return false;
+    } catch(Exception e) {
+        logger.error("Error instantiating the interface to the Fedora Repository:\n", e); // second parameter prints e's stacktrace
+        return false;
+    } 
+
+    
+    // Need to put the available services into short_service_info
+    // This is used by DefaultReceptionist.process() has an exception. But DefaultReceptionist.addExtraInfo() 
+    // isn't helpful, and the problem actually already occurs in 
+    // Receptionist.process() -> PageAction.process() -> MessageRouter.process() 
+    // -> Collection/ServiceCluster.process() -> ServiceCluster.configureServiceRackList() 
+    // -> ServiceRack.process() -> ServiceRack.processDescribe() -> ServiceRack.getServiceList().
+    // ServiceRack.getServiceList() requires this ServiceRack's services to be filled into the 
+    // short_service_info Element which needs to be done in this FedoraServiceProxy.configure().
+    
+    // get the display and format elements from the coll config file for
+    // the classifiers
+    AbstractBrowse.extractExtraClassifierInfo(info, extra_info);
+
+    // Copied from IViaProxy.java:
+    String collection = fedoraServicesAPIA.describeCollection(this.cluster_name);
+
+    Element collNode = getResponseAsDOM(collection);
+    Element serviceList = (Element)collNode.getElementsByTagName(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER).item(0);
+
+//this.short_service_info.appendChild(short_service_info.getOwnerDocument().importNode(serviceList, true));
+    // we want the individual service Elements, not the serviceList Element which will wrap it later
+    NodeList services = collNode.getElementsByTagName(GSXML.SERVICE_ELEM);
+    for(int i = 0; i < services.getLength(); i++) {
+        Node service = services.item(i);
+        this.short_service_info.appendChild(short_service_info.getOwnerDocument().importNode(service, true));
+    }
+
+    // add some format info to service map if there is any
+    String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
+    Element search_format = (Element) GSXML.getNodeByPath(extra_info, path);
+    if (search_format != null) {
+        this.format_info_map.put("TextQuery", this.desc_doc.importNode(search_format, true));
+        this.format_info_map.put("FieldQuery", this.desc_doc.importNode(search_format, true));
+    }
+    
+    // look for document display format
+    path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
+    Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
+    if (display_format != null) {
+        this.format_info_map.put("DocumentContentRetrieve", this.desc_doc.importNode(display_format, true));
+        // should we make a copy?
+    }
+
+    // the format info
+    Element cb_format_info = this.desc_doc.createElement(GSXML.FORMAT_ELEM);
+    boolean format_found = false;
+
+    // look for classifier <browse><format>
+    path = GSPath.appendLink(GSXML.BROWSE_ELEM, GSXML.FORMAT_ELEM);
+    Element browse_format = (Element)GSXML.getNodeByPath(extra_info, path);
+    if (browse_format != null) {
+        cb_format_info.appendChild(GSXML.duplicateWithNewName(this.desc_doc, browse_format, GSXML.DEFAULT_ELEM, true));
+        format_found = true;
+    } 
+    
+    // add in to the description a simplified list of classifiers
+    Element browse = (Element)GSXML.getChildByTagName(extra_info, "browse"); // the <browse>
+    NodeList classifiers = browse.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
+    for(int i=0; i<classifiers.getLength(); i++) {
+        Element cl = (Element)classifiers.item(i);
+        Element new_cl = (Element)this.desc_doc.importNode(cl, false); // just import this node, not the children
+        
+        // get the format info out, and put inside a classifier element
+        Element format_cl = (Element)new_cl.cloneNode(false);
+        Element format = (Element)GSXML.getChildByTagName(cl, GSXML.FORMAT_ELEM);
+        if (format != null) {
+        
+        //copy all the children
+        NodeList elems = format.getChildNodes();
+        for (int j=0; j<elems.getLength();j++) {
+            format_cl.appendChild(this.desc_doc.importNode(elems.item(j), true));
+        }
+        cb_format_info.appendChild(format_cl);
+        format_found = true;
+        }
+                
+    }
+        
+    if (format_found) {
+        this.format_info_map.put("ClassifierBrowse", cb_format_info);
+    }
+    
+
+    // set up the macro resolver
+    macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name, this.getLibraryName());
+    Element replacement_elem = (Element)GSXML.getChildByTagName(extra_info, "replaceList");
+    if (replacement_elem != null) {
+        macro_resolver.addMacros(replacement_elem);
+    }
+    // look for any refs to global replace lists
+    NodeList replace_refs_elems = extra_info.getElementsByTagName("replaceListRef");
+    for (int i=0; i<replace_refs_elems.getLength(); i++) {
+        String id = ((Element)replace_refs_elems.item(i)).getAttribute("id");
+        if (!id.equals("")) {
+        Element replace_list = GSXML.getNamedElement(this.router.config_info, "replaceList", "id", id);
+        if (replace_list != null) {
+            macro_resolver.addMacros(replace_list);
+        }
+        }
+    }
+
+    // configured ok
+    return true;
+    }
+
+  
+    /* "DocumentContentRetrieve", "DocumentMetadataRetrieve", "DocumentStructureRetrieve", 
+      "TextQuery", "FieldQuery", "ClassifierBrowse", "ClassifierBrowseMetadataRetrieve" */
+
+    protected Element processDocumentContentRetrieve(Element request) {
+    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT); 
+    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL");
+    
+    //logger.error("### request:"); 
+    //logger.error(GSXML.elementToString(request, true));
+
+    if(docIDs == null) {
+        logger.error("DocumentContentRetrieve request specified no doc nodes.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    } else {
+        for(int i = 0; i < docIDs.length; i++) {
+        //logger.error("BEFORE: docIDs[" + i + "]: " + docIDs[i]);
+        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
+            docIDs[i] = translateExternalId(docIDs[i]);
+        } else {
+            docIDs[i] = translateId(docIDs[i]);         
+        }
+        //logger.error("AFTER: docIDs[" + i + "]: " + docIDs[i]);
+        }
+    }
+    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+    
+    // first param (the collection) is not used by Fedora   
+    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentContent(this.cluster_name, docIDs));
+
+    
+    // resolve any collection specific macros
+    NodeList nodeContents = response.getElementsByTagName(GSXML.NODE_CONTENT_ELEM);
+    for(int i = 0; i < nodeContents.getLength(); i++) {
+        Element nodeContent = (Element)nodeContents.item(i);
+        /*if(nodeContent != null) {
+        nodeContent = (Element)nodeContent.getFirstChild(); // textNode
+        }*/
+        //logger.error("GIRAFFE 1. content retrieve response - nodeContent: " + GSXML.nodeToFormattedString(nodeContent));
+        String docContent = nodeContent.getFirstChild().getNodeValue(); // getTextNode and get its contents.
+        //logger.error("GIRAFFE 2. content retrieve response - docContent: " + docContent);
+        
+        if(docContent != null) {
+        // get document text and resolve and macros. Rel and external links have _httpextlink_ set by HTMLPlugin
+        docContent = macro_resolver.resolve(docContent, lang, MacroResolver.SCOPE_TEXT, ""); // doc_id
+        nodeContent.getFirstChild().setNodeValue(docContent);
+        //logger.error("GIRAFFE 3. content retrieve response. Updated docContent: " + docContent);
+        }
+    }
+
+    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
+    }
+
+    protected Element processDocumentStructureRetrieve(Element request) {
+    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT);
+    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL"); 
+
+    if(docIDs == null) {
+        logger.error("DocumentStructureRetrieve request specified no doc nodes.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    } else {
+        for(int i = 0; i < docIDs.length; i++) {
+        //logger.error("BEFORE: docIDs[" + i + "]: " + docIDs[i]);
+        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
+            docIDs[i] = translateExternalId(docIDs[i]);
+        } else {
+            docIDs[i] = translateId(docIDs[i]);
+        }
+        }
+    }
+
+    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
+    String structure="";
+    String info="";
+    for(int i = 0; i < params.getLength(); i++) {
+        Element param = (Element)params.item(i);
+        if(param.getAttribute("name").equals("structure")) {
+        structure = structure + param.getAttribute("value") + "|";
+        } else if(param.getAttribute("name").equals("info")) {
+        info = info + param.getAttribute("value") + "|";
+        }
+    }   
+    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(
+        this.cluster_name, docIDs, new String[]{structure}, new String[]{info}));
+    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
+    }
+
+    protected Element processDocumentMetadataRetrieve(Element request) {
+    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT);
+    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL");
+
+    if(docIDs == null) {
+        logger.error("DocumentMetadataRetrieve request specified no doc nodes.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    } else {
+        for(int i = 0; i < docIDs.length; i++) {
+        //logger.error("**** relLinks[i]: " + relLinks[i]);
+        //logger.error("**** docIDs[i]: " + docIDs[i]);
+        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
+            docIDs[i] = translateExternalId(docIDs[i]);
+        } else {
+            docIDs[i] = translateId(docIDs[i]);
+        }
+        //logger.error("AFTER: docIDs[" + i + "]: " + docIDs[i]);
+        }
+    }
+    
+    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
+    String[] metafields = {};
+    if(params.getLength() > 0) {
+        metafields = new String[params.getLength()];
+        for(int i = 0; i < metafields.length; i++) {
+        Element param = (Element)params.item(i);
+        //if(param.hasAttribute(GSXML.NAME_ATT) && param.getAttribute(GSXML.NAME_ATT).equals("metadata") && param.hasAttribute(GSXML.VALUE_ATT)) {
+        if(param.hasAttribute(GSXML.VALUE_ATT)){ 
+            metafields[i] = param.getAttribute(GSXML.VALUE_ATT);
+        } else {
+            metafields[i] = "";
+        }
+        }
+    }
+
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(
+                        this.cluster_name, docIDs, metafields));
+    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
+    }
+
+    protected Element processClassifierBrowseMetadataRetrieve(Element request) {    
+    String[] classIDs = parse(request, GSXML.CLASS_NODE_ELEM, GSXML.NODE_ID_ATT);
+    //String[] relLinks = parse(request, GSXML.CLASS_NODE_ELEM, "externalURL");
+
+    if(classIDs == null) {
+        logger.error("ClassifierBrowseMetadataRetrieve request specified no classifier nodes.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    } else {
+        for(int i = 0; i < classIDs.length; i++) {
+        classIDs[i] = translateId(classIDs[i]);
+        }
+    }
+    
+    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
+    String[] metafields = {};
+    if(params.getLength() > 0) {
+        metafields = new String[params.getLength()];
+        for(int i = 0; i < metafields.length; i++) {
+        Element param = (Element)params.item(i);
+        if(param.hasAttribute(GSXML.VALUE_ATT)){ 
+            metafields[i] = param.getAttribute(GSXML.VALUE_ATT);
+        } else {
+            metafields[i] = "";
+        }
+        }
+    }
+    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseMetadata(
+           this.cluster_name, "ClassifierBrowseMetadataRetrieve", classIDs, metafields));
+    //logger.error("**** Response from retrieveBrowseMeta: " + GSXML.elementToString(response, true));
+    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
+    }
+
+    protected Element processClassifierBrowse(Element request) {
+    String collection = this.cluster_name;
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+
+    NodeList classNodes = request.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
+    if(classNodes == null || classNodes.getLength() <= 0) {
+        logger.error("ClassifierBrowse request specified no classifier IDs.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    }
+    String classifierIDs[] = new String[classNodes.getLength()];
+    for(int i = 0; i < classifierIDs.length; i++) {
+        Element e = (Element)classNodes.item(i);
+        classifierIDs[i] = e.getAttribute(GSXML.NODE_ID_ATT);
+        classifierIDs[i] = translateId(classifierIDs[i]);   
+    }
+    
+    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
+    String structure="";
+    String info="";
+    for(int i = 0; i < params.getLength(); i++) {
+        Element param = (Element)params.item(i);
+        if(param.getAttribute("name").equals("structure")) {
+        structure = structure + param.getAttribute("value") + "|";
+        } else if(param.getAttribute("name").equals("info")) {
+        info = info + param.getAttribute("value") + "|";
+        }
+    }
+    ///structure = structure + "siblings"; //test for getting with classifier browse structure: siblings
+    
+    Element response 
+        = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseStructure(collection, "ClassifierBrowse", classifierIDs,
+                                      new String[] {structure}, new String[] {info}));
+    //logger.error("**** FedoraServiceProxy - Response from retrieveBrowseStructure: " + GSXML.elementToString(response, true));    
+    
+    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
+    }
+
+    protected Element processTextQuery(Element request) {
+    return processQuery(request, "TextQuery");
+    }
+
+    protected Element processFieldQuery(Element request) {
+    return processQuery(request, "FieldQuery");
+    }
+
+    protected Element processQuery(Element request, String querytype) {
+    String collection = this.cluster_name;
+
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+
+    NodeList paramNodes = request.getElementsByTagName(GSXML.PARAM_ELEM);
+    if(paramNodes.getLength() > 0) {
+        HashMap<String, String> params = new HashMap<String, String>(paramNodes.getLength()); 
+        for(int i = 0; i < paramNodes.getLength(); i++) {
+        Element param = (Element)paramNodes.item(i);
+        params.put(param.getAttribute(GSXML.NAME_ATT), param.getAttribute(GSXML.VALUE_ATT));
+        }
+
+        Element response = getResponseAsDOM(fedoraServicesAPIA.query(collection, querytype, params));
+        return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
+    } else {
+        logger.error("TextQuery request specified no parameters.\n");
+        return XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM); // empty response
+    }
+    }
+
+    // get the requested nodeIDs out of a request message
+    protected String[] parse(Element request, String nodeType, String attribute) {  
+    String[] nodevalues = null;
+    int count = 0;
+
+    Element docList = (Element) GSXML.getChildByTagName(request, nodeType+GSXML.LIST_MODIFIER);
+    if (docList != null) {      
+        NodeList docNodes = docList.getElementsByTagName(nodeType);
+        if(docNodes.getLength() > 0) {
+        nodevalues = new String[docNodes.getLength()];
+        for(int i = 0; i < nodevalues.length; i++) {
+            Element e = (Element)docNodes.item(i);
+            String id = e.getAttribute(attribute);
+            // Not sure why there are at times requests for hashXXX.dir, which is not a fedora PID
+            // To skip these: if not requesting an externalURL and if requesting a docNode, 
+            // then the ID has to contain the : character special to fedora PIDs
+            if(attribute == "externalURL" || (nodeType != GSXML.DOC_NODE_ELEM || id.contains(":"))) {
+            nodevalues[count++] = id;
+            }
+        }
+        }
+    }
+
+    if(count == 0) {
+        return null;
+    }
+
+    String[] tmp = new String[count];
+    for(int i = 0; i < count; i++) {
+        tmp[i] = nodevalues[i];
+    }
+    nodevalues = null;
+    nodevalues = tmp;
+
+    return nodevalues;
+    }
+
+
+    /** if id ends in .fc, .pc etc, then translate it to the correct id 
+     * For now (for testing things work) the default implementation is to just remove the suffix */
+    protected String translateId(String id) {
+    if (OID.needsTranslating(id)) {
+        return OID.translateOID(this, id); //return translateOID(id);
+    }
+    return id;
+    }
+    
+    /** if an id is not a greenstone id (an external id) then translate 
+     * it to a greenstone one 
+     * default implementation: return the id. Custom implementation: 
+     * the id is a url that maps to a fedorapid whose dc.title contains the required HASHID */
+    protected String translateExternalId(String id) {
+    //logger.error("*** to translate an external ID: " + id); /////return id;
+    return this.externalId2OID(id);
+    }
+
+    /** converts an external id to greenstone OID. External ID is a URL link 
+     * that, if relative, maps to a fedorapid that has an entry in fedora.
+     * The dc:title meta for that fedorapid will contain the required OID. */
+    public String externalId2OID(String extid) {
+    if(extid.endsWith(".rt") && (extid.indexOf('.') != extid.lastIndexOf('.'))) { 
+           // .rt is not file extension, but Greenstone request for root of document
+           // not relevant for external ID
+           extid = extid.substring(0, extid.length()-3);
+    }
+
+       // the following method is unique to FedoraServicesAPIA
+    String response = ((FedoraServicesAPIA)fedoraServicesAPIA).getDocIDforURL(extid, this.cluster_name);
+    if(response.indexOf(GSXML.ERROR_ELEM) != -1) {
+        logger.error("**** The following error occurred when trying to find externalID for ID " + extid);
+        logger.error(response);
+        return extid;
+    }
+    if(response.equals("")) {
+        return extid;
+    } else {
+        return response;
+    }
+    }
+
+
+  /** translates relative oids into proper oids:
+   * .pr (parent), .rt (root) .fc (first child), .lc (last child),
+   * .ns (next sibling), .ps (previous sibling) 
+   * .np (next page), .pp (previous page) : links sections in the order that you'd read the document
+   * a suffix is expected to be present so test before using 
+   */
+    public String processOID(String doc_id, String top, String suff, int sibling_num) {
+
+    // send off request to get sibling etc. information from Fedora
+    Element response = null;
+    String[] children = null;
+    if(doc_id.startsWith("CL")) { // classifiernode
+    response = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseStructure(this.cluster_name, "ClassifierBrowse", new String[]{doc_id},
+                                           new String[]{"children"}, new String[]{"siblingPosition"}));
+    NodeList nl = response.getElementsByTagName(GSXML.NODE_STRUCTURE_ELEM);
+    if(nl.getLength() > 0) {
+        Element nodeStructure = (Element)nl.item(0);
+
+        if(nodeStructure != null) {
+        Element root = (Element) GSXML.getChildByTagName(nodeStructure, GSXML.CLASS_NODE_ELEM);
+        if(root != null) { // get children
+            NodeList classNodes = root.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
+            if(classNodes != null) {
+            children = new String[classNodes.getLength()];
+            for(int i = 0; i < children.length; i++) {
+                Element child = (Element)classNodes.item(i);
+                children[i] = child.getAttribute(GSXML.NODE_ID_ATT);
+            }
+            }
+        }
+        }
+    }
+    } else { // documentnode
+    response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(this.cluster_name, new String[]{doc_id},
+                                         new String[]{"children"}, new String[]{"siblingPosition"}));
+    String path = GSPath.createPath(new String[]{GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, 
+                          GSXML.DOC_NODE_ELEM, GSXML.NODE_STRUCTURE_ELEM, GSXML.DOC_NODE_ELEM});    
+    Element parentDocNode = (Element) GSXML.getNodeByPath(response, path);
+
+    if (parentDocNode == null) {
+        return top;
+    } // else 
+    NodeList docNodes = parentDocNode.getElementsByTagName(GSXML.DOC_NODE_ELEM); // only children should remain, since that's what we requested
+    if(docNodes.getLength() > 0) {
+        children = new String[docNodes.getLength()];
+        
+        for(int i = 0; i < children.length; i++) {
+        Element e = (Element)docNodes.item(i);
+        children[i] = e.getAttribute(GSXML.NODE_ID_ATT);
+        }
+    } else { // return root node
+        children = new String[]{doc_id};
+    }
+    }
+    
+    if (suff.equals("fc")) {
+      return children[0];
+    } else if (suff.equals("lc")) {
+      return children[children.length-1];
+    } else {
+      if (suff.equals("ss")) {
+    return children[sibling_num-1];
+      }
+      // find the position that we are at.
+      int i=0;
+      while(i<children.length) {
+    if (children[i].equals(top)) {
+      break;
+    }
+    i++;
+      }
+        
+      if (suff.equals("ns")) {
+    if (i==children.length-1) {
+      return children[i];
+    }
+    return children[i+1];
+      } else if (suff.equals("ps")) {
+    if (i==0) {
+      return children[i];
+    }
+    return children[i-1];
+      }
+    }
+
+    return top;
+  }
+
+
+    protected Element getResponseAsDOM(String response) {
+    if(response == null) { // will not be the case, because an empty  
+        return null;    // response message will be sent instead
+    }
+
+    Element message = null;     
+    try{
+        // turn the String xml response into a DOM tree:    
+        DocumentBuilder builder 
+        = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document doc 
+        = builder.parse(new InputSource(new StringReader(response)));
+        message = doc.getDocumentElement();
+    } catch(Exception e){
+        if(response == null) {
+        response = "";
+        }
+        logger.error("An error occurred while trying to parse the response: ");
+        logger.error(response);
+        logger.error(e.getMessage());
+    }
+    
+    // Error elements in message will be processed outside of here, just return the message
+    return message;
+    }
+
+    /* //process method for stylesheet requests    
+    protected Element processFormat(Element request) {} */
+    
+    /* returns the service list for the subclass */
+    /* protected Element getServiceList(String lang) {
+    // for now, it is static and has no language stuff
+    return (Element) this.short_service_info.cloneNode(true);
+    }*/
+
+    /** returns a specific service description */
+  protected Element getServiceDescription(Document doc, String service, String lang, String subset) {
+    if(!lang.equals(prevLanguage)) {
+        prevLanguage = lang;
+        fedoraServicesAPIA.setLanguage(lang);
+    }
+    String serviceResponse = fedoraServicesAPIA.describeService(service);
+    Element response = getResponseAsDOM(serviceResponse);
+
+    // should be no chance of an npe, since FedoraGS3 lists the services, so will have descriptions for each
+    Element e = (Element)response.getElementsByTagName(GSXML.SERVICE_ELEM).item(0);
+    e = (Element)doc.importNode(e, true);
+    return e; 
+    }
+
+    /** overloaded version for no args case */
+    protected String getTextString(String key, String lang) {
+    return getTextString(key, lang, null, null);
+    }
+
+    protected String getTextString(String key, String lang, String dictionary) {
+    return getTextString(key, lang, dictionary, null);
+    }
+    protected String getTextString(String key, String lang, String [] args) {
+    return getTextString(key, lang, null, args);
+    }
+    
+    /** getTextString - retrieves a language specific text string for the given
+key and locale, from the specified resource_bundle (dictionary)
+    */
+    protected String getTextString(String key, String lang, String dictionary, String[] args) {
+
+    // we want to use the collection class loader in case there are coll specific files
+    if (dictionary != null) {
+        // just try the one specified dictionary
+        Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
+        String result = dict.get(key, args);
+        if (result == null) { // not found
+        return "_"+key+"_";
+        }
+        return result;
+    }
+
+    // now we try class names for dictionary names
+    String class_name = this.getClass().getName();
+    class_name = class_name.substring(class_name.lastIndexOf('.')+1);
+    Dictionary dict = new Dictionary(class_name, lang, this.class_loader);
+    String result = dict.get(key, args);
+    if (result != null) {
+        return result;
+    }
+
+    // we have to try super classes
+    Class c = this.getClass().getSuperclass();
+    while (result == null && c != null) {
+        class_name = c.getName();
+        class_name = class_name.substring(class_name.lastIndexOf('.')+1);
+        if (class_name.equals("ServiceRack")) {
+        // this is as far as we go
+        break;
+        }
+        dict = new Dictionary(class_name, lang, this.class_loader);
+        result = dict.get(key, args);
+        c = c.getSuperclass();
+    }
+    if (result == null) {
+        return "_"+key+"_";
+    }
+    return result;
+    
+    }
+
+    protected String getMetadataNameText(String key, String lang) {
+
+    String properties_name = "metadata_names";
+    Dictionary dict = new Dictionary(properties_name, lang);
+    
+    String result = dict.get(key);
+    if (result == null) { // not found
+        return null;
+    } 
+    return result;
+    }
+
     public static class BasicTextMacroResolver extends MacroResolver {  
     private static final Pattern p_back_slash = Pattern.compile("\\\"");// create a pattern "\\\"", but it matches both " and \"
@@ -137 +881 @@
     }
 
-    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.FedoraServiceProxy.class.getName());
-    protected MacroResolver macro_resolver = null;
-
-
-    /** The handle to the fedora connection */
-    private DigitalLibraryServicesAPIA fedoraServicesAPIA;
-
-    private String prevLanguage = "";
-
-    public void cleanUp() { 
-    super.cleanUp();
-    }
-    
-    /** sets the message router */
-    public void setMessageRouter(MessageRouter m) {
-       this.router = m;
-       setLibraryName(m.getLibraryName());
-    }
-
-    /** the no-args constructor */
-    public FedoraServiceProxy() {
-    super();
-
-    this.converter = new XMLConverter();
-    this.doc = this.converter.newDOM();
-    this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-    this.macro_resolver = new BasicTextMacroResolver();
-    }
-    
-
-    /* configure the service module
-     *
-     * @param info the XML node <serviceRack name="XXX"/> with name equal
-     * to the class name (of the subclass)
-     *
-     * must configure short_service_info_ and service_info_map_
-     * @return true if configured ok
-     * must be implemented in subclasses
-     */
-    /*public boolean configure(Element info) {
-    return configure(info, null);
-    }*/
-    
-    public boolean configure(Element info, Element extra_info) {
-    // set up the class loader
-        
-    if (!super.configure(info, extra_info)){
-        return false;
-    }
-
-    // Try to instantiate a Fedora dl handle
-    try {
-        // Fedora connection settings defaults. 
-        // Read host and port from global.properties, since by default, we expect the Greenstone server to be used
-        Properties globalProperties = new Properties();
-        globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
-        String host = globalProperties.getProperty("tomcat.server", "localhost");
-        String port = globalProperties.getProperty("tomcat.port", "8383");
-        String protocol = "http";
-        String username = "fedoraIntCallUser"; //"fedoraAdmin"
-        String password = "changeme"; //"<user password>"
-
-        // See if buildConfig.xml overrides any of the defaults
-        // info is the <serviceRack> Element from buildConfig.xml (extra_info are the Elements of collectionConfig.xml)
-
-        NodeList nodes = info.getElementsByTagName("fedoraConnection");
-        if(nodes != null && nodes.getLength() > 0) {
-
-        Element fedoraElement = (Element)nodes.item(0);
-        if(fedoraElement.hasAttribute("protocol")) {
-            protocol = fedoraElement.getAttribute("protocol");
-        }       
-        if(fedoraElement.hasAttribute("host")) {
-            host = fedoraElement.getAttribute("host");
-        }
-        if(fedoraElement.hasAttribute("port")) {
-            port = fedoraElement.getAttribute("port");
-        }
-        if(fedoraElement.hasAttribute("username")) {
-            username = fedoraElement.getAttribute("username");
-        }
-        if(fedoraElement.hasAttribute("password")) {
-            password = fedoraElement.getAttribute("password");
-        }       
-        }   
-
-        fedoraServicesAPIA = new FedoraServicesAPIA(protocol, host, Integer.parseInt(port), username, password);
-
-    } catch(org.greenstone.fedora.services.FedoraGS3Exception.CancelledException e) {
-        // The user pressed cancel in the fedora services instantiation dialog
-        return false;
-    } catch(Exception e) {
-        logger.error("Error instantiating the interface to the Fedora Repository:\n", e); // second parameter prints e's stacktrace
-        return false;
-    } 
-
-    
-    // Need to put the available services into short_service_info
-    // This is used by DefaultReceptionist.process() has an exception. But DefaultReceptionist.addExtraInfo() 
-    // isn't helpful, and the problem actually already occurs in 
-    // Receptionist.process() -> PageAction.process() -> MessageRouter.process() 
-    // -> Collection/ServiceCluster.process() -> ServiceCluster.configureServiceRackList() 
-    // -> ServiceRack.process() -> ServiceRack.processDescribe() -> ServiceRack.getServiceList().
-    // ServiceRack.getServiceList() requires this ServiceRack's services to be filled into the 
-    // short_service_info Element which needs to be done in this FedoraServiceProxy.configure().
-    
-    // get the display and format elements from the coll config file for
-    // the classifiers
-    AbstractBrowse.extractExtraClassifierInfo(info, extra_info);
-
-    // Copied from IViaProxy.java:
-    String collection = fedoraServicesAPIA.describeCollection(this.cluster_name);
-
-    Element collNode = getResponseAsDOM(collection);
-    Element serviceList = (Element)collNode.getElementsByTagName(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER).item(0);
-
-//this.short_service_info.appendChild(short_service_info.getOwnerDocument().importNode(serviceList, true));
-    // we want the individual service Elements, not the serviceList Element which will wrap it later
-    NodeList services = collNode.getElementsByTagName(GSXML.SERVICE_ELEM);
-    for(int i = 0; i < services.getLength(); i++) {
-        Node service = services.item(i);
-        this.short_service_info.appendChild(short_service_info.getOwnerDocument().importNode(service, true));
-    }
-
-    // add some format info to service map if there is any
-    String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
-    Element search_format = (Element) GSXML.getNodeByPath(extra_info, path);
-    if (search_format != null) {
-        this.format_info_map.put("TextQuery", this.doc.importNode(search_format, true));
-        this.format_info_map.put("FieldQuery", this.doc.importNode(search_format, true));
-    }
-    
-    // look for document display format
-    path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
-    Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
-    if (display_format != null) {
-        this.format_info_map.put("DocumentContentRetrieve", this.doc.importNode(display_format, true));
-        // should we make a copy?
-    }
-
-    // the format info
-    Element cb_format_info = this.doc.createElement(GSXML.FORMAT_ELEM);
-    boolean format_found = false;
-
-    // look for classifier <browse><format>
-    path = GSPath.appendLink(GSXML.BROWSE_ELEM, GSXML.FORMAT_ELEM);
-    Element browse_format = (Element)GSXML.getNodeByPath(extra_info, path);
-    if (browse_format != null) {
-        cb_format_info.appendChild(GSXML.duplicateWithNewName(this.doc, browse_format, GSXML.DEFAULT_ELEM, true));
-        format_found = true;
-    } 
-    
-    // add in to the description a simplified list of classifiers
-    Element browse = (Element)GSXML.getChildByTagName(extra_info, "browse"); // the <browse>
-    NodeList classifiers = browse.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
-    for(int i=0; i<classifiers.getLength(); i++) {
-        Element cl = (Element)classifiers.item(i);
-        Element new_cl = (Element)this.doc.importNode(cl, false); // just import this node, not the children
-        
-        // get the format info out, and put inside a classifier element
-        Element format_cl = (Element)new_cl.cloneNode(false);
-        Element format = (Element)GSXML.getChildByTagName(cl, GSXML.FORMAT_ELEM);
-        if (format != null) {
-        
-        //copy all the children
-        NodeList elems = format.getChildNodes();
-        for (int j=0; j<elems.getLength();j++) {
-            format_cl.appendChild(this.doc.importNode(elems.item(j), true));
-        }
-        cb_format_info.appendChild(format_cl);
-        format_found = true;
-        }
-                
-    }
-        
-    if (format_found) {
-        this.format_info_map.put("ClassifierBrowse", cb_format_info);
-    }
-    
-
-    // set up the macro resolver
-    macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name, this.getLibraryName());
-    Element replacement_elem = (Element)GSXML.getChildByTagName(extra_info, "replaceList");
-    if (replacement_elem != null) {
-        macro_resolver.addMacros(replacement_elem);
-    }
-    // look for any refs to global replace lists
-    NodeList replace_refs_elems = extra_info.getElementsByTagName("replaceListRef");
-    for (int i=0; i<replace_refs_elems.getLength(); i++) {
-        String id = ((Element)replace_refs_elems.item(i)).getAttribute("id");
-        if (!id.equals("")) {
-        Element replace_list = GSXML.getNamedElement(this.router.config_info, "replaceList", "id", id);
-        if (replace_list != null) {
-            macro_resolver.addMacros(replace_list);
-        }
-        }
-    }
-
-    // configured ok
-    return true;
-    }
-
-  
-    /* "DocumentContentRetrieve", "DocumentMetadataRetrieve", "DocumentStructureRetrieve", 
-      "TextQuery", "FieldQuery", "ClassifierBrowse", "ClassifierBrowseMetadataRetrieve" */
-
-    protected Element processDocumentContentRetrieve(Element request) {
-    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT); 
-    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL");
-    
-    //logger.error("### request:"); 
-    //logger.error(GSXML.elementToString(request, true));
-
-    if(docIDs == null) {
-        logger.error("DocumentContentRetrieve request specified no doc nodes.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    } else {
-        for(int i = 0; i < docIDs.length; i++) {
-        //logger.error("BEFORE: docIDs[" + i + "]: " + docIDs[i]);
-        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
-            docIDs[i] = translateExternalId(docIDs[i]);
-        } else {
-            docIDs[i] = translateId(docIDs[i]);         
-        }
-        //logger.error("AFTER: docIDs[" + i + "]: " + docIDs[i]);
-        }
-    }
-    
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-    
-    // first param (the collection) is not used by Fedora   
-    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentContent(this.cluster_name, docIDs));
-
-    
-    // resolve any collection specific macros
-    NodeList nodeContents = response.getElementsByTagName(GSXML.NODE_CONTENT_ELEM);
-    for(int i = 0; i < nodeContents.getLength(); i++) {
-        Element nodeContent = (Element)nodeContents.item(i);
-        /*if(nodeContent != null) {
-        nodeContent = (Element)nodeContent.getFirstChild(); // textNode
-        }*/
-        //logger.error("GIRAFFE 1. content retrieve response - nodeContent: " + GSXML.nodeToFormattedString(nodeContent));
-        String docContent = nodeContent.getFirstChild().getNodeValue(); // getTextNode and get its contents.
-        //logger.error("GIRAFFE 2. content retrieve response - docContent: " + docContent);
-        
-        if(docContent != null) {
-        // get document text and resolve and macros. Rel and external links have _httpextlink_ set by HTMLPlugin
-        docContent = macro_resolver.resolve(docContent, lang, MacroResolver.SCOPE_TEXT, ""); // doc_id
-        nodeContent.getFirstChild().setNodeValue(docContent);
-        //logger.error("GIRAFFE 3. content retrieve response. Updated docContent: " + docContent);
-        }
-    }
-
-    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
-    }
-
-    protected Element processDocumentStructureRetrieve(Element request) {
-    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT);
-    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL"); 
-
-    if(docIDs == null) {
-        logger.error("DocumentStructureRetrieve request specified no doc nodes.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    } else {
-        for(int i = 0; i < docIDs.length; i++) {
-        //logger.error("BEFORE: docIDs[" + i + "]: " + docIDs[i]);
-        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
-            docIDs[i] = translateExternalId(docIDs[i]);
-        } else {
-            docIDs[i] = translateId(docIDs[i]);
-        }
-        }
-    }
-
-    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
-    String structure="";
-    String info="";
-    for(int i = 0; i < params.getLength(); i++) {
-        Element param = (Element)params.item(i);
-        if(param.getAttribute("name").equals("structure")) {
-        structure = structure + param.getAttribute("value") + "|";
-        } else if(param.getAttribute("name").equals("info")) {
-        info = info + param.getAttribute("value") + "|";
-        }
-    }   
-    
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(
-        this.cluster_name, docIDs, new String[]{structure}, new String[]{info}));
-    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
-    }
-
-    protected Element processDocumentMetadataRetrieve(Element request) {
-    String[] docIDs = parse(request, GSXML.DOC_NODE_ELEM, GSXML.NODE_ID_ATT);
-    String[] relLinks = parse(request, GSXML.DOC_NODE_ELEM, "externalURL");
-
-    if(docIDs == null) {
-        logger.error("DocumentMetadataRetrieve request specified no doc nodes.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    } else {
-        for(int i = 0; i < docIDs.length; i++) {
-        //logger.error("**** relLinks[i]: " + relLinks[i]);
-        //logger.error("**** docIDs[i]: " + docIDs[i]);
-        if(relLinks[i] != null && docIDs[i].startsWith("http://")) { // need to do a look up
-            docIDs[i] = translateExternalId(docIDs[i]);
-        } else {
-            docIDs[i] = translateId(docIDs[i]);
-        }
-        //logger.error("AFTER: docIDs[" + i + "]: " + docIDs[i]);
-        }
-    }
-    
-    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
-    String[] metafields = {};
-    if(params.getLength() > 0) {
-        metafields = new String[params.getLength()];
-        for(int i = 0; i < metafields.length; i++) {
-        Element param = (Element)params.item(i);
-        //if(param.hasAttribute(GSXML.NAME_ATT) && param.getAttribute(GSXML.NAME_ATT).equals("metadata") && param.hasAttribute(GSXML.VALUE_ATT)) {
-        if(param.hasAttribute(GSXML.VALUE_ATT)){ 
-            metafields[i] = param.getAttribute(GSXML.VALUE_ATT);
-        } else {
-            metafields[i] = "";
-        }
-        }
-    }
-
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentMetadata(
-                        this.cluster_name, docIDs, metafields));
-    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0); 
-    }
-
-    protected Element processClassifierBrowseMetadataRetrieve(Element request) {    
-    String[] classIDs = parse(request, GSXML.CLASS_NODE_ELEM, GSXML.NODE_ID_ATT);
-    //String[] relLinks = parse(request, GSXML.CLASS_NODE_ELEM, "externalURL");
-
-    if(classIDs == null) {
-        logger.error("ClassifierBrowseMetadataRetrieve request specified no classifier nodes.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    } else {
-        for(int i = 0; i < classIDs.length; i++) {
-        classIDs[i] = translateId(classIDs[i]);
-        }
-    }
-    
-    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
-    String[] metafields = {};
-    if(params.getLength() > 0) {
-        metafields = new String[params.getLength()];
-        for(int i = 0; i < metafields.length; i++) {
-        Element param = (Element)params.item(i);
-        if(param.hasAttribute(GSXML.VALUE_ATT)){ 
-            metafields[i] = param.getAttribute(GSXML.VALUE_ATT);
-        } else {
-            metafields[i] = "";
-        }
-        }
-    }
-    
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-    Element response = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseMetadata(
-           this.cluster_name, "ClassifierBrowseMetadataRetrieve", classIDs, metafields));
-    //logger.error("**** Response from retrieveBrowseMeta: " + GSXML.elementToString(response, true));
-    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
-    }
-
-    protected Element processClassifierBrowse(Element request) {
-    String collection = this.cluster_name;
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-
-    NodeList classNodes = request.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
-    if(classNodes == null || classNodes.getLength() <= 0) {
-        logger.error("ClassifierBrowse request specified no classifier IDs.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    }
-    String classifierIDs[] = new String[classNodes.getLength()];
-    for(int i = 0; i < classifierIDs.length; i++) {
-        Element e = (Element)classNodes.item(i);
-        classifierIDs[i] = e.getAttribute(GSXML.NODE_ID_ATT);
-        classifierIDs[i] = translateId(classifierIDs[i]);   
-    }
-    
-    NodeList params = request.getElementsByTagName(GSXML.PARAM_ELEM);
-    String structure="";
-    String info="";
-    for(int i = 0; i < params.getLength(); i++) {
-        Element param = (Element)params.item(i);
-        if(param.getAttribute("name").equals("structure")) {
-        structure = structure + param.getAttribute("value") + "|";
-        } else if(param.getAttribute("name").equals("info")) {
-        info = info + param.getAttribute("value") + "|";
-        }
-    }
-    ///structure = structure + "siblings"; //test for getting with classifier browse structure: siblings
-    
-    Element response 
-        = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseStructure(collection, "ClassifierBrowse", classifierIDs,
-                                      new String[] {structure}, new String[] {info}));
-    //logger.error("**** FedoraServiceProxy - Response from retrieveBrowseStructure: " + GSXML.elementToString(response, true));    
-    
-    return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
-    }
-
-    protected Element processTextQuery(Element request) {
-    return processQuery(request, "TextQuery");
-    }
-
-    protected Element processFieldQuery(Element request) {
-    return processQuery(request, "FieldQuery");
-    }
-
-    protected Element processQuery(Element request, String querytype) {
-    String collection = this.cluster_name;
-
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-
-    NodeList paramNodes = request.getElementsByTagName(GSXML.PARAM_ELEM);
-    if(paramNodes.getLength() > 0) {
-        HashMap<String, String> params = new HashMap<String, String>(paramNodes.getLength()); 
-        for(int i = 0; i < paramNodes.getLength(); i++) {
-        Element param = (Element)paramNodes.item(i);
-        params.put(param.getAttribute(GSXML.NAME_ATT), param.getAttribute(GSXML.VALUE_ATT));
-        }
-
-        Element response = getResponseAsDOM(fedoraServicesAPIA.query(collection, querytype, params));
-        return (Element)response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(0);
-    } else {
-        logger.error("TextQuery request specified no parameters.\n");
-        return this.doc.createElement(GSXML.RESPONSE_ELEM); // empty response
-    }
-    }
-
-    // get the requested nodeIDs out of a request message
-    protected String[] parse(Element request, String nodeType, String attribute) {  
-    String[] nodevalues = null;
-    int count = 0;
-
-    Element docList = (Element) GSXML.getChildByTagName(request, nodeType+GSXML.LIST_MODIFIER);
-    if (docList != null) {      
-        NodeList docNodes = docList.getElementsByTagName(nodeType);
-        if(docNodes.getLength() > 0) {
-        nodevalues = new String[docNodes.getLength()];
-        for(int i = 0; i < nodevalues.length; i++) {
-            Element e = (Element)docNodes.item(i);
-            String id = e.getAttribute(attribute);
-            // Not sure why there are at times requests for hashXXX.dir, which is not a fedora PID
-            // To skip these: if not requesting an externalURL and if requesting a docNode, 
-            // then the ID has to contain the : character special to fedora PIDs
-            if(attribute == "externalURL" || (nodeType != GSXML.DOC_NODE_ELEM || id.contains(":"))) {
-            nodevalues[count++] = id;
-            }
-        }
-        }
-    }
-
-    if(count == 0) {
-        return null;
-    }
-
-    String[] tmp = new String[count];
-    for(int i = 0; i < count; i++) {
-        tmp[i] = nodevalues[i];
-    }
-    nodevalues = null;
-    nodevalues = tmp;
-
-    return nodevalues;
-    }
-
-
-    /** if id ends in .fc, .pc etc, then translate it to the correct id 
-     * For now (for testing things work) the default implementation is to just remove the suffix */
-    protected String translateId(String id) {
-    if (OID.needsTranslating(id)) {
-        return OID.translateOID(this, id); //return translateOID(id);
-    }
-    return id;
-    }
-    
-    /** if an id is not a greenstone id (an external id) then translate 
-     * it to a greenstone one 
-     * default implementation: return the id. Custom implementation: 
-     * the id is a url that maps to a fedorapid whose dc.title contains the required HASHID */
-    protected String translateExternalId(String id) {
-    //logger.error("*** to translate an external ID: " + id); /////return id;
-    return this.externalId2OID(id);
-    }
-
-    /** converts an external id to greenstone OID. External ID is a URL link 
-     * that, if relative, maps to a fedorapid that has an entry in fedora.
-     * The dc:title meta for that fedorapid will contain the required OID. */
-    public String externalId2OID(String extid) {
-    if(extid.endsWith(".rt") && (extid.indexOf('.') != extid.lastIndexOf('.'))) { 
-           // .rt is not file extension, but Greenstone request for root of document
-           // not relevant for external ID
-           extid = extid.substring(0, extid.length()-3);
-    }
-
-       // the following method is unique to FedoraServicesAPIA
-    String response = ((FedoraServicesAPIA)fedoraServicesAPIA).getDocIDforURL(extid, this.cluster_name);
-    if(response.indexOf(GSXML.ERROR_ELEM) != -1) {
-        logger.error("**** The following error occurred when trying to find externalID for ID " + extid);
-        logger.error(response);
-        return extid;
-    }
-    if(response.equals("")) {
-        return extid;
-    } else {
-        return response;
-    }
-    }
-
-
-  /** translates relative oids into proper oids:
-   * .pr (parent), .rt (root) .fc (first child), .lc (last child),
-   * .ns (next sibling), .ps (previous sibling) 
-   * .np (next page), .pp (previous page) : links sections in the order that you'd read the document
-   * a suffix is expected to be present so test before using 
-   */
-    public String processOID(String doc_id, String top, String suff, int sibling_num) {
-
-    // send off request to get sibling etc. information from Fedora
-    Element response = null;
-    String[] children = null;
-    if(doc_id.startsWith("CL")) { // classifiernode
-    response = getResponseAsDOM(fedoraServicesAPIA.retrieveBrowseStructure(this.cluster_name, "ClassifierBrowse", new String[]{doc_id},
-                                           new String[]{"children"}, new String[]{"siblingPosition"}));
-    NodeList nl = response.getElementsByTagName(GSXML.NODE_STRUCTURE_ELEM);
-    if(nl.getLength() > 0) {
-        Element nodeStructure = (Element)nl.item(0);
-
-        if(nodeStructure != null) {
-        Element root = (Element) GSXML.getChildByTagName(nodeStructure, GSXML.CLASS_NODE_ELEM);
-        if(root != null) { // get children
-            NodeList classNodes = root.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
-            if(classNodes != null) {
-            children = new String[classNodes.getLength()];
-            for(int i = 0; i < children.length; i++) {
-                Element child = (Element)classNodes.item(i);
-                children[i] = child.getAttribute(GSXML.NODE_ID_ATT);
-            }
-            }
-        }
-        }
-    }
-    } else { // documentnode
-    response = getResponseAsDOM(fedoraServicesAPIA.retrieveDocumentStructure(this.cluster_name, new String[]{doc_id},
-                                         new String[]{"children"}, new String[]{"siblingPosition"}));
-    String path = GSPath.createPath(new String[]{GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER, 
-                          GSXML.DOC_NODE_ELEM, GSXML.NODE_STRUCTURE_ELEM, GSXML.DOC_NODE_ELEM});    
-    Element parentDocNode = (Element) GSXML.getNodeByPath(response, path);
-
-    if (parentDocNode == null) {
-        return top;
-    } // else 
-    NodeList docNodes = parentDocNode.getElementsByTagName(GSXML.DOC_NODE_ELEM); // only children should remain, since that's what we requested
-    if(docNodes.getLength() > 0) {
-        children = new String[docNodes.getLength()];
-        
-        for(int i = 0; i < children.length; i++) {
-        Element e = (Element)docNodes.item(i);
-        children[i] = e.getAttribute(GSXML.NODE_ID_ATT);
-        }
-    } else { // return root node
-        children = new String[]{doc_id};
-    }
-    }
-    
-    if (suff.equals("fc")) {
-      return children[0];
-    } else if (suff.equals("lc")) {
-      return children[children.length-1];
-    } else {
-      if (suff.equals("ss")) {
-    return children[sibling_num-1];
-      }
-      // find the position that we are at.
-      int i=0;
-      while(i<children.length) {
-    if (children[i].equals(top)) {
-      break;
-    }
-    i++;
-      }
-        
-      if (suff.equals("ns")) {
-    if (i==children.length-1) {
-      return children[i];
-    }
-    return children[i+1];
-      } else if (suff.equals("ps")) {
-    if (i==0) {
-      return children[i];
-    }
-    return children[i-1];
-      }
-    }
-
-    return top;
-  }
-
-
-    protected Element getResponseAsDOM(String response) {
-    if(response == null) { // will not be the case, because an empty  
-        return null;    // response message will be sent instead
-    }
-
-    Element message = null;     
-    try{
-        // turn the String xml response into a DOM tree:    
-        DocumentBuilder builder 
-        = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document doc 
-        = builder.parse(new InputSource(new StringReader(response)));
-        message = doc.getDocumentElement();
-    } catch(Exception e){
-        if(response == null) {
-        response = "";
-        }
-        logger.error("An error occurred while trying to parse the response: ");
-        logger.error(response);
-        logger.error(e.getMessage());
-    }
-    
-    // Error elements in message will be processed outside of here, just return the message
-    return message;
-    }
-
-    /* //process method for stylesheet requests    
-    protected Element processFormat(Element request) {} */
-    
-    /* returns the service list for the subclass */
-    /* protected Element getServiceList(String lang) {
-    // for now, it is static and has no language stuff
-    return (Element) this.short_service_info.cloneNode(true);
-    }*/
-
-    /** returns a specific service description */
-    protected Element getServiceDescription(String service, String lang, String subset) {
-    if(!lang.equals(prevLanguage)) {
-        prevLanguage = lang;
-        fedoraServicesAPIA.setLanguage(lang);
-    }
-    String serviceResponse = fedoraServicesAPIA.describeService(service);
-    Element response = getResponseAsDOM(serviceResponse);
-
-    // should be no chance of an npe, since FedoraGS3 lists the services, so will have descriptions for each
-    Element e = (Element)response.getElementsByTagName(GSXML.SERVICE_ELEM).item(0);
-    e = (Element)this.doc.importNode(e, true);
-    return e; 
-    }
-
-    /** overloaded version for no args case */
-    protected String getTextString(String key, String lang) {
-    return getTextString(key, lang, null, null);
-    }
-
-    protected String getTextString(String key, String lang, String dictionary) {
-    return getTextString(key, lang, dictionary, null);
-    }
-    protected String getTextString(String key, String lang, String [] args) {
-    return getTextString(key, lang, null, args);
-    }
-    
-    /** getTextString - retrieves a language specific text string for the given
-key and locale, from the specified resource_bundle (dictionary)
-    */
-    protected String getTextString(String key, String lang, String dictionary, String[] args) {
-
-    // we want to use the collection class loader in case there are coll specific files
-    if (dictionary != null) {
-        // just try the one specified dictionary
-        Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
-        String result = dict.get(key, args);
-        if (result == null) { // not found
-        return "_"+key+"_";
-        }
-        return result;
-    }
-
-    // now we try class names for dictionary names
-    String class_name = this.getClass().getName();
-    class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    Dictionary dict = new Dictionary(class_name, lang, this.class_loader);
-    String result = dict.get(key, args);
-    if (result != null) {
-        return result;
-    }
-
-    // we have to try super classes
-    Class c = this.getClass().getSuperclass();
-    while (result == null && c != null) {
-        class_name = c.getName();
-        class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-        if (class_name.equals("ServiceRack")) {
-        // this is as far as we go
-        break;
-        }
-        dict = new Dictionary(class_name, lang, this.class_loader);
-        result = dict.get(key, args);
-        c = c.getSuperclass();
-    }
-    if (result == null) {
-        return "_"+key+"_";
-    }
-    return result;
-    
-    }
-
-    protected String getMetadataNameText(String key, String lang) {
-
-    String properties_name = "metadata_names";
-    Dictionary dict = new Dictionary(properties_name, lang);
-    
-    String result = dict.get(key);
-    if (result == null) { // not found
-        return null;
-    } 
-    return result;
-    }
+
 }
 

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

@@ -33 +33 @@
 import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.SimpleCollectionDatabase;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -108 +109 @@
         this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);
         
-        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, index_stem);
+        gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, index_stem);
         if (!gs_doc_db.isValid())
         {
@@ -171 +172 @@
     // assumes only one value per metadata
   // does no macro resolving. assumes classifier metadata will not have macros.
-    protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names)
+  protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names)
     {
         String lang = "en";
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        Element metadata_list = doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         DBInfo info = this.coll_db.getInfo(node_id);
         if (info == null)
@@ -189 +190 @@
                 String key = it.next();
                 String value = info.getInfo(key);
-                GSXML.addMetadata(this.doc, metadata_list, key, value);
+                GSXML.addMetadata(metadata_list, key, value);
             }
 
@@ -199 +200 @@
                 String meta_name = metadata_names.get(i);
                 String value = (String) info.getInfo(meta_name);
-                GSXML.addMetadata(this.doc, metadata_list, meta_name, value);
+                GSXML.addMetadata(metadata_list, meta_name, value);
             }
         }

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

@@ -36 +36 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -45 +48 @@
  * 
  * @author Katherine Don
- * @version $Revision$
  */
 public class GS2Construct extends ServiceRack
@@ -86 +88 @@
 
     /** returns a specific service description */
-    protected Element getServiceDescription(String service, String lang, String subset)
-    {
-
-        Element description = this.doc.createElement(GSXML.SERVICE_ELEM);
+    protected Element getServiceDescription(Document doc, String service, String lang, String subset)
+    {
+
+        Element description = doc.createElement(GSXML.SERVICE_ELEM);
         description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         description.setAttribute(GSXML.NAME_ATT, service);
         if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
         {
-            description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service + ".name", lang)));
-            description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(service + ".description", lang)));
-            description.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service + ".submit", lang)));
+            description.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(service + ".name", lang)));
+            description.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(service + ".description", lang)));
+            description.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(service + ".submit", lang)));
         }
         if (subset == null || subset.equals(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER))
         {
-            Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+            Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
             description.appendChild(param_list);
 
@@ -106 +108 @@
             {
 
-                Element param = GSXML.createParameterDescription(this.doc, NEW_COL_TITLE_PARAM, getTextString("param." + NEW_COL_TITLE_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+                Element param = GSXML.createParameterDescription(doc, NEW_COL_TITLE_PARAM, getTextString("param." + NEW_COL_TITLE_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
                 param_list.appendChild(param);
-                param = GSXML.createParameterDescription(this.doc, CREATOR_PARAM, getTextString("param." + CREATOR_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+                param = GSXML.createParameterDescription(doc, CREATOR_PARAM, getTextString("param." + CREATOR_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
                 param_list.appendChild(param);
-                param = GSXML.createParameterDescription(this.doc, NEW_COL_ABOUT_PARAM, getTextString("param." + NEW_COL_ABOUT_PARAM, lang), GSXML.PARAM_TYPE_TEXT, null, null, null);
+                param = GSXML.createParameterDescription(doc, NEW_COL_ABOUT_PARAM, getTextString("param." + NEW_COL_ABOUT_PARAM, lang), GSXML.PARAM_TYPE_TEXT, null, null, null);
                 param_list.appendChild(param);
                 String[] types = { BUILDTYPE_MGPP, BUILDTYPE_MG };
                 String[] type_texts = { getTextString("param." + BUILDTYPE_PARAM + "." + BUILDTYPE_MGPP, lang), getTextString("param." + BUILDTYPE_PARAM + "." + BUILDTYPE_MG, lang) };
 
-                param = GSXML.createParameterDescription(this.doc, BUILDTYPE_PARAM, getTextString("param." + BUILDTYPE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types, type_texts);
+                param = GSXML.createParameterDescription(doc, BUILDTYPE_PARAM, getTextString("param." + BUILDTYPE_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types, type_texts);
                 param_list.appendChild(param);
             }
@@ -122 +124 @@
 
                 this.collection_list = getCollectionList();
-                Element param = GSXML.createParameterDescription(this.doc, COL_PARAM, getTextString("param." + COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, this.collection_list, this.collection_list);
+                Element param = GSXML.createParameterDescription(doc, COL_PARAM, getTextString("param." + COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, this.collection_list, this.collection_list);
                 param_list.appendChild(param);
             }
@@ -144 +146 @@
     protected Element processAddDocument(Element request)
     {
+      Document result_doc = XMLConverter.newDOM();
         // decode the file name, add it to the import directory
         String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, name);
-        Element status = this.doc.createElement(GSXML.STATUS_ELEM);
+        Element status = result_doc.createElement(GSXML.STATUS_ELEM);
         response.appendChild(status);
         //String lang = request.getAttribute(GSXML.LANG_ATT);
         //String request_type = request.getAttribute(GSXML.TYPE_ATT);
-        Text t = this.doc.createTextNode("AddDocument: not implemented yet");
+        Text t = result_doc.createTextNode("AddDocument: not implemented yet");
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -160 +163 @@
     protected Element processBuildAndActivateCollection(Element request)
     {
+      
         waitUntilReady(request);
         Element buildResponse = processBuildCollection(request);
@@ -311 +315 @@
 
         // add the rest of the messages to the status node
-        Text t = this.doc.createTextNode("\n" + listener.getUpdate());
+        Text t = status.getOwnerDocument().createTextNode("\n" + listener.getUpdate());
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(listener.getStatus()));
@@ -319 +323 @@
         }
 
-        t = this.doc.createTextNode("\n");
+        t = status.getOwnerDocument().createTextNode("\n");
         status.appendChild(t);
         // once have got here, we assume
@@ -330 +334 @@
     protected Element processDeleteCollection(Element request)
     {
-
+      Document result_doc = XMLConverter.newDOM();
         // the response to send back
         String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, name);
-        Element status = this.doc.createElement(GSXML.STATUS_ELEM);
+        Element status = result_doc.createElement(GSXML.STATUS_ELEM);
         response.appendChild(status);
         Text t = null; // the text node for the error/success message
@@ -353 +357 @@
             // at the moment, delete is synchronous. but it may take ages so should do the command in another thread maybe? in which case we will want to ask for status
             logger.error("had a status request for delete - this shouldn't happen!!");
-            //t = this.doc.createTextNode("");
+            //t = result_doc.createTextNode("");
             //status.appendChild(t);
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -364 +368 @@
         if (!coll_dir.exists())
         {
-            t = this.doc.createTextNode(getTextString("delete.exists_error", lang, args));
+            t = result_doc.createTextNode(getTextString("delete.exists_error", lang, args));
             status.appendChild(t);
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -373 +377 @@
         if (!GSFile.deleteFile(coll_dir))
         {
-            t = this.doc.createTextNode(getTextString("delete.delete_error", lang, args));
+            t = result_doc.createTextNode(getTextString("delete.delete_error", lang, args));
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
             status.appendChild(t);
@@ -387 +391 @@
     protected Element processReloadCollection(Element request)
     {
-
+      Document result_doc = XMLConverter.newDOM();
         // the response to send back
         String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, name);
-        Element status = this.doc.createElement(GSXML.STATUS_ELEM);
+        Element status = result_doc.createElement(GSXML.STATUS_ELEM);
         response.appendChild(status);
         Text t = null; // the text node for the error/success message
@@ -411 +415 @@
             // reload is synchronous - this makes no sense
             logger.error("had a status request for reload - this shouldn't happen!!");
-            //t = this.doc.createTextNode("");
+            //t = result_doc.createTextNode("");
             //status.appendChild(t);
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -433 +437 @@
     {
         // send the request to the MR
-        Element message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_SYSTEM, "", userContext);
+      Document doc = XMLConverter.newDOM();
+        Element message = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_SYSTEM, "", userContext);
         message.appendChild(request);
-        Element command = this.doc.createElement(GSXML.SYSTEM_ELEM);
+        Element command = doc.createElement(GSXML.SYSTEM_ELEM);
         request.appendChild(command);
         command.setAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT, GSXML.COLLECTION_ELEM);
@@ -463 +468 @@
             if (response == null)
             {
-                t = this.doc.createTextNode(getTextString(operation + ".configure_error", userContext.getLanguage(), args));
+              t = status.getOwnerDocument().createTextNode(getTextString(operation + ".configure_error", userContext.getLanguage(), args));
                 status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
                 status.appendChild(t);
@@ -470 +475 @@
 
             // if we got here, we have succeeded!
-            t = this.doc.createTextNode(getTextString(operation + ".success", userContext.getLanguage(), args));
+            t = status.getOwnerDocument().createTextNode(getTextString(operation + ".success", userContext.getLanguage(), args));
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.SUCCESS));
             status.appendChild(t);
@@ -494 +499 @@
         // set up short_service_info_ - for now just has name and type
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, NEW_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, IMPORT_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, BUILD_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, ACTIVATE_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, BUILD_AND_ACTIVATE_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, DELETE_SERVICE);
         this.short_service_info.appendChild(e);
 
-        e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         e.setAttribute(GSXML.NAME_ATT, RELOAD_SERVICE);
         this.short_service_info.appendChild(e);
 
-        //e = this.doc.createElement(GSXML.SERVICE_ELEM);
+        //e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         //e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         //e.setAttribute(GSXML.NAME_ATT, ADD_DOC_SERVICE);
@@ -540 +545 @@
     protected Element runCommand(Element request, int type)
     {
+      Document result_doc = XMLConverter.newDOM();
         // the response to send back
         String name = GSPath.getFirstLink(request.getAttribute(GSXML.TO_ATT));
-        Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, name);
-        Element status = this.doc.createElement(GSXML.STATUS_ELEM);
+        Element status = result_doc.createElement(GSXML.STATUS_ELEM);
         response.appendChild(status);
 
@@ -567 +573 @@
             if (listener == null)
             {
-                Text t = this.doc.createTextNode(getTextString("general.process_id_error", lang));
+                Text t = result_doc.createTextNode(getTextString("general.process_id_error", lang));
                 status.appendChild(t);
                 status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -573 +579 @@
             else
             {
-                Text t = this.doc.createTextNode(listener.getUpdate());
+                Text t = result_doc.createTextNode(listener.getUpdate());
                 status.appendChild(t);
                 status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(listener.getStatus()));
@@ -605 +611 @@
         if (!constructor.configure())
         {
-            Text t = this.doc.createTextNode(getTextString("general.configure_constructor_error", lang));
+            Text t = result_doc.createTextNode(getTextString("general.configure_constructor_error", lang));
             status.appendChild(t);
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -629 +635 @@
         status.setAttribute(GSXML.STATUS_PROCESS_ID_ATT, id);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ACCEPTED));
-        Text t = this.doc.createTextNode(getTextString("general.process_start", lang));
+        Text t = result_doc.createTextNode(getTextString("general.process_start", lang));
         status.appendChild(t);
         return response;
@@ -727 +733 @@
     protected Element extractOtherParams(HashMap<String, Serializable> params, int type)
     {
-
-        Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+      Document doc = XMLConverter.newDOM();
+        Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         if (type == GS2PerlConstructor.NEW)
         {
-            Element param = this.doc.createElement(GSXML.PARAM_ELEM);
+            Element param = doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, "creator");
             param.setAttribute(GSXML.VALUE_ATT, (String) params.get(CREATOR_PARAM));
 
             param_list.appendChild(param);
-            param = this.doc.createElement(GSXML.PARAM_ELEM);
+            param = doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, "about");
             param.setAttribute(GSXML.VALUE_ATT, (String) params.get(NEW_COL_ABOUT_PARAM));
             param_list.appendChild(param);
-            param = this.doc.createElement(GSXML.PARAM_ELEM);
+            param = doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, "title");
             param.setAttribute(GSXML.VALUE_ATT, (String) params.get(NEW_COL_TITLE_PARAM));
             param_list.appendChild(param);
-            param = this.doc.createElement(GSXML.PARAM_ELEM);
+            param = doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, "buildtype");
             param.setAttribute(GSXML.VALUE_ATT, (String) params.get(BUILDTYPE_PARAM));

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

@@ -107 +107 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    protected Element getNodeContent(String doc_id, String lang) throws GSException
+  protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException
     {
         String[] args = new String[1];
@@ -169 +169 @@
         }
 
-        Element content_node = this.doc.createElement(GSXML.NODE_CONTENT_ELEM);
-        Text t = this.doc.createTextNode(doc_content);
+        Element content_node = doc.createElement(GSXML.NODE_CONTENT_ELEM);
+        Text t = doc.createTextNode(doc_content);
         content_node.appendChild(t);
         return content_node;

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

@@ -34 +34 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -228 +231 @@
     protected boolean addTermInfo(Element term_list, HashMap params, Object query_result)
     {
+      Document doc = term_list.getOwnerDocument();
         String query_level = (String) params.get(LEVEL_PARAM); // the current query level
 
@@ -235 +239 @@
             LuceneQueryResult.TermInfo term_info = (LuceneQueryResult.TermInfo) terms.get(t);
 
-            Element term_elem = this.doc.createElement(GSXML.TERM_ELEM);
+            Element term_elem = doc.createElement(GSXML.TERM_ELEM);
             term_elem.setAttribute(GSXML.NAME_ATT, term_info.term_);
             term_elem.setAttribute(FREQ_ATT, "" + term_info.term_freq_);
@@ -248 +252 @@
             String stopword = (String) stopwords.get(t);
 
-            Element stopword_elem = this.doc.createElement(GSXML.STOPWORD_ELEM);
+            Element stopword_elem = doc.createElement(GSXML.STOPWORD_ELEM);
             stopword_elem.setAttribute(GSXML.NAME_ATT, stopword);
             term_list.appendChild(stopword_elem);

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

@@ -26 +26 @@
 
 // XML classes
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -91 +92 @@
    * <nodeContent>text content or other elements</nodeContent>
    */
-  protected Element getNodeContent(String doc_id, String lang) throws GSException {
+  protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException {
     long doc_num = this.coll_db.OID2DocnumLong(doc_id);
     if (doc_num == -1) {
@@ -97 +98 @@
       return null;
     }
-    Element content_node = this.doc.createElement(GSXML.NODE_CONTENT_ELEM);
+    Element content_node = doc.createElement(GSXML.NODE_CONTENT_ELEM);
     synchronized (mgpp_src) {
         String doc_content = "";
@@ -118 +119 @@
             
         }
-        Text t = this.doc.createTextNode(doc_content);
+        Text t = doc.createTextNode(doc_content);
         content_node.appendChild(t);
         return content_node;

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

@@ -32 +32 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
 import org.greenstone.mgpp.MGPPDocInfo;
 import org.greenstone.mgpp.MGPPQueryResult;
 import org.greenstone.mgpp.MGPPSearchWrapper;
 import org.greenstone.mgpp.MGPPTermInfo;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -234 +238 @@
     protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, Object query_result)
     {
-
+      Document doc = term_list.getOwnerDocument();
         String query_level = (String) params.get(LEVEL_PARAM); // the current query level
 
@@ -242 +246 @@
             MGPPTermInfo term_info = (MGPPTermInfo) terms.get(t);
 
-            Element term_elem = this.doc.createElement(GSXML.TERM_ELEM);
+            Element term_elem = doc.createElement(GSXML.TERM_ELEM);
             term_elem.setAttribute(GSXML.NAME_ATT, term_info.term_);
             term_elem.setAttribute(STEM_ATT, "" + term_info.stem_method_);
@@ -256 +260 @@
 
             Vector equiv_terms = term_info.equiv_terms_;
-            Element equiv_term_list = this.doc.createElement(EQUIV_TERM_ELEM + GSXML.LIST_MODIFIER);
+            Element equiv_term_list = doc.createElement(EQUIV_TERM_ELEM + GSXML.LIST_MODIFIER);
             term_elem.appendChild(equiv_term_list);
 
@@ -263 +267 @@
                 String equiv_term = (String) equiv_terms.get(et);
 
-                Element equiv_term_elem = this.doc.createElement(GSXML.TERM_ELEM);
+                Element equiv_term_elem = doc.createElement(GSXML.TERM_ELEM);
                 equiv_term_elem.setAttribute(GSXML.NAME_ATT, equiv_term);
                 equiv_term_elem.setAttribute(NUM_DOCS_MATCH_ATT, "");

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

@@ -26 +26 @@
 
 // XML classes
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -115 +116 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    protected Element getNodeContent (String doc_id, String lang) throws GSException {
+  protected Element getNodeContent (Document doc, String doc_id, String lang) throws GSException {
         long doc_num = this.coll_db.OID2DocnumLong (doc_id);
         if (doc_num == -1) {
@@ -121 +122 @@
             return null;
         }
-        Element content_node = this.doc.createElement (GSXML.NODE_CONTENT_ELEM);
+        Element content_node = doc.createElement (GSXML.NODE_CONTENT_ELEM);
                 
         String doc_content = null;
@@ -140 +141 @@
             // replace _httpimg_ with the correct address
             doc_content = resolveTextMacros (doc_content, doc_id, lang);
-            //GSXML.addDocText(this.doc, doc, doc_content);
+            //GSXML.addDocText(doc, doc_content);
         } else {
             logger.error ("the doc content was null, not getting that section\n");
             doc_content = "couldn't retrieve content for this section, please check the log file for more detail\n";
         }
-        Text t = this.doc.createTextNode (doc_content);
+        Text t = doc.createTextNode (doc_content);
         content_node.appendChild (t);
         return content_node;

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

@@ -81 +81 @@
         synchronized(this.mg_src){
         // Create a new (empty) result message ('doc' is in ServiceRack.java)
-        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, QUERY_SERVICE);
         result.setAttribute (GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -141 +142 @@
         if (mqr.isClear ()) {
             // something has gone wrong
-            GSXML.addError (this.doc, result, "Couldn't query the mg database", GSXML.ERROR_TYPE_SYSTEM);
+            GSXML.addError (result, "Couldn't query the mg database", GSXML.ERROR_TYPE_SYSTEM);
             return result;
         }
@@ -153 +154 @@
         
         // Create a metadata list to store information about the query results
-        Element metadata_list = this.doc.createElement (GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement (GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
         result.appendChild (metadata_list);
         
         // Add a metadata element specifying the number of matching documents
         // because teh total number is just the number returned, use numDocsReturned, not numDocsMatched
-        GSXML.addMetadata (this.doc, metadata_list, "numDocsReturned", ""+totalDocs);
+        GSXML.addMetadata (metadata_list, "numDocsReturned", ""+totalDocs);
         // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query
-        GSXML.addMetadata (this.doc, metadata_list, "query", query);
+        GSXML.addMetadata (metadata_list, "query", query);
         
         if (docs.size () > 0) {
             // Create a document list to store the matching documents, and add them
-            Element document_list = this.doc.createElement (GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+            Element document_list = result_doc.createElement (GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
             result.appendChild (document_list);
             for (int d = 0; d < docs.size (); d++) {
@@ -170 +171 @@
                 float rank = ((MGDocInfo) docs.elementAt (d)).rank_;
                 String doc_id = internalNum2OID (docnum);
-                Element doc_node = createDocNode (doc_id, Float.toString (rank));
+                Element doc_node = createDocNode (result_doc, doc_id, Float.toString (rank));
                 document_list.appendChild (doc_node);
             }
@@ -176 +177 @@
         
         // Create a term list to store the term information, and add it
-        Element term_list = this.doc.createElement (GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+        Element term_list = result_doc.createElement (GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
         result.appendChild (term_list);
         Vector terms = mqr.getTerms ();
@@ -186 +187 @@
             Vector equiv_terms = term_info.equiv_terms_;
             
-            Element term_elem = this.doc.createElement (GSXML.TERM_ELEM);
+            Element term_elem = result_doc.createElement (GSXML.TERM_ELEM);
             term_elem.setAttribute (GSXML.NAME_ATT, term);
             term_elem.setAttribute (STEM_ATT, "" + stem_method);
             
-            Element equiv_term_list = this.doc.createElement (EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
+            Element equiv_term_list = result_doc.createElement (EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
             term_elem.appendChild (equiv_term_list);
             
@@ -197 +198 @@
                 MGEquivTermInfo equiv_term_info = (MGEquivTermInfo) equiv_terms.get (et);
                 
-                Element equiv_term_elem = this.doc.createElement (GSXML.TERM_ELEM);
+                Element equiv_term_elem = result_doc.createElement (GSXML.TERM_ELEM);
                 equiv_term_elem.setAttribute (GSXML.NAME_ATT, equiv_term_info.term_);
                 equiv_term_elem.setAttribute (NUM_DOCS_MATCH_ATT, "" + equiv_term_info.match_docs_);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GoogleSearch.java.tmp

@@ -195 +195 @@
         
         long numdocs_matched = google_result.getEstimatedTotalResultsCount();       
-        GSXML.addMetadata(this.doc, query_metadata_list, "numDocsMatched", ""+numdocs_matched);
+        GSXML.addMetadata(query_metadata_list, "numDocsMatched", ""+numdocs_matched);
         
         }
@@ -210 +210 @@
         String google_snippet = details[i].getSnippet();
         if (google_url !=null) {
-            GSXML.addMetadata(this.doc, metadata_list, "URL", google_url);
+            GSXML.addMetadata(metadata_list, "URL", google_url);
         }
         if (google_title != null) {
-            GSXML.addMetadata(this.doc, metadata_list, "Title", google_title);
+            GSXML.addMetadata(metadata_list, "Title", google_title);
         }
         if (google_snippet != null) {
-            GSXML.addMetadata(this.doc, metadata_list, "Snippet", google_snippet);
+            GSXML.addMetadata(metadata_list, "Snippet", google_snippet);
         }
         }

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

@@ -2 +2 @@
 
 import org.greenstone.gsdl3.util.*;
-
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -11 +11 @@
     extends XMLRetrieve {
 
-    protected Element extractTitleMeta(Element section) {
-    Element meta_elem = this.doc.createElement(GSXML.METADATA_ELEM);
+  protected Element extractTitleMeta(Document result_doc, Element section) {
+    Element meta_elem = result_doc.createElement(GSXML.METADATA_ELEM);
     meta_elem.setAttribute(GSXML.NAME_ATT, "Title");
 
@@ -34 +34 @@
     Text t = (Text) GSXML.getNodeTextNode(title_elem);
     
-    meta_elem.appendChild(this.doc.importNode(t, false));
+    meta_elem.appendChild(result_doc.importNode(t, false));
     return meta_elem;
 

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

@@ -13 +13 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -18 +20 @@
 
 /**
+ * Service class to proxy IVia
  * 
- * @author Katherine Don
- * @version $Revision$
  */
 
@@ -64 +65 @@
             return false;
         }
-        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, TEXT_QUERY_SERVICE);
         this.short_service_info.appendChild(tq_service);
 
-        Element dc_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element dc_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dc_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dc_service.setAttribute(GSXML.NAME_ATT, DOC_CONTENT_SERVICE);
         this.short_service_info.appendChild(dc_service);
 
-        Element dm_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        Element dm_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dm_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dm_service.setAttribute(GSXML.NAME_ATT, DOC_META_SERVICE);
@@ -85 +86 @@
         if (format != null)
         {
-            this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));
+            this.format_info_map.put(TEXT_QUERY_SERVICE, this.desc_doc.importNode(format, true));
         }
 
@@ -93 +94 @@
         if (display_format != null)
         {
-            this.format_info_map.put(DOC_CONTENT_SERVICE, this.doc.importNode(display_format, true));
+            this.format_info_map.put(DOC_CONTENT_SERVICE, this.desc_doc.importNode(display_format, true));
             // shoudl we make a copy?
         }
@@ -101 +102 @@
     }
 
-    protected Element getServiceDescription(String service, String lang, String subset)
+    protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
 
         if (service.equals(TEXT_QUERY_SERVICE))
         {
-            Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element tq_service = doc.createElement(GSXML.SERVICE_ELEM);
             tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
             tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
             if (subset == null || subset.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
             {
-                tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE + ".name", lang)));
-                tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE + ".submit", lang)));
-                tq_service.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE + ".description", lang)));
+                tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME, getTextString(TEXT_QUERY_SERVICE + ".name", lang)));
+                tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_SUBMIT, getTextString(TEXT_QUERY_SERVICE + ".submit", lang)));
+                tq_service.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION, getTextString(TEXT_QUERY_SERVICE + ".description", lang)));
             }
             if (subset == null || subset.equals(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER))
             {
-                Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+                Element param_list = doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
                 tq_service.appendChild(param_list);
-                Element param = GSXML.createParameterDescription(this.doc, QUERY_PARAM, getTextString("param." + QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
+                Element param = GSXML.createParameterDescription(doc, QUERY_PARAM, getTextString("param." + QUERY_PARAM, lang), GSXML.PARAM_TYPE_STRING, null, null, null);
                 param_list.appendChild(param);
                 String[] field_ids = { "kw", "au", "su", "ti", "de", "fu" };
                 String[] field_names = { getTextString("param." + FIELD_PARAM + ".kw", lang), getTextString("param." + FIELD_PARAM + ".au", lang), getTextString("param." + FIELD_PARAM + ".su", lang), getTextString("param." + FIELD_PARAM + ".ti", lang), getTextString("param." + FIELD_PARAM + ".de", lang), getTextString("param." + FIELD_PARAM + ".fu", lang) };
 
-                param = GSXML.createParameterDescription(this.doc, FIELD_PARAM, getTextString("param." + FIELD_PARAM, lang), GSXML.PARAM_TYPE_ENUM_MULTI, "kw,au,su,ti,de,fu", field_ids, field_names);
+                param = GSXML.createParameterDescription(doc, FIELD_PARAM, getTextString("param." + FIELD_PARAM, lang), GSXML.PARAM_TYPE_ENUM_MULTI, "kw,au,su,ti,de,fu", field_ids, field_names);
                 param_list.appendChild(param);
 
                 String[] hits_options = { "10", "30", "50" };
-                param = GSXML.createParameterDescription(this.doc, GS_HITS_PARAM, getTextString("param." + GS_HITS_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, "10", hits_options, hits_options);
+                param = GSXML.createParameterDescription(doc, GS_HITS_PARAM, getTextString("param." + GS_HITS_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, "10", hits_options, hits_options);
                 param_list.appendChild(param);
 
-                param = GSXML.createParameterDescription(this.doc, GS_START_PAGE_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, "1", null, null);
+                param = GSXML.createParameterDescription(doc, GS_START_PAGE_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, "1", null, null);
                 param_list.appendChild(param);
             }
@@ -138 +139 @@
         if (service.equals(DOC_META_SERVICE))
         {
-            Element dm_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element dm_service = doc.createElement(GSXML.SERVICE_ELEM);
             dm_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             dm_service.setAttribute(GSXML.NAME_ATT, DOC_META_SERVICE);
@@ -146 +147 @@
         if (service.equals(DOC_CONTENT_SERVICE))
         {
-            Element dc_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+            Element dc_service = doc.createElement(GSXML.SERVICE_ELEM);
             dc_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
             dc_service.setAttribute(GSXML.NAME_ATT, DOC_CONTENT_SERVICE);
@@ -158 +159 @@
     protected Element processTextQuery(Element request)
     {
-
+      Document result_doc = XMLConverter.newDOM();
         // Create a new (empty) result message
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
         result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(doc_node_list);
 
@@ -243 +244 @@
 
         // get the num docs and add to a metadata list
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(metadata_list);
 
         // Add a metadata element specifying the number of matching documents
         long numdocs = Long.parseLong(results_num);
-        GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "" + numdocs);
+        GSXML.addMetadata(metadata_list, "numDocsMatched", "" + numdocs);
         String[] ids = doc_ids.split(" ");
 
         for (int d = 0; d < ids.length; d++)
         {
-            Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+            Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
             doc_node.setAttribute(GSXML.NODE_ID_ATT, ids[d]);
             doc_node_list.appendChild(doc_node);
@@ -265 +266 @@
     protected Element processDocumentMetadataRetrieve(Element request)
     {
-        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, DOC_META_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -323 +325 @@
         String url_string = ivia_server_url + "/cgi-bin/view_record_set?theme=gsdl3&record_id_list=" + record_id_list.toString() + "&field_list=" + field_list.toString();
 
-        Element node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(node_list);
         try
@@ -337 +339 @@
                 // the first line is the record
                 line = line.substring(8);
-                Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+                Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
                 doc_node.setAttribute(GSXML.NODE_ID_ATT, line);
-                Element meta_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+                Element meta_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
                 doc_node.appendChild(meta_list);
                 while ((line = reader.readLine()) != null)
@@ -352 +354 @@
                     String name = line.substring(0, col_pos);
                     String value = line.substring(col_pos + 2); // includes a space
-                    GSXML.addMetadata(this.doc, meta_list, name, value);
+                    GSXML.addMetadata(meta_list, name, value);
                 }
                 node_list.appendChild(doc_node);
@@ -371 +373 @@
     protected Element processDocumentContentRetrieve(Element request)
     {
-        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, DOC_CONTENT_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -383 +386 @@
         }
 
-        Element doc_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element doc_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(doc_list);
 
@@ -391 +394 @@
         {
             String doc_id = doc_ids[i];
-            Element doc_node = getDocument(doc_id);
+            Element doc_node = getDocument(result_doc, doc_id);
             doc_list.appendChild(doc_node);
         }
@@ -402 +405 @@
      * creates a documentNode around the text
      */
-    protected Element getDocument(String doc_id)
+  protected Element getDocument(Document result_doc, String doc_id)
     {
 
@@ -447 +450 @@
         processed_content.append("</nodeContent>");
 
-        Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
         doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
 
@@ -454 +457 @@
         {
             Element content_element = content_doc.getDocumentElement();
-            doc_node.appendChild(this.doc.importNode(content_element, true));
+            doc_node.appendChild(result_doc.importNode(content_element, true));
         }
         else

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

@@ -67 +67 @@
         
     /** gets a document by sending a request to iVia, then processes it and creates a documentNode around the text */
-    protected Element getNodeContent(String doc_id, String lang) 
+  protected Element getNodeContent(Document doc, String doc_id, String lang) 
     throws GSException {
 
@@ -116 +116 @@
     Element content_element = content_doc.getDocumentElement();
 
-    return (Element)this.doc.importNode(content_element,true);
+    return (Element)doc.importNode(content_element,true);
     }
     
@@ -213 +213 @@
     }
     
-    protected Element getMetadataList (String doc_id,
+  protected Element getMetadataList (Document doc, String doc_id,
                        boolean all_metadata,
                        ArrayList<String> metadata_names,
@@ -219 +219 @@
     throws GSException {
     
-    Element meta_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    Element meta_list = doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
 
     // do the query to the iVia server
@@ -249 +249 @@
         String name = line.substring(0,col_pos);
         String value = line.substring(col_pos+2); // includes a space
-        GSXML.addMetadata(this.doc, meta_list, name, value);
+        GSXML.addMetadata(meta_list, name, value);
         }
     } catch (java.net.MalformedURLException e) {

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

@@ -23 +23 @@
  *
  * @author Katherine Don
- * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>
+ * @author Chi-Yu Huang
  */
 
@@ -76 +76 @@
     /** Process a text query - implemented by concrete subclasses */
     protected Element processTextQuery(Element request) {
+      Document result_doc = XMLConverter.newDOM();
     // Create a new (empty) result message
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_node_list);
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -127 +128 @@
         doc_ids = reader.readLine();
     } catch (java.net.MalformedURLException e) {
-        GSXML.addError(this.doc, result, "Malformed URL: "+url_string);
+        GSXML.addError(result, "Malformed URL: "+url_string);
         return result;
     } catch (java.io.IOException e) {
-        GSXML.addError(this.doc, result, "IOException during connection to "+url_string+": "+e.toString());
+        GSXML.addError(result, "IOException during connection to "+url_string+": "+e.toString());
         return result;
     }
@@ -152 +153 @@
         result_string.append("Exception: "+e);
         }
-        GSXML.addError(this.doc, result, result_string.toString());
+        GSXML.addError(result, result_string.toString());
         
         return result;
@@ -158 +159 @@
     
     // get the num docs and add to a metadata list
-    Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
+    Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
     result.appendChild(metadata_list);
     
     // Add a metadata element specifying the number of matching documents
     long numdocs = Long.parseLong(results_num);
-    GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+numdocs);   
+    GSXML.addMetadata(metadata_list, "numDocsMatched", ""+numdocs); 
     String [] ids = doc_ids.split(" ");
     
     for (int d=0; d<ids.length; d++) {
-        Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
         doc_node.setAttribute(GSXML.NODE_ID_ATT, ids[d]);
         doc_node_list.appendChild(doc_node);

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

@@ -18 +18 @@
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -112 +115 @@
         {
             logger.error("TextQuery request had no paramList.");
-            GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "0");
+            GSXML.addMetadata(metadata_list, "numDocsMatched", "0");
             return false; // signal that an empty result should be return
         }
@@ -128 +131 @@
         {
             logger.error("TextQuery request had no query string.");
-            GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "0");
+            GSXML.addMetadata(metadata_list, "numDocsMatched", "0");
             return false; // signal that an empty result should be return
         }
@@ -138 +141 @@
     protected Element processTextQuery(Element request)
     {
-        Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
-        Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
+        Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         initResultElement(result, doc_node_list, metadata_list);
 
@@ -177 +181 @@
             TopDocs hits = searcher.search(query, Integer.MAX_VALUE);
 
-            GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "" + hits.scoreDocs.length);
+            GSXML.addMetadata(metadata_list, "numDocsMatched", "" + hits.scoreDocs.length);
 
             IndexReader reader = searcher.getIndexReader();
@@ -186 +190 @@
                 org.apache.lucene.document.Document luc_doc = reader.document(lucene_doc_num);
                 String node_id = luc_doc.get("nodeID");
-                Element node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+                Element node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
                 node.setAttribute(GSXML.NODE_ID_ATT, node_id);
                 doc_node_list.appendChild(node);

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

@@ -22 +22 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -67 +70 @@
 
         // set up short_service_info_ - for now just has name and type
-        Element dmr_service = doc.createElement(GSXML.SERVICE_ELEM);
+        Element dmr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dmr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dmr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
         short_service_info.appendChild(dmr_service);
 
-        Element dcr_service = doc.createElement(GSXML.SERVICE_ELEM);
+        Element dcr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dcr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dcr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
         short_service_info.appendChild(dcr_service);
 
-        Element dsr_service = doc.createElement(GSXML.SERVICE_ELEM);
+        Element dsr_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         dsr_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         dsr_service.setAttribute(GSXML.NAME_ATT, DOCUMENT_STRUCTURE_RETRIEVE_SERVICE);
@@ -132 +135 @@
         if (display_format != null)
         {
-            this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.doc.importNode(display_format, true));
+            this.format_info_map.put(DOCUMENT_CONTENT_RETRIEVE_SERVICE, this.desc_doc.importNode(display_format, true));
             // shoudl we make a copy?
         }
@@ -156 +159 @@
 
     /** */
-    protected Element getServiceDescription(String service, String lang, String subset)
+    protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
         if (service.equals(DOCUMENT_STRUCTURE_RETRIEVE_SERVICE))
@@ -191 +194 @@
     {
         // Create a new (empty) result message
-        Element result = doc.createElement(GSXML.RESPONSE_ELEM);
+      Element result = XMLConverter.newDOM().createElement(GSXML.RESPONSE_ELEM);
         return result;
     }
@@ -197 +200 @@
     protected Element processDocumentMetadataRetrieve(Element request)
     {
+      Document result_doc = XMLConverter.newDOM();
         // Create a new (empty) result message
         try
         {
-            Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+            Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
 
             String uid = request.getAttribute(GSXML.USER_ID_ATT);
@@ -240 +244 @@
             }
 
-            Element node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+            Element node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
             result.appendChild(node_list);
 
@@ -315 +319 @@
 
                     // Add the document to the list
-                    Element new_node = (Element) this.doc.importNode(request_node, false);
+                    Element new_node = (Element) result_doc.importNode(request_node, false);
                     node_list.appendChild(new_node);
 
                     // Add the requested metadata information
-                    Element node_meta_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+                    Element node_meta_list = result_doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
                     new_node.appendChild(node_meta_list);
 
@@ -356 +360 @@
                         if (metadata.equals("Title"))
                             if (!(place_data.equals("")) && place_data.indexOf(", , ;") == -1 && node_id.indexOf("```") == -1)
-                                GSXML.addMetadata(this.doc, node_meta_list, "Title", value);//metadata, value);
+                                GSXML.addMetadata(node_meta_list, "Title", value);//metadata, value);
                             else
-                                GSXML.addMetadata(this.doc, node_meta_list, metadata, "");
+                                GSXML.addMetadata(node_meta_list, metadata, "");
 
                         if (place_data.indexOf(", , ;") == -1)
@@ -404 +408 @@
     protected Element processDocumentContentRetrieve(Element request)
     {
+      Document result_doc = XMLConverter.newDOM();
         // Create a new (empty) result message
-        Element result = doc.createElement(GSXML.RESPONSE_ELEM);
+        Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
         result.setAttribute(GSXML.FROM_ATT, DOCUMENT_CONTENT_RETRIEVE_SERVICE);
         result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -422 +427 @@
         String legend_file = this.temp_files_dir + "legend_" + uid + ".jpg";
         String blank_file = this.files_home_dir + "blank.jpg";
-        Element doc_list = doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
+        Element doc_list = result_doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
         result.appendChild(doc_list);
 
@@ -796 +801 @@
 
             // put the html in a text node
-            Element text_doc = doc.createElement(GSXML.DOC_NODE_ELEM);
+            Element text_doc = result_doc.createElement(GSXML.DOC_NODE_ELEM);
             text_doc.setAttribute(GSXML.NODE_ID_ATT, doc_id);
-            GSXML.addDocText(doc, text_doc, doc_content);
+            GSXML.addDocText(text_doc, doc_content);
             doc_list.appendChild(text_doc);
 

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

@@ -162 +162 @@
     protected Element processTextQuery(Element request) 
     {
+      Document result_doc = XMLConverter.newDOM();
     // Create a new (empty) result message
-    Element result = doc.createElement(GSXML.RESPONSE_ELEM);
+    Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -337 +338 @@
 
     // Create a metadata list to store information about the query results
-    Element metadata_list = doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
+    Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
     result.appendChild(metadata_list);
             
     // Add a metadata element specifying the number of matching documents
-    GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "" + totalDocs);
-    GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", ""+totalDocs);
+    GSXML.addMetadata(metadata_list, "numDocsMatched", "" + totalDocs);
+    GSXML.addMetadata(metadata_list, "numDocsReturned", ""+totalDocs);
         // Create a document list to store the matching documents, and add them
-    Element document_list = doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element document_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(document_list);
     for (int d = 0; d < totalDocs; d++) {
         String doc_id = (String)tempList.get(d);
 
-        Element doc_node = doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
         doc_node.setAttribute(GSXML.NODE_ID_ATT, doc_id);
         doc_node.setAttribute(GSXML.NODE_TYPE_ATT, "thumbnail");
@@ -357 +358 @@
             
     // Create a term list to store the term information, and add it
-    Element term_list = doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    Element term_list = result_doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(term_list);  
     
@@ -364 +365 @@
         String term = terms[t];
     
-        Element term_elem = doc.createElement(GSXML.TERM_ELEM);
+        Element term_elem = result_doc.createElement(GSXML.TERM_ELEM);
         term_elem.setAttribute(GSXML.NAME_ATT, term);
         term_elem.setAttribute(FREQ_ATT, "" + terms_freq[t]);

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

@@ -82 +82 @@
     }
     
-    Document doc = this.converter.newDOM();
-    this.short_service_info = doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
     //get the names from ServiceRack.java
     this.site_name = this.router.getSiteName();
@@ -138 +136 @@
     // set up short_service_info_ - just the name
 
-    Element list_records = doc.createElement(GSXML.SERVICE_ELEM);
+    Element list_records = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     list_records.setAttribute(GSXML.NAME_ATT, OAIXML.LIST_RECORDS);
     list_records.setAttribute(GSXML.TYPE_ATT, "oai");
     this.short_service_info.appendChild(list_records);
 
-    Element list_identifiers = doc.createElement(GSXML.SERVICE_ELEM);
+    Element list_identifiers = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     list_identifiers.setAttribute(GSXML.NAME_ATT, OAIXML.LIST_IDENTIFIERS);
     list_identifiers.setAttribute(GSXML.TYPE_ATT, "oai");
     this.short_service_info.appendChild(list_identifiers);
     
-    Element list_sets = doc.createElement(GSXML.SERVICE_ELEM);
+    Element list_sets = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     list_sets.setAttribute(GSXML.NAME_ATT, OAIXML.LIST_SETS);
     list_sets.setAttribute(GSXML.TYPE_ATT, "oai");
     this.short_service_info.appendChild(list_sets);
     
-    Element list_metadata_formats = doc.createElement(GSXML.SERVICE_ELEM);
+    Element list_metadata_formats = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     list_metadata_formats.setAttribute(GSXML.NAME_ATT, OAIXML.LIST_METADATA_FORMATS);
     list_metadata_formats.setAttribute(GSXML.TYPE_ATT, "oai");
     this.short_service_info.appendChild(list_metadata_formats);
 
-    Element get_record = doc.createElement(GSXML.SERVICE_ELEM);
+    Element get_record = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     get_record.setAttribute(GSXML.NAME_ATT, OAIXML.GET_RECORD);
     get_record.setAttribute(GSXML.TYPE_ATT, "oai");
@@ -167 +165 @@
 
   /** returns a specific service description */
-  public Element getServiceDescription(String service_id, String lang, String subset) {
-    
-    Document doc = this.converter.newDOM();
+  public Element getServiceDescription(Document doc, String service_id, String lang, String subset) {
+    
     if (service_id.equals(OAIXML.LIST_RECORDS)) {
       Element list_records = doc.createElement(GSXML.SERVICE_ELEM);
@@ -246 +243 @@
     }
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     ArrayList<String> keys = new ArrayList<String>(info.getKeys());
     String oailastmodified = "";
@@ -321 +318 @@
     // all validation is done
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element list_identifiers_response = doc.createElement(GSXML.RESPONSE_ELEM);
     Element list_identifiers = doc.createElement(OAIXML.LIST_IDENTIFIERS);
@@ -412 +409 @@
     // all validation is done
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element list_records_response = doc.createElement(GSXML.RESPONSE_ELEM);
     Element list_records = doc.createElement(OAIXML.LIST_RECORDS);
@@ -457 +454 @@
   private boolean configureSetInfo() {
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     this.list_sets_response = doc.createElement(GSXML.RESPONSE_ELEM);
     Element list_sets_elem = doc.createElement(OAIXML.LIST_SETS);
@@ -598 +595 @@
     }
 
-    Document doc = this.converter.newDOM();
+    Document doc = XMLConverter.newDOM();
     Element list_metadata_formats_response = doc.createElement(GSXML.RESPONSE_ELEM);
     

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

@@ -88 +88 @@
     
     // set up short_service_info_ - for now just has name and type
-    Element e = this.doc.createElement(GSXML.SERVICE_ELEM);
+    Element e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_APPLET);
     e.setAttribute(GSXML.NAME_ATT, PHIND_SERVICE);
@@ -95 +95 @@
     // set up the static applet description
     
-    applet_description = this.doc.createElement(GSXML.SERVICE_ELEM);
+    applet_description = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     applet_description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_APPLET);
     applet_description.setAttribute(GSXML.NAME_ATT, PHIND_SERVICE);
@@ -116 +116 @@
     }
     Element app_elem = dom.getDocumentElement();
-    applet_description.appendChild(this.doc.importNode(app_elem, true));
+    applet_description.appendChild(this.desc_doc.importNode(app_elem, true));
     
     return true;
   }
   
-  protected Element getServiceDescription(String service, String lang, String subset) {
+  protected Element getServiceDescription(Document doc, String service, String lang, String subset) {
     if (!service.equals(PHIND_SERVICE)) {
       return null;
     }
     Element describe = (Element) applet_description.cloneNode(true);
-    describe.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(PHIND_SERVICE+".name", lang)));
-    describe.appendChild(GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION,  getTextString(PHIND_SERVICE+".description", lang)));
+    describe.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_NAME,  getTextString(PHIND_SERVICE+".name", lang)));
+    describe.appendChild(GSXML.createDisplayTextElement(doc, GSXML.DISPLAY_TEXT_DESCRIPTION,  getTextString(PHIND_SERVICE+".description", lang)));
     return describe;
   }
   
   protected Element processPhindApplet(Element request) {
-    
+    Document result_doc = XMLConverter.newDOM();
     Element param_elem = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     HashMap<String, Serializable> params = GSXML.extractParams(param_elem, false);
@@ -156 +156 @@
     
     // the result element
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, PHIND_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
     
     // applet result info must be in appletInfo element
-    Element applet_data = this.doc.createElement(GSXML.APPLET_DATA_ELEM);
+    Element applet_data = result_doc.createElement(GSXML.APPLET_DATA_ELEM);
     result.appendChild(applet_data);
-    Element phind_data = this.doc.createElement("phindData");
+    Element phind_data = result_doc.createElement("phindData");
     applet_data.appendChild(phind_data);
     
@@ -170 +170 @@
     if (phrase == 0) {
       if (word==null || word.equals("")) {
-        Element error = phindError("no word or phrase");
+        Element error = phindError(result_doc, "no word or phrase");
         phind_data.appendChild(error);
         return result;
@@ -179 +179 @@
       // the word is not in the collection
       // return a phind error string
-      Element error = phindError("the term "+word+" is not in the collection");
+      Element error = phindError(result_doc, "the term "+word+" is not in the collection");
       phind_data.appendChild(error);
       return result;
@@ -215 +215 @@
     long last_d) {
     
-      synchronized (mgpp_retrieve_src) {
+    synchronized (mgpp_retrieve_src) {
     String record = this.mgpp_retrieve_src.getDocument(this.basepath+File.separatorChar+"pdata", "Document",
       phrase);
     if (record.equals("")) {
-      Element error = phindError("somethings gone wrong - we haven't got a record for phrase number "+phrase);
+      Element error = phindError(phind_data.getOwnerDocument(), "somethings gone wrong - we haven't got a record for phrase number "+phrase);
       phind_data.appendChild(error);
       return false;
@@ -258 +258 @@
     phind_data.setAttribute("lf", lf);
     phind_data.setAttribute("tf", tf);
-    GSXML.createTextElement(this.doc, "phrase", word);
+    // GSXML.createTextElement(result_doc, "phrase", word); ??? - this needs to be appended somewhere????
     
     addExpansionList(phind_data, expansions, word, ef, first_e, last_e);
@@ -266 +266 @@
     }
     return true;
-      }
+    } // end of synchronized (mgpp_retrieve_src) 
   }
   
@@ -273 +273 @@
     String freq,
     long first, long last) {
-    
-    Element expansion_list = this.doc.createElement("expansionList");
+    Document phind_doc = phind_data.getOwnerDocument();
+    Element expansion_list = phind_doc.createElement("expansionList");
     phind_data.appendChild(expansion_list);
     expansion_list.setAttribute("length", freq);
@@ -286 +286 @@
     for (long i = first; i < last; i++) {
       long num  = Long.parseLong(expansions[(int)i]);
-      Element expansion = getExpansion( num, word);
+      Element expansion = getExpansion(phind_doc, num, word);
       expansion.setAttribute("num", Long.toString(i));
       expansion_list.appendChild(expansion);
@@ -293 +293 @@
   }
   
-  protected Element getExpansion(long phrase_num,
+  protected Element getExpansion(Document phind_doc, long phrase_num,
     String orig_phrase) {
     
@@ -311 +311 @@
     String df = fields[3];
     
-    Element expansion = this.doc.createElement("expansion");
+    Element expansion = phind_doc.createElement("expansion");
     expansion.setAttribute("tf", tf);
     expansion.setAttribute("df", df);
@@ -319 +319 @@
     String [] ends = splitPhraseOnWord(phrase, orig_phrase);
     if (!ends[0].equals("")) {
-      expansion.appendChild(GSXML.createTextElement(this.doc, "prefix", ends[0]));
+      expansion.appendChild(GSXML.createTextElement(phind_doc, "prefix", ends[0]));
     }
     if (!ends[1].equals("")) {
-      expansion.appendChild(GSXML.createTextElement(this.doc, "suffix", ends[1]));
+      expansion.appendChild(GSXML.createTextElement(phind_doc, "suffix", ends[1]));
     }
     
@@ -333 +333 @@
     String freq,
     long first, long last) {
-    
-    Element document_list = this.doc.createElement("documentList");
+    Document phind_doc = phind_data.getOwnerDocument();
+    Element document_list = phind_doc.createElement("documentList");
     phind_data.appendChild(document_list);
     document_list.setAttribute("length", freq);
@@ -357 +357 @@
         doc_freq = doc_elem.substring(p+1);
       }
-      Element document = getDocument( doc_num);
+      Element document = getDocument(phind_doc, doc_num);
       document.setAttribute("freq", doc_freq);
       document.setAttribute("num", Long.toString(i));
@@ -368 +368 @@
   
   
-  protected Element getDocument(long doc_num) {
+  protected Element getDocument(Document phind_doc, long doc_num) {
     
     // look up the phrase in the docs thingy
@@ -383 +383 @@
     String title = fields[1];
     
-    Element d = this.doc.createElement("document");
+    Element d = phind_doc.createElement("document");
     d.setAttribute("hash", hash);
-    d.appendChild(GSXML.createTextElement(this.doc, "title", title));
+    d.appendChild(GSXML.createTextElement(phind_doc, "title", title));
     
     return d;
@@ -395 +395 @@
     long first, long last) {
     
-    
-    Element thesaurus_list = this.doc.createElement("thesaurusList");
+    Document phind_doc = phind_data.getOwnerDocument();
+    Element thesaurus_list = phind_doc.createElement("thesaurusList");
     phind_data.appendChild(thesaurus_list);
     thesaurus_list.setAttribute("length", freq);
@@ -414 +414 @@
         if (index >= first && index < last) { // only output the ones we want
           long phrase = Long.parseLong(items[j]);
-          Element t = getThesaurus(phrase);
+          Element t = getThesaurus(phind_doc, phrase);
           t.setAttribute("type", type);
           thesaurus_list.appendChild(t);
@@ -424 +424 @@
   }
   
-  protected Element getThesaurus(long phrase_num) {
+  protected Element getThesaurus(Document phind_doc, long phrase_num) {
     
     // look up the phrase in the pdata thingy
@@ -441 +441 @@
     String df = fields[3];
     
-    Element thesaurus = this.doc.createElement("thesaurus");
+    Element thesaurus = phind_doc.createElement("thesaurus");
     thesaurus.setAttribute("tf", tf);
     thesaurus.setAttribute("df", df);
     thesaurus.setAttribute("id", Long.toString(phrase_num));
-    thesaurus.appendChild(GSXML.createTextElement(this.doc, "phrase", phrase));
+    thesaurus.appendChild(GSXML.createTextElement(phind_doc, "phrase", phrase));
     return thesaurus;
     
@@ -464 +464 @@
   }
   
-  protected Element phindError(String message) {
-    Element e = this.doc.createElement("phindError");
-    Text t = this.doc.createTextNode(message);
+  protected Element phindError(Document phind_doc, String message) {
+    Element e = phind_doc.createElement("phindError");
+    Text t = phind_doc.createTextNode(message);
     e.appendChild(t);
     return e;

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

@@ -40 +40 @@
     
     // set up short_service_info_ - for now just has name and type
-    Element rss_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+    Element rss_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     rss_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     rss_service.setAttribute(GSXML.NAME_ATT, RSS_SERVICE);
@@ -49 +49 @@
 
     // this may get called but is not useful in the case of retrieve services
-    protected Element getServiceDescription(String service_id, String lang, String subset) {
-
-    Element rss_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+    protected Element getServiceDescription(Document doc, String service_id, String lang, String subset) {
+
+    Element rss_service = doc.createElement(GSXML.SERVICE_ELEM);
     rss_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     rss_service.setAttribute(GSXML.NAME_ATT, service_id);
@@ -60 +60 @@
     // This contains the collection meta from collectionConfig.xml. Used to construct header of RSS feed
     protected Element getCollMetadata(UserContext userContext) {
-    Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+      
+      Document msg_doc = XMLConverter.newDOM();
+    Element mr_request_message = msg_doc.createElement(GSXML.MESSAGE_ELEM);
     String to = this.cluster_name;
-    Element meta_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
+    Element meta_request = GSXML.createBasicRequest(msg_doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
     mr_request_message.appendChild(meta_request);
     Element meta_response = (Element) this.router.process(mr_request_message);
@@ -100 +102 @@
 
     // generate the header and footer
-    Document rssDoc = this.doc;
+    Document rssDoc = XMLConverter.newDOM();
     
     Element rssNode = rssDoc.createElement("rss"); // rootnode
@@ -228 +230 @@
 
     // generate the GS3 response message containing the RSS xml
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element result = rssDoc.createElement(GSXML.RESPONSE_ELEM);
     result.setAttribute(GSXML.FROM_ATT, RSS_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);

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

@@ -77 +77 @@
     protected Element config_info = null;
 
-    /** XML element for describe requests - the container doc */
-       protected Document doc = null;
+  /** XML element for stored description XML */
+  protected Document desc_doc = null;
 
     /**
@@ -123 +123 @@
     public void setGlobalFormat(Element globalFormat)
     {
-        _globalFormat = globalFormat;
+      _globalFormat = GSXML.duplicateWithNewName(this.desc_doc, globalFormat, GSXML.GLOBAL_FORMAT_ELEM, false);
     }
 
@@ -159 +159 @@
     {
         this.converter = new XMLConverter();
-        this.doc = this.converter.newDOM();
-        this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
+        this.desc_doc = XMLConverter.newDOM();
+        this.short_service_info = this.desc_doc.createElement(GSXML.SERVICE_ELEM + GSXML.LIST_MODIFIER);
         this.format_info_map = new HashMap<String, Node>();
     }
@@ -220 +220 @@
     public Node process(Node message_node)
     {
-        Element message = this.converter.nodeToElement(message_node);
+        Element message = GSXML.nodeToElement(message_node);
 
         NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
-        Document doc = this.converter.newDOM();
-        Element mainResult = doc.createElement(GSXML.MESSAGE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element mainResult = result_doc.createElement(GSXML.MESSAGE_ELEM);
         if (requests.getLength() == 0)
         {
@@ -238 +238 @@
             if (type.equals(GSXML.REQUEST_TYPE_DESCRIBE))
             {
-                Element response = processDescribe(request);
+              Element response = processDescribe(request);
                 if (response != null)
                 {
-                    mainResult.appendChild(doc.importNode(response, true));
+                  mainResult.appendChild(result_doc.importNode(response, true));
                 }
 
@@ -247 +247 @@
             else if (type.equals(GSXML.REQUEST_TYPE_FORMAT))
             {
-                Element response = processFormat(request);
-                mainResult.appendChild(doc.importNode(response, true));
+              Element response = processFormat(request);
+              mainResult.appendChild(result_doc.importNode(response, true));
             }
             else
@@ -312 +312 @@
                 if (response != null)
                 {
-                    mainResult.appendChild(doc.importNode(response, true));
+                    mainResult.appendChild(result_doc.importNode(response, true));
                 }
                 else
@@ -318 +318 @@
                     // add in a dummy response
                     logger.error("adding in an error element\n");
-                    response = doc.createElement(GSXML.RESPONSE_ELEM);
-                    GSXML.addError(doc, response, error_string.toString());
+                    response = result_doc.createElement(GSXML.RESPONSE_ELEM);
+                    GSXML.addError(response, error_string.toString());
                     mainResult.appendChild(response);
 
@@ -336 +336 @@
     protected Element processDescribe(Element request)
     {
-      Document doc = this.converter.newDOM();
-        Element response = doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
 
@@ -344 +344 @@
         if (to.equals(""))
         { // return the service list
-          response.appendChild(doc.importNode(getServiceList(lang), true));
+          response.appendChild(result_doc.importNode(getServiceList(result_doc, lang), true));
             return response;
         }
@@ -352 +352 @@
         if (param_list == null)
         {
-            description = getServiceDescription(to, lang, null);
+          description = getServiceDescription(result_doc, to, lang, null);
         }
         else
@@ -367 +367 @@
                     if (description == null)
                     {
-                        description = getServiceDescription(to, lang, info);
+                      description = getServiceDescription(result_doc, to, lang, info);
                     }
                     else
                     {
-                        Element temp = getServiceDescription(to, lang, info);
+                      Element temp = getServiceDescription(result_doc, to, lang, info);
                         GSXML.mergeElements(description, temp);
                     }
@@ -379 +379 @@
         if (description != null)
         { // may be null if non-existant service
-          response.appendChild(doc.importNode(description, true));
+          response.appendChild(description);
         }
         return response;
@@ -390 +390 @@
     protected Element processFormat(Element request)
     {
-      Document doc = this.converter.newDOM();
-        Element response = doc.createElement(GSXML.RESPONSE_ELEM);
+      Document result_doc = XMLConverter.newDOM();
+        Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
 
@@ -404 +404 @@
         if (this.format_info_map.containsKey(to))
         {
-            response.appendChild(doc.importNode(getServiceFormat(to), true));
-            if (_globalFormat != null)
+          response.appendChild(getServiceFormat(result_doc, to));
+          if (_globalFormat != null)
             {
-                response.appendChild(GSXML.duplicateWithNewName(doc, _globalFormat, GSXML.GLOBAL_FORMAT_ELEM, false));
+              response.appendChild(result_doc.importNode(this._globalFormat, true));
             }
             response.setAttribute(GSXML.FROM_ATT, to);
@@ -419 +419 @@
 
     /** returns the service list for the subclass */
-    protected Element getServiceList(String lang)
+  protected Element getServiceList(Document doc, String lang)
     {
         // for now, it is static and has no language stuff
-        return (Element) this.short_service_info.cloneNode(true);
+      return (Element)doc.importNode(this.short_service_info, true);
     }
 
     /** returns a specific service description */
-    abstract protected Element getServiceDescription(String service, String lang, String subset);
-
-    protected Element getServiceFormat(String service)
-    {
-        Element format = (Element) ((Element) this.format_info_map.get(service)).cloneNode(true);
-        return format;
+  abstract protected Element getServiceDescription(Document doc, String service, String lang, String subset);
+
+  protected Element getServiceFormat(Document doc, String service)
+    {
+      Element format = (Element) this.format_info_map.get(service);
+      if (format != null) {
+        return (Element)doc.importNode(format, true);
+      }
+      return null;
     }
 

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);
         }

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

@@ -25 +25 @@
 import org.greenstone.LuceneWrapper3.SharedSoleneQuery;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -115 +117 @@
     /** create a param and add to the list */
     /** we override this to do a special rank param */
-    protected void createParameter(String name, Element param_list, String lang)
-    {
+  protected void createParameter(String name, Element param_list, String lang)
+    {
+      Document doc = param_list.getOwnerDocument();
         Element param = null;
         String param_default = paramDefaults.get(name);
@@ -131 +134 @@
             }
             
-            param = GSXML.createParameterDescription2(this.doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
+            param = GSXML.createParameterDescription2(doc, name, getTextString("param." + name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, fields.get(0), fields, field_names);
             
         } else if (name.equals(SORT_ORDER_PARAM)) {
@@ -137 +140 @@
         String[] vals_texts = { getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_ASCENDING, lang), getTextString("param." + SORT_ORDER_PARAM + "." + SORT_ORDER_DESCENDING, lang) };
 
-        param = GSXML.createParameterDescription(this.doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, SORT_ORDER_DESCENDING, vals, vals_texts);
+        param = GSXML.createParameterDescription(doc, SORT_ORDER_PARAM, getTextString("param." + SORT_ORDER_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, SORT_ORDER_DESCENDING, vals, vals_texts);
       }
 

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

@@ -6 +6 @@
 
 // XML classes
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -15 +16 @@
 public class TEIRetrieve extends XMLRetrieve {
 
-   protected Element extractTitleMeta(Element section) {
+  protected Element extractTitleMeta(Document doc, Element section) {
     
-    Element meta_elem = this.doc.createElement(GSXML.METADATA_ELEM);
+    Element meta_elem = doc.createElement(GSXML.METADATA_ELEM);
     meta_elem.setAttribute(GSXML.NAME_ATT, "Title");
     
@@ -24 +25 @@
         // there is no head element, so take the type attribute and make that the title
         String title = "("+section.getAttribute("type")+")";
-        Text t = this.doc.createTextNode(title);
+        Text t = doc.createTextNode(title);
         meta_elem.appendChild(t);
     } else {
         // add the head element as the metadata content
-        meta_elem.appendChild(this.doc.importNode(section_head, true));
+        meta_elem.appendChild(doc.importNode(section_head, true));
     }
     return meta_elem;

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

@@ -9 +9 @@
 import org.greenstone.gsdl3.util.DerbyWrapper;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
 import org.greenstone.util.GlobalProperties;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -38 +40 @@
         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]);
@@ -47 +49 @@
     }
 
-    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++)
@@ -53 +55 @@
             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]);
@@ -65 +67 @@
     protected synchronized Element processRecordUserAction(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, RECORD_USER_ACTION);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, RECORD_USER_ACTION);
 
         Element paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         if (paramList == null)
         {
-            GSXML.addError(this.doc, result, "Request has no parameter list");
+            GSXML.addError(result, "Request has no parameter list");
             return result;
         }
@@ -90 +93 @@
     protected synchronized Element processGetActivityOnPage(Element request)
     {
-        Element result = GSXML.createBasicResponse(this.doc, GET_ACTIVITY_ON_PAGE);
+      Document result_doc = XMLConverter.newDOM();
+        Element result = GSXML.createBasicResponse(result_doc, GET_ACTIVITY_ON_PAGE);
         try
         {
@@ -97 +101 @@
             if (paramList == null)
             {
-                GSXML.addError(this.doc, result, "Request has no parameter list");
+                GSXML.addError(result, "Request has no parameter list");
                 return result;
             }
@@ -109 +113 @@
             ArrayList<HashMap<String, String>> userActions = database.getMostRecentUserActions(site, collection, oid);
 
-            Element userList = this.doc.createElement("userList");
+            Element userList = result_doc.createElement("userList");
             for (HashMap<String, String> userAction : userActions)
             {
-                Element user = this.doc.createElement("user");
+                Element user = result_doc.createElement("user");
                 user.setAttribute("username", userAction.get("username"));
                 user.setAttribute("action", userAction.get("action"));

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

@@ +1 @@
+/*
+ *    ServiceRack.java
+ *    Copyright (C) 2014 New Zealand Digital Library, http://www.nzdl.org
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 package org.greenstone.gsdl3.service;
 
@@ -39 +58 @@
     protected boolean provide_metadata = true;
     
+  protected GSEntityResolver entity_resolver = null;
 
     public boolean configure(Element info, Element extra_info) {
@@ -81 +101 @@
     Element retrieve_service;
     if (provide_content) {
-        retrieve_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        retrieve_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         retrieve_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         retrieve_service.setAttribute(GSXML.NAME_ATT, CONTENT_SERVICE);
@@ -87 +107 @@
     }
     if (provide_metadata) {
-        retrieve_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        retrieve_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         retrieve_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         retrieve_service.setAttribute(GSXML.NAME_ATT, METADATA_SERVICE);
@@ -93 +113 @@
     }
     if (provide_structure) {
-        retrieve_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        retrieve_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         retrieve_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
         retrieve_service.setAttribute(GSXML.NAME_ATT, STRUCTURE_SERVICE);
@@ -101 +121 @@
     collection_doc_list = (Element)GSXML.getChildByTagName(extra_info, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
 
-    GSEntityResolver resolver = new GSEntityResolver();
-    resolver.setClassLoader(this.class_loader);
-    this.converter.setEntityResolver(resolver);
+    entity_resolver = new GSEntityResolver();
+    entity_resolver.setClassLoader(this.class_loader);
+    //this.converter.setEntityResolver(resolver);
     return true;
     }
 
     // this may get called but is not useful in the case of retrieve services
-    protected Element getServiceDescription(String service_id, String lang, String subset) {
-
-    Element retrieve_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+    protected Element getServiceDescription(Document doc, String service_id, String lang, String subset) {
+
+    Element retrieve_service = doc.createElement(GSXML.SERVICE_ELEM);
     retrieve_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_RETRIEVE);
     retrieve_service.setAttribute(GSXML.NAME_ATT, service_id);
@@ -117 +137 @@
     
     protected Element processDocumentContentRetrieve(Element request) {
-    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, CONTENT_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -125 +146 @@
         return result;
     }
-    Element result_doc_list = (Element)this.doc.importNode(doc_list, true);
+    Element result_doc_list = (Element)result_doc.importNode(doc_list, true);
     result.appendChild(result_doc_list);
 
@@ -132 +153 @@
 
         Element doc = (Element)docs.item(i);
-        Element content = this.doc.createElement(GSXML.NODE_CONTENT_ELEM);
+        Element content = result_doc.createElement(GSXML.NODE_CONTENT_ELEM);
         doc.appendChild(content);
 
@@ -146 +167 @@
         // if we have asked for the whole doc, just append it
         if (doc_name.equals(node_id)) {
-        content.appendChild(this.doc.importNode(doc_elem, true));
+        content.appendChild(result_doc.importNode(doc_elem, true));
         continue;
         }
@@ -154 +175 @@
         Element section = getSection(doc_elem, node_id);
         if (section != null) {
-        content.appendChild(this.doc.importNode(section, true));
+        content.appendChild(result_doc.importNode(section, true));
         }
         
@@ -164 +185 @@
     
     protected Element processDocumentStructureRetrieve(Element request) {
-    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, STRUCTURE_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -174 +196 @@
     }
 
-    Element result_doc_list = (Element)this.doc.importNode(doc_list, true);
+    Element result_doc_list = (Element)result_doc.importNode(doc_list, true);
     result.appendChild(result_doc_list);
     // first look for the stylesheet in the collection
@@ -196 +218 @@
         Element doc = (Element)docs.item(i);
         
-        Element structure = this.doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
+        Element structure = result_doc.createElement(GSXML.NODE_STRUCTURE_ELEM);
         doc.appendChild(structure);
         String doc_name = doc.getAttribute(GSXML.NODE_ID_ATT);
@@ -209 +231 @@
         try {
             Node toc = transformer.transform(stylesheet, doc_file);
-            structure.appendChild(this.doc.importNode(toc, true));
+            structure.appendChild(result_doc.importNode(toc, true));
         } catch (Exception e) {
             logger.error("couldn't transform the document to get the toc");
@@ -224 +246 @@
     // this should be overwritten for any format that  has something more suitable
     protected Element processDocumentMetadataRetrieve(Element request) {
-    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, METADATA_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
@@ -234 +257 @@
     }
 
-    Element result_doc_list = (Element)this.doc.importNode(doc_list, true);
+    Element result_doc_list = (Element)result_doc.importNode(doc_list, true);
     result.appendChild(result_doc_list);
 
@@ -266 +289 @@
         String doc_name = getWorkName(node_id);
         
-        Element metadata_list = getMetadata(node_id, all_metadata, meta_name_list); 
+        Element metadata_list = getMetadata(result_doc, node_id, all_metadata, meta_name_list); 
         doc.appendChild(metadata_list);
     }
@@ -284 +307 @@
     Document the_doc = null;
     try {
-        the_doc = this.converter.getDOM(doc_file, this.document_encoding);
+      the_doc = this.converter.getDOM(doc_file, this.document_encoding, this.entity_resolver);
     } catch (Exception e) {
         logger.error("couldn't create a DOM from file "+doc_file.getPath());
@@ -346 +369 @@
     }
 
-    protected Element getMetadata(String node_id, boolean all, Vector<String> meta_name_list) {
+  protected Element getMetadata(Document result_doc, String node_id, boolean all, Vector<String> meta_name_list) {
 
     // our default strategy here is to only return Title and root:Title
@@ -352 +375 @@
     // the title of a section is just a little bit of the text inside it.
     // the root_Title is the title from the doc info in the config file
-    Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+ GSXML.LIST_MODIFIER);
+    Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+ GSXML.LIST_MODIFIER);
     String doc_name = getWorkName(node_id);
     boolean node_is_root = false;
@@ -366 +389 @@
     if (all) {
         if (node_is_root) {
-        return (Element)this.doc.importNode(doc_meta_list, true);
+        return (Element)result_doc.importNode(doc_meta_list, true);
         } else {
         get_section_title = true;
@@ -391 +414 @@
         Element meta_item = GSXML.getNamedElement(doc_meta_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, actual_meta_name);
         if (meta_item != null) {
-            meta_item = (Element)this.doc.importNode(meta_item, true);
+            meta_item = (Element)result_doc.importNode(meta_item, true);
             meta_item.setAttribute(GSXML.NAME_ATT, meta_name);
             metadata_list.appendChild(meta_item);
@@ -405 +428 @@
         Element section = getSection(doc_elem, node_id);
         if (section != null) {
-            Element title_meta = extractTitleMeta(section);
+          Element title_meta = extractTitleMeta(result_doc, section);
             if (title_meta != null) {
             metadata_list.appendChild(title_meta);
@@ -416 +439 @@
     }
     
-    protected Element extractTitleMeta(Element section) {
-    Element meta_elem = this.doc.createElement(GSXML.METADATA_ELEM);
+  protected Element extractTitleMeta(Document result_doc, Element section) {
+    Element meta_elem = result_doc.createElement(GSXML.METADATA_ELEM);
     meta_elem.setAttribute(GSXML.NAME_ATT, "Title");
 
     String title = "dummy title";
-    Text t = this.doc.createTextNode(title);
+    Text t = result_doc.createTextNode(title);
     meta_elem.appendChild(t);
     return meta_elem;

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

@@ -53 +53 @@
  * Document ids are formed by encoding the document using standard URLEncoding
  *
- * @author Katherine Don
- * @author <a href="mailto:[email protected]">Stuart Yeates</a>
- * @version $Revision$
+ * @author Stuart Yeates
  * @see ServiceRack
  * @see java.net.URLEncoder
@@ -126 +124 @@
   }
 
-    protected Element getServiceDescription(String service, String lang, String subset) {
+    protected Element getServiceDescription(Document doc, String service, String lang, String subset) {
 
     return null;
@@ -144 +142 @@
     }
     // create the response so we can report the error
-    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Document result_doc = XMLConverter.newDOM();
+    Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
     String from = GSPath.appendLink(this.cluster_name, RESOURCE_RETRIEVE_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
@@ -150 +149 @@
     
     logger.error("should never get here. service type wrong:"+service);
-    GSXML.addError(this.doc, response,"XSLTServices:should never get here. service type wrong:"+service);
+    GSXML.addError(response,"XSLTServices:should never get here. service type wrong:"+service);
     return response;
   }
@@ -156 +155 @@
   /** process a document resquest query */
   protected Element processResourceRetrieve(Element request) {
-    
+    Document result_doc = XMLConverter.newDOM();
     // create the result and set the path so we know where we are
-    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
     String from = GSPath.appendLink(this.cluster_name, RESOURCE_RETRIEVE_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
@@ -177 +176 @@
     if (param_elem==null) { 
     logger.error("bad query request");
-    GSXML.addError(this.doc, response,"bad query request in XSLTServices");
+    GSXML.addError(response,"bad query request in XSLTServices");
     return response; 
     }
@@ -193 +192 @@
       }
       // something funny with the doc - 
-      Element new_doc = this.doc.createElement(GSXML.DOCUMENT_ELEM);
+      Element new_doc = result_doc.createElement(GSXML.DOCUMENT_ELEM);
       new_doc.setAttribute(GSXML.NAME_ATT, ids[j]); //GSXML.createDocumentElement(this.doc, ids[j]);
-      GSXML.addDocText(this.doc, new_doc, document);
+      GSXML.addDocText(new_doc, document);
       response.appendChild(new_doc);
     }
@@ -204 +203 @@
   /** process a XSLT query */
   protected Element processXSLTQuery(Element request) {
-    
+    Document result_doc = XMLConverter.newDOM();
     // create the result and set the path so we know where we are
-    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    Element response = result_doc.createElement(GSXML.RESPONSE_ELEM);
     String from = GSPath.appendLink(this.cluster_name, XSLT_QUERY_SERVICE);
     response.setAttribute(GSXML.FROM_ATT, from);
@@ -233 +232 @@
     } else {
       logger.error("bad alphabet name : "+ alphabet);
-      GSXML.addError(this.doc, response,"XSLTServices: bad alphabet name : "+ alphabet);
+      GSXML.addError(response,"XSLTServices: bad alphabet name : "+ alphabet);
       stream = new GeneratedDocumentStream();
     }
 
-    Element resource_list = this.doc.createElement(GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
+    Element resource_list = result_doc.createElement(GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
     response.appendChild(resource_list);
 
@@ -254 +253 @@
     transformer.transform(source,result);
     String id = writer.toString();
-    Element e = this.doc.createElement(GSXML.DOCUMENT_ELEM);
+    Element e = result_doc.createElement(GSXML.DOCUMENT_ELEM);
     e.setAttribute(GSXML.NAME_ATT, id); 
     //Node no = GSXML.createDocumentElement(this.doc, id);
     resource_list.appendChild(e);
       } catch (Throwable t) {
-    GSXML.addError(this.doc, response, "Error in XSLTServices finding results:" + t.toString());
+    GSXML.addError(response, "Error in XSLTServices finding results:" + t.toString());
       }
     }