Changeset 2145 for trunk/java-client

Timestamp:

2001-03-09T14:33:06+13:00 (23 years ago)

Author:

say1

Message:

Added Model initialisation to CSModel. Fixed the bug where empty collections appear. Fixed the exception thrown on an empty doc set

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleGraphicalClient/CSModel.java (modified) (2 diffs)
• SimpleGraphicalClient/SearchPanel.java (modified) (1 diff)
• SimpleGraphicalClient/SimpleGraphicalClient.java (modified) (1 diff)
• service/NzdlCollectionInfo.java (modified) (2 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSModel.java

@@ -22 +22 @@
 import javax.swing.*;
 
-
 // local libraries
 
 import org.nzdl.gsdl.service.NzdlService;
-
+import org.nzdl.gsdl.service.NzdlCollectionInfo;
 /**
  * Class 
@@ -41 +40 @@
 {
 
-    Vector collectionList;
-    String currentCollection;
-    ResultModel results;
-    NzdlService nzdl;
+  Vector collectionList;
+  String currentCollection;
+  ResultModel results;
+  NzdlService nzdl;
     
 
-    public CSModel(NzdlService newNzdl)
-    {
-        nzdl = newNzdl;
-        results = new ResultModel();
-        collectionList = new Vector();
-        currentCollection = "";
-    }
-
-
-    public NzdlService getNzdlService()
-    {
-    return nzdl;
-    }
+  public CSModel(NzdlService newNzdl)
+  {
+    nzdl = newNzdl;
+    results = new ResultModel();
+    collectionList = new Vector();
+    currentCollection = "";
+    initialiseCollection();
+  }
+  
+  
+  public NzdlService getNzdlService()
+  {
+    return nzdl;
+  }
 
     
     
 
-/* Result methods */
+  /* Result methods */
 
-     public ResultModel getResultsModel()
-    {
-     return results;
-    }
+  public ResultModel getResultsModel()
+  {
+    return results;
+  }
     
-    public void addResult(Result result)
-    {
-     results.add(result);
-    }
+  public void addResult(Result result)
+  {
+    results.add(result);
+  }
     
-    public void clearResults()
-    {
-    System.out.println("Clearing resultModel");
-    results.clear();
-    }
+  public void clearResults()
+  {
+    System.out.println("Clearing resultModel");
+    results.clear();
+  }
 
-/* collectionList methods */
+  /* collectionList methods */
 
-    public Vector getCollectionList()
-    {
-       return collectionList;
-    }
+  public Vector getCollectionList()
+  {
+    return collectionList;
+  }
 
-    public int getCollectionListSize() 
-    {
-    return collectionList.size();
-    }
+  public int getCollectionListSize() 
+  {
+    return collectionList.size();
+  }
     
-    public void addCollection(String collection)
-    {
-     collectionList.add(collection);
-    }
+  public void addCollection(String collection)
+  {
+    collectionList.add(collection);
+  }
 
-    public void setCurrentCollection(String collection )
-    {
-    currentCollection = collection;
-    }
+  public void setCurrentCollection(String collection )
+  {
+    currentCollection = collection;
+  }
 
-    public String getCurrentCollection()
-    {
-    return currentCollection;
-    }
+  public String getCurrentCollection()
+  {
+    return currentCollection;
+  }
 
-    public String getFirstCollection()
-    {
-    return (String)collectionList.get(0);
-    }
+  public String getFirstCollection()
+  {
+    return (String)collectionList.get(0);
+  }
+  /**
+   *
+   */
+  public void initialiseCollection() 
+  {
+    Set collectionSet = nzdl.getCollectionSet(); // set of strings of collection titles
+    TreeSet orderedCollectionSet = new TreeSet(collectionSet);
+    // TreeSet automatically puts strings in alphabetical order
+    System.out.println("Number of collections on the server: " + 
+               orderedCollectionSet.size());
+    Iterator collectionSetIterator = orderedCollectionSet.iterator();
+    while (collectionSetIterator.hasNext() ) {
+      // object -> String
+      String collectionName = (String)collectionSetIterator.next(); 
+      NzdlCollectionInfo info = nzdl.getCollectionInfo(collectionName);
+      //System.err.println(info);
+      if (info != null && 
+      info.getBuildDate() != 0) {
+    addCollection(collectionName);
+    System.err.println("Adding " + collectionName + " to collection list...");
+      } // end if
+      else {
+    System.err.println("Collection " + collectionName + " getBuildDate() returned 0");
+      } // end else
+    } // end while  
+    setCurrentCollection(getFirstCollection()); //assume at least one collection
+    
+  }
     
     

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/SearchPanel.java

@@ -228 +228 @@
       } //end while
       // default to showing the top ranked document
-      resultsList.setSelectedIndex(0); 
+      if (docIDs.size() > 0)
+    resultsList.setSelectedIndex(0); 
     } // end if
     else {

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

@@ -111 +111 @@
     csModel = new CSModel(nzdl);
    
-    Set collectionSet = nzdl.getCollectionSet(); // set of strings of collection titles
-    TreeSet orderedCollectionSet = new TreeSet(collectionSet);
-    // TreeSet automatically puts strings in alphabetical order
-    System.out.println("Number of collections on the server: " + orderedCollectionSet.size());
-    Iterator collectionSetIterator = orderedCollectionSet.iterator();
-    while (collectionSetIterator.hasNext() ) {
-        String collectionName = (String)collectionSetIterator.next(); // object -> String
-        if (nzdl.hasCollection(collectionName) && nzdl.pingCollection(collectionName) ) {
-        csModel.addCollection(collectionName);
-        System.out.println("Adding " + collectionName + " to collection list...");
-        } // end if
-        else {
-        System.err.println("Collection " + collectionName + " wasn't added ");
-        System.err.println("\t either pingCollection() or hasCollection() returned false");
-        } // end else
-    } // end while  
-    csModel.setCurrentCollection(csModel.getFirstCollection()); //assume at least one collection
     window = new CSFrame("Search via Corba", csModel);   
     Toolkit theKit = window.getToolkit();        // Get the window toolkit

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

@@ -48 +48 @@
   }
 
+  public String toString() {
+    StringBuffer buf = new  StringBuffer(1000);
+    buf.append("coll name=\"").append(getName());
+    buf.append("\" isPublic=").append(isPublic());
+    buf.append(" isBeta=").append(isBeta());
+    buf.append(" buildDate=").append(getBuildDate());
+    buf.append(" numOfDocs=").append(getNumOfDocs());
+    buf.append(" numOfWords=").append(getNumOfWords());
+    buf.append(" numOfBytes=").append(getNumOfBytes());
+    return buf.toString();
+  }
+
   /** */
   public void print() {
@@ -58 +70 @@
 
 }
+
+
+
+
+
+
+
+