Changeset 28967
- Timestamp:
- 2014-04-10T14:40:34+12:00 (10 years ago)
- Location:
- gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
r28065 r28967 43 43 import org.greenstone.gsdl3.util.SolrQueryWrapper; 44 44 import org.greenstone.util.GlobalProperties; 45 import org.w3c.dom.Document; 45 46 import org.w3c.dom.Element; 46 47 import org.w3c.dom.NodeList; … … 422 423 protected boolean addTermInfo(Element term_list, HashMap params, Object query_result) 423 424 { 425 Document doc = term_list.getOwnerDocument(); 424 426 String query_level = (String) params.get(LEVEL_PARAM); // the current query level 425 427 … … 429 431 SharedSoleneQueryResult.TermInfo term_info = (SharedSoleneQueryResult.TermInfo) terms.get(t); 430 432 431 Element term_elem = this.doc.createElement(GSXML.TERM_ELEM);433 Element term_elem = doc.createElement(GSXML.TERM_ELEM); 432 434 term_elem.setAttribute(GSXML.NAME_ATT, term_info.term_); 433 435 term_elem.setAttribute(FREQ_ATT, "" + term_info.term_freq_); … … 442 444 String stopword = (String) stopwords.get(t); 443 445 444 Element stopword_elem = this.doc.createElement(GSXML.STOPWORD_ELEM);446 Element stopword_elem = doc.createElement(GSXML.STOPWORD_ELEM); 445 447 stopword_elem.setAttribute(GSXML.NAME_ATT, stopword); 446 448 term_list.appendChild(stopword_elem); -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java
r25909 r28967 179 179 protected Element processTextQuery(Element request) { 180 180 181 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 182 Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER); 183 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 181 Document result_doc = XMLConverter.newDOM(); 182 Element result = result_doc.createElement(GSXML.RESPONSE_ELEM); 183 Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER); 184 Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 184 185 initResultElement(result,doc_node_list,metadata_list); 185 186 … … 220 221 if (hits != null) { 221 222 // or should this be docs.getNumFound() ?? 222 GSXML.addMetadata( this.doc,metadata_list, "numDocsMatched", ""+hits.size());223 GSXML.addMetadata(metadata_list, "numDocsMatched", ""+hits.size()); 223 224 224 225 System.err.println(hits.getNumFound() + " documents found, " … … 229 230 230 231 String node_id = (String)solr_doc.get("docOID"); 231 Element node = this.doc.createElement(GSXML.DOC_NODE_ELEM);232 Element node = result_doc.createElement(GSXML.DOC_NODE_ELEM); 232 233 node.setAttribute(GSXML.NODE_ID_ATT, node_id); 233 234 doc_node_list.appendChild(node);
Note:
See TracChangeset
for help on using the changeset viewer.