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

Timestamp:

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

Author:

kjdon

Message:

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

File:

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

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