Changeset 3101 for trunk/java-client/org

Timestamp:

2002-04-25T12:44:10+12:00 (22 years ago)

Author:

kjdon

Message:

can now specify which index to search. Also, the filterOPtions for queryfilter are returned for each collection, and the available and default indexes displayed to the user.

File:

• trunk/java-client/org/nzdl/gsdl/SimpleClient.java (modified) (9 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleClient.java

@@ -56 +56 @@
 import org.nzdl.gsdl.service.NzdlServiceClient;
 import org.nzdl.gsdl.util.NzdlServiceFactory;
-
+import org.nzdl.gsdl.service.NzdlFilterOption;
+import org.nzdl.gsdl.service.NzdlFilterOptions;
 /**
  * Class SimpleClient
@@ -97 +98 @@
   /** The query to use */
   String queryToQuery = "the";
+    /** The index to use */
+    String indexToQuery = "";
   /** Poll all collections */
   boolean examineAllCollections = false;
@@ -211 +214 @@
     while (e.hasMoreElements()) {
       String collName  = (String) e.nextElement();
-      NzdlCollectionInfo collInfo = nzdl.getCollectionInfo( collName );
-      
+
+
+      // get some basic col info - num docs in collection
+      NzdlCollectionInfo collInfo = nzdl.getCollectionInfo( collName );      
       if (verbosity > 0)
     System.out.println("Searching collection: " + collName);
       
-      long numResults = collInfo.getNumOfDocs(); // what precisely is this number ?
-
+      long numResults = collInfo.getNumOfDocs(); // number of docs in collection
       if (verbosity > 2)
-    System.out.println("Collection " + collName + " suggests to get results in chunks of " + numResults + " hits" );
-      if (verbosity > 2)
-    System.out.println("Query Term: " + queryTerm);
+    System.out.println("Collection " + collName + " has " + numResults + " documents" );
+
+      // get some filter options for query filter - list the indexes available
+      NzdlFilterOptions filterops = nzdl.getFilterOptionSet(collName, "QueryFilter");
+      
+      NzdlFilterOption filt;
+      if (verbosity > 1) {
+      if (filterops.hasOption("Index")) {
+          filt = (NzdlFilterOption)filterops.getFilterOption("Index");
+          System.out.println(collName+"  has indexes "+ filt.validValues);
+          System.out.println("The default index is "+filt.defaultValue);
+      }
+      }
+
+      if (verbosity > 1)
+    System.out.print("Searching for query term: " + queryTerm+ ", in index: ");
+      if (indexToQuery=="") {
+      System.out.println("[default]");
+      }
+      else {
+      System.out.println(indexToQuery);
+      } 
       String metaTag = "Title";
       
-      if (verbosity > 2)
-    System.out.println("Searching in '" + metaTag + "' metadata");
+      // if (verbosity > 2)
+      //System.out.println("Searching in '" + metaTag + "' metadata");
       
       NzdlQuery query = new NzdlQuery( queryTerm );
       // return the first numResults that match
-      //query.setEndResults( 15 );
+      query.setEndResults( 200 );
       // "-1" means consider all the documents that match
-      query.setMaxDocs( -1 );
+      query.setMaxDocs( 200);
+      query.setIndex(indexToQuery); // for mgpp colls, this must be a valid index, or "". otherwise it will cause an error.
       
       NzdlRequest request = new NzdlRequest( query );
@@ -286 +310 @@
     s += "-a         --all                    Examine all collections\n";
     s += "-q <query> --query <query>          Use <query>\n";
+    s += "-i <index> --index <index>          Query the <index> index\n";
     s += "-d         --docs                   Load the documents as well\n";
     s += "-Q         --queryAllCollections    Apply the <query> to all collections\n";
@@ -301 +326 @@
     System.err.println("in parseArgs");
    
-    LongOpt[] longopts = new LongOpt[10];
+    LongOpt[] longopts = new LongOpt[11];
     int i = 0;
     StringBuffer sb = new StringBuffer();
@@ -312 +337 @@
     longopts[i++]  = new LongOpt("all",                   LongOpt.NO_ARGUMENT,       null, 'a');
     longopts[i++]  = new LongOpt("query",                 LongOpt.REQUIRED_ARGUMENT, null, 'q');
+    longopts[i++]  = new LongOpt("index",                 LongOpt.REQUIRED_ARGUMENT, null, 'i');
     longopts[i++]  = new LongOpt("docs",                  LongOpt.NO_ARGUMENT,       null, 'd');
     longopts[i++]  = new LongOpt("verbose",               LongOpt.REQUIRED_ARGUMENT, null, 'v');
@@ -317 +343 @@
     Getopt g = new Getopt("org.nzdl.gsdl.SimpleClient",
                           args,
-                          "hI:f:c:aq:dv:Qu:",
+                          "hI:f:c:aq:i:dv:Qu:",
                           longopts);
     int c;
@@ -344 +370 @@
       queryToQuery = g.getOptarg();
           break;
+    case 'i':
+        indexToQuery = g.getOptarg();
+        break;
     case 'a':
       examineAllCollections = true;
@@ -381 +410 @@
       client.pollCollections();
     
-    client.runQuery();
+        client.runQuery();
     
   } //main