Changeset 2269 for trunk/java-client

Timestamp:

2001-04-03T15:45:23+12:00 (23 years ago)

Author:

say1

Message:

renamed SimpleServer.java Proxy.java. Fixed bug in NzdlServiceFactory.java. Fixed NzdlMultiWayWrapper.java so i only found a single instance of each collection

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• Makefile (modified) (1 diff)
• Proxy.java (added)
• SimpleServer.java (deleted)
• service/NzdlMultiWayWrapper.java (modified) (4 diffs)
• util/NzdlServiceFactory.java (modified) (1 diff)

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

@@ -1 +1 @@
 
-CLASSES = SimpleClient.class SimpleServer.class SearchAllCollections.class
+CLASSES = SimpleClient.class Proxy.class SearchAllCollections.class
 
 all : subdirs $(CLASSES)

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

@@ -76 +76 @@
       if (NzdlPreferences.getBoolean("Log at the NzdlService level"))
     server = new NzdlLogWrapper(server, 
-                    "log.file.after.split." + key + "cache", 
+                    "log.file.after.split." + i + ".cache", 
                     "AFTER:" + key + ": ");
       services.put("" +i, server);
@@ -87 +87 @@
     return result;
   }
+
   String findCollection(String _name) {
     String result = "";
@@ -117 +118 @@
   public Set getCollectionSet( ) {
     Set results = new HashSet();
+    Hashtable intermediate = new Hashtable();
 
     Enumeration e = services.keys();
@@ -126 +128 @@
       while (s.hasNext()) {
     String coll = (String) s.next();
-    results.add("" + i + ":" + coll); 
+    String collname = "" + i + ":" + coll;
+    boolean hit = false;
+    for (int j = 0; j < i; j++) {
+      String oldcollname = "" + j + ":" + coll;
+      if (intermediate.get(oldcollname) != null) {
+        
+        NzdlService oldServer = (NzdlService) services.get( "" + j );
+        NzdlCollectionInfo oldColl = oldServer.getCollectionInfo(coll);
+        NzdlCollectionInfo newColl = server.getCollectionInfo(coll);
+        
+        if (oldColl.getBuildDate() == newColl.getBuildDate() &&
+        oldColl.getNumOfDocs() == newColl.getNumOfDocs() &&
+        oldColl.getNumOfWords() == newColl.getNumOfWords() &&
+        oldColl.getNumOfBytes() == newColl.getNumOfBytes() &&
+        oldColl.isPublic() == newColl.isPublic() )
+          hit = true;
+      }
+    }
+    if (hit == false) {
+      intermediate.put(collname,collname);
+      results.add("" + i + ":" + coll); 
+    }
       }
     }

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

@@ -348 +348 @@
       Properties valid = new Properties();
       
-      if (knownIORs != null)
+      if (knownIORs == null)
     throw new Error("saving null property list");