Changeset 3098 for trunk

Timestamp:

2002-04-25T12:38:03+12:00 (22 years ago)

Author:

kjdon

Message:

added support for query to specify index, and for retrieval of filter options

File:

• trunk/java-client/org/nzdl/gsdl/util/NzdlCorbaFactory.java (modified) (6 diffs)

trunk/java-client/org/nzdl/gsdl/util/NzdlCorbaFactory.java

@@ -124 +124 @@
                      String.valueOf(_numOfHits),
                      String.valueOf(NzdlConstants.DEFAULT_MAX_DOCS),
-                     NzdlConstants.DEFAULT_QUERY_META
+                     NzdlConstants.DEFAULT_QUERY_META,
+                     new String("")
                      );
   }
@@ -137 +138 @@
                      String.valueOf(_query.getEndResults()),
                      String.valueOf(_query.getMaxDocs()),
-                     _query.getMetadata()
+                     _query.getMetadata(),
+                     _query.getIndex()
                      );
   }
@@ -146 +148 @@
                   String _stem, String _startHit, String _endHit, String _maxDocs) {
         return createQueryFilterRequest(_term, _type, _case, _stem, _startHit, _endHit, _maxDocs,
-                                        NzdlConstants.DEFAULT_QUERY_META
+                                        NzdlConstants.DEFAULT_QUERY_META, new String("")
                          );
     }
@@ -152 +154 @@
   public static corbaFilterRequest 
     createQueryFilterRequest( String _term, String _type,     String _case, 
-                  String _stem, String _startHit, String _endHit, String _maxDocs, boolean _meta ) {
+                  String _stem, String _startHit, String _endHit, String _maxDocs, boolean _meta, String _index ) {
 
     corbaFilterRequest queryFilter = new corbaFilterRequest();
     queryFilter.filter        = toCorbaText("QueryFilter");
 
-    queryFilter.filterOptions = new corbaOptionValue[8];
+    queryFilter.filterOptions = new corbaOptionValue[9];
     queryFilter.filterOptions[0] 
       = new corbaOptionValue(toCorbaText("Term"),
@@ -183 +185 @@
         = new corbaOptionValue(toCorbaText("MatchMode"),
                  toCorbaText("all"));
+      queryFilter.filterOptions[8]
+      = new corbaOptionValue(toCorbaText("Index"),
+                 toCorbaText(_index));
 
     queryFilter.docSet        = new corbatext_t[0];
@@ -287 +292 @@
   }
 
+    // created 25-4-02 kjdon
+    public static corbaFilterOptionsResponseHolder createFilterOptionsResponseHolder() {
+    corbaFilterOptionsResponse response = new corbaFilterOptionsResponse();
+    response.options = new corbaFilterOption[0];
+    response.names = new corbatext_t[0];
+    return new corbaFilterOptionsResponseHolder(response);
+    }
+
   public static corbaDocRequestHolder createDocRequestHolder( String _docID ) {
     corbaDocRequest docRequest