Changeset 28967 for gs3-extensions/solr/trunk/src/src

Timestamp:

2014-04-10T14:40:34+12:00 (10 years ago)

Author:

kjdon

Message:

no longer have this.doc to use. Need to create new Documents when needed

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service

Files:

• GS2SolrSearch.java (modified) (4 diffs)
• SolrSearch.java (modified) (3 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -43 +43 @@
 import org.greenstone.gsdl3.util.SolrQueryWrapper;
 import org.greenstone.util.GlobalProperties;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -422 +423 @@
     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
 
@@ -429 +431 @@
             SharedSoleneQueryResult.TermInfo term_info = (SharedSoleneQueryResult.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_);
@@ -442 +444 @@
             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);

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

@@ -179 +179 @@
     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);
 
@@ -220 +221 @@
         if (hits != null) {
         // or should this be docs.getNumFound() ??
-        GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+hits.size());
+        GSXML.addMetadata(metadata_list, "numDocsMatched", ""+hits.size());
 
         System.err.println(hits.getNumFound() + " documents found, "
@@ -229 +230 @@
 
             String node_id = (String)solr_doc.get("docOID");
-            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);