Changeset 28969
- Timestamp:
- 2014-04-14T14:25:09+12:00 (10 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp
r28966 r28969 69 69 public FedoraSearch() 70 70 { 71 QUERY_SERVICE = "TextQuery"; 71 72 } 72 73 … … 86 87 return false; 87 88 } 88 Element tq_service = this.d oc.createElement(GSXML.SERVICE_ELEM);89 Element tq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM); 89 90 tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY); 90 tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);91 tq_service.setAttribute(GSXML.NAME_ATT, QUERY_SERVICE); 91 92 this.short_service_info.appendChild(tq_service); 92 93 //does_paging = true; … … 96 97 Element format = (Element) GSXML.getNodeByPath(extra_info, path); 97 98 if (format != null) { 98 this.format_info_map.put( TEXT_QUERY_SERVICE, this.doc.importNode(format, true));99 this.format_info_map.put(QUERY_SERVICE, this.desc_doc.importNode(format, true)); 99 100 } 100 101 return true; … … 104 105 protected Element processTextQuery(Element request) { 105 106 // Create a new (empty) result message 106 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 107 result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE); 107 Document result_doc = XMLConverter.newDOM(); 108 Element result = result_doc.createElement(GSXML.RESPONSE_ELEM); 109 result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE); 108 110 result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS); 109 111 110 Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);112 Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER); 111 113 result.appendChild(doc_node_list); 112 114 … … 178 180 String[] language = o.getLanguage(); 179 181 180 Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);182 Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM); 181 183 doc_node_list.appendChild(doc_node); 182 184 183 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);185 Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 184 186 doc_node.appendChild(metadata_list); 185 187 … … 206 208 } 207 209 208 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);210 Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 209 211 result.appendChild(metadata_list); 210 212 -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GoogleSearch.java.tmp
r28966 r28969 36 36 /** 37 37 * 38 * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>39 38 * 40 39 */ … … 57 56 public GoogleSearch() 58 57 { 58 QUERY_SERVICE = "TextQuery"; 59 59 } 60 60 … … 120 120 121 121 // Create a new (empty) result message 122 Element result = this.doc.createElement(GSXML.RESPONSE_ELEM); 123 result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE); 122 Document result_doc = XMLConverter.newDOM(); 123 Element result = result_doc.createElement(GSXML.RESPONSE_ELEM); 124 result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE); 124 125 result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS); 125 Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);126 Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER); 126 127 result.appendChild(doc_node_list); 127 Element query_metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);128 Element query_metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 128 129 result.appendChild(query_metadata_list); 129 130 … … 200 201 GoogleSearchResultElement[] details = google_result.getResultElements(); 201 202 for (int i=0; i<details.length; i++){ 202 Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);203 Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM); 203 204 doc_node_list.appendChild(doc_node); 204 205 205 Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);206 Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 206 207 doc_node.appendChild(metadata_list); 207 208
Note:
See TracChangeset
for help on using the changeset viewer.