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

Timestamp:

2011-08-12T16:40:17+12:00 (13 years ago)

Author:

davidb

Message:

Latest round of changes to code, in preparing for demo to Goldsmiths

Location:

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

Files:

• AbstractAudioSearch.java (added)
• AbstractGS2AudioSearch.java (added)
• GS2AudioDBSearch.java (modified) (8 diffs)

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

@@ -38 +38 @@
 import org.apache.log4j.*;
 
-public class GS2AudioDBSearch extends AbstractGS2Search {
+public class GS2AudioDBSearch extends AbstractGS2AudioSearch {
 
     static Logger logger = Logger.getLogger (org.greenstone.gsdl3.service.GS2AudioDBSearch.class.getName ());
@@ -48 +48 @@
 
     protected static final String AUDIODB_DEFAULT_DIRECTORY = "audioDB";
-    protected static final String ADB_FILENAME = "lhs-features.adb";
+    protected static final String ADB_FILENAME = "lsh-features.adb";
     
     protected AudioDBWrapper audiodb_src = null;
@@ -60 +60 @@
     
      /** do the actual query */
-    protected Element processTextQuery (Element request) {
+    protected Element processAudioQuery (Element request) {
     // MG needs to be synchronized (this inspiration for this class)
     // Since it is not known how concurrent audioDB can be, play it safe for
@@ -68 +68 @@
         // Create a new (empty) result message ('doc' is in ServiceRack.java)
         Element result = this.doc.createElement (GSXML.RESPONSE_ELEM);
-        result.setAttribute (GSXML.FROM_ATT, TEXT_QUERY_SERVICE); // Result looks the same as a text query
+
+        // Rather than QUERY_SERVICE use "TextQuery" 
+        // => makes the result looks the same as a text query
+        result.setAttribute (GSXML.FROM_ATT, "TextQuery"); 
         result.setAttribute (GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
         
@@ -74 +77 @@
         Element param_list = (Element) GSXML.getChildByTagName (request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list == null) {
-        logger.error ("AudioDB TextQuery request had no paramList.");
+        logger.error ("AudioDB AudioQuery request had no paramList.");
         return result;  // Return the empty result
         }
@@ -86 +89 @@
         return result;  // Return the empty result
         }
-        
+
         // If an index hasn't been specified, use the default
         String index = (String) params.get (INDEX_PARAM);
@@ -94 +97 @@
         
         // The location of the audioDB index
-        String index_dir = GSFile.collectionIndexDir (this.site_home, this.cluster_name) +  File.separatorChar + index;
-        
+        String toplevel_index_dir = GSFile.collectionIndexDir (this.site_home, this.cluster_name);
+        String audioDB_index_dir = toplevel_index_dir + File.separatorChar + index;
+        String assoc_index_dir = toplevel_index_dir + File.separatorChar + "assoc";
+
         // set the audioDB query parameters to the values the user has specified
         setStandardQueryParams (params);
         
-        this.audiodb_src.runQuery (index_dir, ADB_FILENAME, query);
+        this.audiodb_src.runQuery (audioDB_index_dir, ADB_FILENAME, assoc_index_dir, query);
         Vector docs = this.audiodb_src.getQueryResult ();
 
         if (docs.isEmpty()) {
         // something has gone wrong
-        GSXML.addError (this.doc, result, "Couldn't query the mg database", GSXML.ERROR_TYPE_SYSTEM);
+        GSXML.addError (this.doc, result, "Couldn't query the audioDB database", GSXML.ERROR_TYPE_SYSTEM);
         return result;
         }
@@ -129 +134 @@
         result.appendChild (document_list);
         for (int d = 0; d < docs.size (); d++) {
-            String doc_id = ((AudioDBDocInfo) docs.elementAt (d)).oid_;
-            float rank = ((AudioDBDocInfo) docs.elementAt (d)).rank_;
-            Element doc_node = createDocNode (doc_id, Float.toString (rank));
+            AudioDBDocInfo adb_doc = (AudioDBDocInfo) docs.elementAt(d);
+
+            String doc_id  = adb_doc.getDocID();
+            double rank    = adb_doc.getTopRank();
+            String offsets = adb_doc.getOffsetList();
+
+            Element doc_node = createDocNode (doc_id, Double.toString (rank));
+            doc_node.setAttribute("frameOffset", offsets);
+
             document_list.appendChild (doc_node);
         }