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

Timestamp:

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

Author:

kjdon

Message:

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java (modified) (6 diffs)

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