Changeset 30411 for gs3-extensions/audioDB/trunk/src/src/java/org/greenstone/gsdl3/service

Timestamp:

2016-03-16T20:50:45+13:00 (8 years ago)

Author:

davidb

Message:

Changes after debugging on MacOS El Capitan

Location:

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

Files:

• AbstractGS2AudioSearch.java (modified) (1 diff)
• GS2AudioDBSearch.java (modified) (5 diffs)

gs3-extensions/audioDB/trunk/src/src/java/org/greenstone/gsdl3/service/AbstractGS2AudioSearch.java

@@ -120 +120 @@
 
     // replaces default AbstractSearch version with one tied to database
-    gs_doc_db = new BasicDocumentDatabase(this.doc,
-                           database_type,this.site_home,
-                           this.cluster_name,
-                           this.index_stem);
+    gs_doc_db = new BasicDocumentDatabase(database_type,this.site_home,
+                          this.cluster_name,
+                          this.index_stem);
     if (!gs_doc_db.isValid()) {
         logger.error("Failed to open Document Database.");

gs3-extensions/audioDB/trunk/src/src/java/org/greenstone/gsdl3/service/GS2AudioDBSearch.java

@@ -67 +67 @@
         synchronized(this.audiodb_src) {
         // Create a new (empty) result message ('doc' is in ServiceRack.java)
-        Element result = this.doc.createElement (GSXML.RESPONSE_ELEM);
+        Document result_doc = XMLConverter.newDOM();
+        Element result = result_doc.createElement (GSXML.RESPONSE_ELEM);
 
         // Rather than QUERY_SERVICE use "TextQuery" 
@@ -109 +110 @@
         if (docs.isEmpty()) {
         // something has gone wrong
-        GSXML.addError (this.doc, result, "Couldn't query the audioDB database", GSXML.ERROR_TYPE_SYSTEM);
+        GSXML.addError (result, "Couldn't query the audioDB database", GSXML.ERROR_TYPE_SYSTEM);
         return result;
         }
@@ -120 +121 @@
         
         // Create a metadata list to store information about the query results
-        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);
         
         // Add a metadata element specifying the number of matching documents
         // because the total number is just the number returned, use numDocsReturned, not numDocsMatched
-        GSXML.addMetadata (this.doc, metadata_list, "numDocsReturned", ""+totalDocs);
+        GSXML.addMetadata (metadata_list, "numDocsReturned", ""+totalDocs);
         // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query
-        GSXML.addMetadata (this.doc, metadata_list, "query", query);
+        GSXML.addMetadata (metadata_list, "query", query);
         
         if (docs.size () > 0) {
         // Create a document list to store the matching documents, and add them
-        Element document_list = this.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 < docs.size (); d++) {
@@ -140 +141 @@
             String offsets = adb_doc.getOffsetList();
 
-            Element doc_node = createDocNode (doc_id, Double.toString (rank));
+            Element doc_node = createDocNode (result_doc, doc_id, Double.toString (rank));
             doc_node.setAttribute("frameOffset", offsets);
 
@@ -148 +149 @@
         
         // Create an empty term list as a place holder for the term information
-        Element term_list = this.doc.createElement (GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+        Element term_list = result_doc.createElement (GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
         result.appendChild (term_list);