Changeset 28969 for main/trunk

Timestamp:

2014-04-14T14:25:09+12:00 (10 years ago)

Author:

kjdon

Message:

removing this.doc. Haven't tested as can't compile properly without Fedora/Google classes. But there are no errors regarding this.doc. Also, not sure if these have been updated properly after restructuring around AbstractSearch. Will need testing properly if they are to be used again.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• FedoraSearch.java.tmp (modified) (6 diffs)
• GoogleSearch.java.tmp (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp

@@ -69 +69 @@
     public FedoraSearch()
     {
+      QUERY_SERVICE = "TextQuery";
     }
     
@@ -86 +87 @@
         return false;
     }
-    Element tq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+    Element tq_service = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
     tq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
-    tq_service.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
+    tq_service.setAttribute(GSXML.NAME_ATT, QUERY_SERVICE);
     this.short_service_info.appendChild(tq_service);
     //does_paging = true;
@@ -96 +97 @@
     Element format = (Element) GSXML.getNodeByPath(extra_info, path);
     if (format != null) {
-        this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));
+        this.format_info_map.put(QUERY_SERVICE, this.desc_doc.importNode(format, true));
     }
     return true;
@@ -104 +105 @@
     protected Element processTextQuery(Element request) {
     // Create a new (empty) result message
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
-    result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE);
+    Document result_doc = XMLConverter.newDOM();
+    Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
+    result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
     
-    Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_node_list);
     
@@ -178 +180 @@
             String[] language = o.getLanguage();
 
-            Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+            Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
             doc_node_list.appendChild(doc_node);
             
-            Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+            Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
             doc_node.appendChild(metadata_list);
             
@@ -206 +208 @@
     }
         
-    Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(metadata_list);
     

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GoogleSearch.java.tmp

@@ -36 +36 @@
 /**
  *
- * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>
  *
  */
@@ -57 +56 @@
     public GoogleSearch()
     {
+      QUERY_SERVICE = "TextQuery";
     }
         
@@ -120 +120 @@
     
     // Create a new (empty) result message
-    Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
-    result.setAttribute(GSXML.FROM_ATT, TEXT_QUERY_SERVICE);
+    Document result_doc = XMLConverter.newDOM();
+    Element result = result_doc.createElement(GSXML.RESPONSE_ELEM);
+    result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-    Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_node_list = result_doc.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(doc_node_list);
-    Element query_metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    Element query_metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     result.appendChild(query_metadata_list);
 
@@ -200 +201 @@
         GoogleSearchResultElement[] details = google_result.getResultElements();
         for (int i=0; i<details.length; i++){
-        Element doc_node = this.doc.createElement(GSXML.DOC_NODE_ELEM);
+        Element doc_node = result_doc.createElement(GSXML.DOC_NODE_ELEM);
         doc_node_list.appendChild(doc_node);
         
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+        Element metadata_list = result_doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
         doc_node.appendChild(metadata_list);