Changeset 36859 for gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/service/GS2WekaDBSearch.java

Timestamp:

2022-10-22T15:41:14+13:00 (19 months ago)

Author:

davidb

Message:

Coding developments that mean param passed arousal and valence values not used; query_resutls_ capped to max_docs_

File:

• gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/service/GS2WekaDBSearch.java (modified) (4 diffs)

gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/service/GS2WekaDBSearch.java

@@ -51 +51 @@
     protected static final String RADIUS_PARAM  = "radius";
     protected static final String MAXDOCS_PARAM = "maxDocs";
+    protected static final String AROUSAL_PARAM  = "arousal";
+    protected static final String VALENCE_PARAM  = "valence";
 
     //protected static final String WEKA_MODEL_DEFAULT_DIRECTORY = "weka-model";
@@ -115 +117 @@
         setStandardQueryParams (params); // ****
         
-        this.wekadb_src.runQuery (weka_db_index_dir, KNN_FEATURES_FILENAME, assoc_index_dir, query);
-        Vector docs = this.wekadb_src.getQueryResult ();
+        this.wekadb_src.runQuery(weka_db_index_dir, KNN_FEATURES_FILENAME, assoc_index_dir, query);
+        Vector docs = this.wekadb_src.getQueryResult();
 
         if (docs.isEmpty()) {
@@ -145 +147 @@
         result.appendChild (document_list);
         for (int d = 0; d < docs.size (); d++) {
-            WekaDBDocInfo adb_doc = (WekaDBDocInfo) docs.elementAt(d);
-
-            String doc_id  = adb_doc.getDocID();
-            double rank    = adb_doc.getTopRank();
-            String offsets = adb_doc.getOffsetList();
+            WekaDBDocInfo wdb_doc = (WekaDBDocInfo) docs.elementAt(d);
+
+            String doc_id  = wdb_doc.getDocID();
+            double rank    = wdb_doc.getTopRank();
+            String offsets = wdb_doc.getOffsetList();
 
             Element doc_node = createDocNode (result_doc, doc_id, Double.toString (rank));
@@ -191 +193 @@
         int docs = Integer.parseInt(value);
         this.wekadb_src.setMaxDocs(docs);
+        }
+        else if (name.equals(AROUSAL_PARAM)) {
+        double arousal = Double.parseDouble(value);
+        this.wekadb_src.setArousal(arousal);
+        }       
+        else if (name.equals(VALENCE_PARAM)) {
+        double valence = Double.parseDouble(value);
+        this.wekadb_src.setValence(valence);        
         } // ignore any others
     }