Changeset 2220 for trunk/java-client

Timestamp:

2001-03-22T15:48:52+12:00 (23 years ago)

Author:

say1

Message:

change int-> long in a number of places, new createNzdlService method taking only an IOR, added the start of a hli (high level interface

Location:

trunk/java-client

Files:

• Makefile (modified) (1 diff)
• org/nzdl/gsdl/Makefile (modified) (2 diffs)
• org/nzdl/gsdl/SimpleClient.java (modified) (1 diff)
• org/nzdl/gsdl/hli (added)
• org/nzdl/gsdl/hli/Collection.java (added)
• org/nzdl/gsdl/hli/Document.java (added)
• org/nzdl/gsdl/hli/Makefile (added)
• org/nzdl/gsdl/hli/Query.java (added)
• org/nzdl/gsdl/hli/Server.java (added)
• org/nzdl/gsdl/service/NzdlCollectionInfo.java (modified) (3 diffs)
• org/nzdl/gsdl/service/NzdlLogWrapper.java (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlMultiWayWrapper.java (modified) (1 diff)
• org/nzdl/gsdl/service/NzdlServiceClient.java (modified) (1 diff)
• org/nzdl/gsdl/util/NzdlServiceFactory.java (modified) (5 diffs)

trunk/java-client/Makefile

@@ -24 +24 @@
 
 org/nzdl/gsdl/corba/gsdlInterface/corbaiface.java : corbaiface.idl
-    idlj -fclient -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
-    idlj -fserver -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
+    idlj  -verbose -fclient -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
+    idlj  -verbose -fserver -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
     javac org/nzdl/gsdl/corba/gsdlInterface/*.java
 

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

@@ -10 +10 @@
     (cd util && $(MAKE) all)
     (cd ptp && $(MAKE) all)
+    (cd hli && $(MAKE) all)
     (cd SimpleGraphicalClient && $(MAKE) all)
 
@@ -17 +18 @@
     (cd util && $(MAKE) clean)
     (cd service && $(MAKE) clean)
+    (cd hli && $(MAKE) clean)
     (cd ptp && $(MAKE) clean)
     rm -f *.class

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

@@ -216 +216 @@
     System.out.println("Searching collection: " + collName);
       
-      int numResults = collInfo.getNumOfDocs(); // what precisely is this number ?
+      long numResults = collInfo.getNumOfDocs(); // what precisely is this number ?
 
       if (verbosity > 2)

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

@@ -139 +139 @@
    * @return An integer representing the number of documents in the collection.
    */
-  public int getNumOfDocs() {
+  public long getNumOfDocs() {
     return m_Info.numDocs;
   }
@@ -150 +150 @@
    * @return An integer representing the number of words in the collection.
    */
-  public int getNumOfWords() {
+  public long getNumOfWords() {
     return m_Info.numWords;
   }
@@ -161 +161 @@
    * @return An integer representing the number of bytes in the collection.
    */
-  public int getNumOfBytes() {
+  public long getNumOfBytes() {
     return m_Info.numBytes;
   }

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

@@ -71 +71 @@
     }    
   }
-   
+
   protected void logBefore(String method) {
     if (whenCallStarted != null)

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

@@ -97 +97 @@
     return result;
   }
-   
+
   /**
    * Allow the client to configure a CORBA server.

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

@@ -95 +95 @@
   }
 
+
   /**
    * Allow the client to configure a CORBA server.

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

@@ -300 +300 @@
     }
 
-      System.err.println("1");
     // try an IOR from the command line
     if (_IOR != null) {
@@ -309 +308 @@
     }
     
-      System.err.println("2");
     // try an IOR from a file (the filename may have been 
     // given from the commandline
@@ -321 +319 @@
     }
     
-      System.err.println("3");
     // try the compiled-in URLs
     for (int i=0;(urlsCompiledIn != null && i<urlsCompiledIn.length);i++) {
@@ -332 +329 @@
     }
 
-    System.err.println("4");
     // the knownIORs is the last resort
     IOR = NzdlServiceFactory.getFirstValid();
@@ -546 +542 @@
     return nzdl;
   }
-    
+  static public NzdlService createNzdlService(String _IOR) {
+    Properties _props =  System.getProperties();
+    
+    NzdlService nzdl = null;
+    String IOR = null;
+    
+    IOR = NzdlServiceFactory.registerIOR(_IOR);
+    nzdl = attemptToInitialise(null, _props, IOR);
+
+    if (nzdl == null) {
+      System.err.println("couldn't open the requested IOR: going for what we can ...");
+      nzdl = createNzdlService(null,null,null,null,null);
+    }
+
+    
+    if (NzdlPreferences.getBoolean("Save documents"))
+      nzdl = new NzdlDocSaveWrapper(nzdl);
+    
+    if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
+      nzdl = new NzdlLogWrapper(nzdl, "log.file.after.cache", "AFTER: ");
+    
+    if (NzdlPreferences.getBoolean("Cache corba requests"))
+      nzdl = new NzdlCacheWrapper(nzdl);
+
+    if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
+      nzdl = new NzdlLogWrapper(nzdl, "log.file.before.cache", "BEFORE: ");
+    
+    return nzdl;
+  }
+   
   /**
    * Write the System properties to a file called "System.properties" in