Changeset 2923 for trunk/java-client/org

Timestamp:

2002-01-30T02:06:18+13:00 (22 years ago)

Author:

cs025

Message:

Added support for browsing objects and default metadata behaviours

File:

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

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

@@ -27 +27 @@
 
 import org.nzdl.gsdl.service.NzdlQuery;
+import org.nzdl.gsdl.service.NzdlBrowse;
 import org.nzdl.gsdl.corba.gsdlInterface.*;
 import org.nzdl.gsdl.util.NzdlConstants;
@@ -59 +60 @@
     return text.toString();
   }
-
 
   public static corbaComErrorHolder createComErrorHolder() {
@@ -119 +119 @@
     return createQueryFilterRequest( _term,
                      _type,
-                     NzdlConstants.DEFAULT_CASE_FOLDING_STRING,
-                     NzdlConstants.DEFAULT_STEMMING_STRING,
+                     NzdlConstants.DEFAULT_CASE_FOLDING,
+                     NzdlConstants.DEFAULT_STEMMING,
                      String.valueOf(NzdlConstants.DEFAULT_START_RESULTS),
                      String.valueOf(_numOfHits),
-                     String.valueOf(NzdlConstants.DEFAULT_MAX_DOCS)
+                     String.valueOf(NzdlConstants.DEFAULT_MAX_DOCS),
+                     NzdlConstants.DEFAULT_QUERY_META
                      );
   }
@@ -135 +136 @@
                      String.valueOf(_query.getStartResults()),
                      String.valueOf(_query.getEndResults()),
-                     String.valueOf(_query.getMaxDocs())
+                     String.valueOf(_query.getMaxDocs()),
+                     _query.getMetadata()
                      );
   }
@@ -141 +143 @@
   public static corbaFilterRequest 
     createQueryFilterRequest( String _term, String _type,     String _case, 
-                  String _stem, String _startHit, String _endHit, String _maxDocs ) {
+                  String _stem, String _startHit, String _endHit, String _maxDocs) {
+        return createQueryFilterRequest(_term, _type, _case, _stem, _startHit, _endHit, _maxDocs,
+                                        NzdlConstants.DEFAULT_QUERY_META
+                         );
+    }
+
+  public static corbaFilterRequest 
+    createQueryFilterRequest( String _term, String _type,     String _case, 
+                  String _stem, String _startHit, String _endHit, String _maxDocs, boolean _meta ) {
 
     corbaFilterRequest queryFilter = new corbaFilterRequest();
@@ -175 +185 @@
     queryFilter.docSet        = new corbatext_t[0];
     int resultOptions = NzdlConstants.FROID|NzdlConstants.FRtermFreq|NzdlConstants.FRranking;
+        if (_meta)
+        {   resultOptions |= NzdlConstants.FRmetadata;
+        }
     queryFilter.filterResultOptions = resultOptions;
     queryFilter.requestParams = toCorbaText("");
@@ -183 +196 @@
   }
   
+  public static corbaFilterRequest 
+    createBrowseFilterRequest( NzdlBrowse _browse ) {
+    return createBrowseFilterRequest( _browse.getBrowseNode(), _browse.getMetadata());
+  }
+
   public static corbaFilterRequest createBrowseFilterRequest(String _docID, String _metaTag) {