Changeset 3099 for trunk/java-client/org

Timestamp:

2002-04-25T12:41:09+12:00 (22 years ago)

Author:

kjdon

Message:

added support for retrieving filter options. two new classes defined, NzdlFilterOption, a single filter_option, and NzdlFilterOptions, contains a list of options.

Location:

trunk/java-client/org/nzdl/gsdl/service

Files:

• Makefile (modified) (1 diff)
• NzdlLogWrapper.java (modified) (1 diff)
• NzdlService.java (modified) (1 diff)
• NzdlServiceClient.java (modified) (1 diff)
• NzdlWrapper.java (modified) (1 diff)

trunk/java-client/org/nzdl/gsdl/service/Makefile

@@ -28 +28 @@
           NzdlMultiWayWrapper.class \
           NzdlCacheWrapper.class\
-          NzdlCrossCollectionWrapper.class
+          NzdlCrossCollectionWrapper.class\
+    NzdlFilterOptions.class\
+    NzdlFilterOption.class
 
 all: $(CLASSFILES)

trunk/java-client/org/nzdl/gsdl/service/NzdlLogWrapper.java

@@ -183 +183 @@
 
   /**
+   * Returns the set of filter options for a particular filter
+   * @param name the collection name
+   * @param filter the filter name, eg QueryFilter
+   * @return an instance of
+   * {@link NzdlFilterOptions NzdlFilterOptions} containing the filter
+   * options for a filter
+   */
+  public NzdlFilterOptions getFilterOptionSet(String _name, String _filter) {
+      logBefore("getFilterOptionSet");
+      NzdlFilterOptions result = super.getFilterOptionSet(_name, _filter);
+      logAfter("getFilterOptionSet");
+      return result;
+  }
+  /**
    * @param name the collection name
    * @return the Set of (name, value) value pairs for all metadata 

trunk/java-client/org/nzdl/gsdl/service/NzdlService.java

@@ -82 +82 @@
   public Set getFilterSet( String collectionName );
 
+    // 24-5-02 kjdon
+  /**
+   * Returns the set of filter options for a particular filter
+   * @param name the collection name
+   * @param filter the filter name
+   * @return an instance of
+   * {@link NzdlFilterOptions NzdlFilterOptions} containing the filter
+   * options for a filter
+   */
+    public NzdlFilterOptions getFilterOptionSet(String _name, String _filter);
+
   /**
    * Not Currently implemented.

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

@@ -220 +220 @@
 
   }
+  // added 24-4-02 kjdon
+  /**
+   * Returns the set of filter options for a particular filter
+   * @param name the collection name
+   * @param filter the filter name
+   * @return an instance of
+   * {@link NzdlFilterOptions NzdlFilterOptions} containing the filter
+   * options for a filter
+   */
+  public NzdlFilterOptions getFilterOptionSet(String _name, String _filter) {
+    if (_name == null || _name.equals("")){
+      throw new Error ("null or empty _name");
+    }
+    if (_filter == null || _filter.equals("")){
+      throw new Error ("null or empty _filter");
+    }
+    corbaComErrorHolder c_err = NzdlCorbaFactory.createComErrorHolder();
+    corbatext_t c_name = NzdlCorbaFactory.toCorbaText( _name );
+    corbatext_t c_filter = NzdlCorbaFactory.toCorbaText( _filter);
+    corbaFilterOptionsResponseHolder c_options = 
+      NzdlCorbaFactory.createFilterOptionsResponseHolder();
+
+    m_nzdlServer.getFilterOptions(c_name, c_filter, c_options, c_err);
+    if (c_err.value.value() != 0)
+      System.err.println("getFilterOptionSet() error " + c_err.value.value());
+    return new NzdlFilterOptions( c_options.value );
+    
+  }
 
   /**

trunk/java-client/org/nzdl/gsdl/service/NzdlWrapper.java

@@ -104 +104 @@
 
   /**
+   * Returns the set of filter options for a particular filter
+   * @param name the collection name
+   * @param filter the filter name
+   * @return an instance of
+   * {@link NzdlFilterOptions NzdlFilterOptions} containing the filter
+   * options for a filter
+   */
+    public NzdlFilterOptions getFilterOptionSet(String _name, String _filter){
+    return service.getFilterOptionSet(_name, _filter);
+    }
+
+  /**
    * Returns the set of filters for the service object.
    * @param name the collection name