Changeset 2147

Timestamp:

2001-03-09T17:20:32+13:00 (23 years ago)

Author:

daven

Message:

dead code removal, performance improvements, comment tidying

----------------------------------------------------------------------

Location:

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

Files:

• Result.java (modified) (2 diffs)
• SearchPanel.java (modified) (1 diff)

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

@@ -37 +37 @@
        private String collectionName;
 
+
+    public final static String FAKE_RESULT = "No results returned";
+
        // related query
        // time, person, collection etc
@@ -54 +57 @@
    public String toString ()
          {
-         return( resultTitle);
+         return resultTitle;
          }
     public String getDocID()

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

@@ -179 +179 @@
   }
 
-  public void setCollectionIndex(int index) {
-
-    collectionList.setSelectedIndex(index);
-
-  }
-
-
-  /** respond to the user pressing the Search button */
-
-  public void actionPerformed(ActionEvent e) {
-    Object source = e.getSource();
-    if (source == searchButton ) { //assume only searchButton generates events
-      System.out.println("Search button pressed in SearchPanel");
-      //send query to collection
-      NzdlQuery nzdlQuery = new NzdlQuery( searchTextField.getText() );
-      // return the first numResults that match
-      //query.setEndResults( 15 );
-      // "-1" means consider all the documents that match
-      nzdlQuery.setMaxDocs( -1 );
-      String collectionName = collectionList.getSelectedItem().toString();
-      NzdlRequest request = new NzdlRequest( nzdlQuery );
-      NzdlResponse response = new NzdlResponse( );
-      csModel.getNzdlService().service( collectionName, request, response ); //nzdl object ????
-      NzdlResultSet results = response.getResultSet();
-      java.util.List docIDs = results.getDocumentIDs();
-      // paired collection of docIDs and Titles - but as Sets!
-      Map titleMetaData = csModel.getNzdlService().getMetaData( collectionName, docIDs, "Title" );
-      // created a paired collection of docIDs and Titles - as simple Strings!
-      HashMap titleMap = new HashMap();
-      for (ListIterator i = docIDs.listIterator(); i.hasNext(); ) {
-    String docID = (String) i.next();
-    Set titleSet = (Set) titleMetaData.get( docID );
-    ArrayList titleList = new ArrayList(titleSet);
-    // String documentContents = csModel.getNzdlService().getDocument(collectionName, docID);
-    //titleMap.put(docID, titleSet.toString()); // 
-    titleMap.put(docID, titleList.get(0)); // use the first title as *the* title
-      } // end for
-      // update resultsListModel
-      // empty previous results List
-      csModel.clearResults();
-      System.err.println("Size of docIDs = " + docIDs.size());
-      Iterator docIDsIterator = docIDs.iterator();
-      while (docIDsIterator.hasNext()) {
-    String resultDocID =  (String) docIDsIterator.next();
-    Result result = new Result( (String)titleMap.get(resultDocID), resultDocID, collectionName );
-    System.err.println("Adding result");
-    csModel.addResult(result);
-      } //end while
-      // default to showing the top ranked document
-      if (docIDs.size() > 0)
-    resultsList.setSelectedIndex(0); 
-    } // end if
-    else {
-      System.out.println("unknown Action event in SearchPanel");
-    }
-  } //end actionPerformed
-
-
-
-  /**
-   * handles selection events in the results list so that when 
-   * the user selects a new title (say) the document contents 
-   * is automatically displayed in the main panel 
-   */
-
-  class ResultListSelectionHandler implements ListSelectionListener {
-    public void valueChanged(ListSelectionEvent e) {
-      //get the result object from the SelectedIndex
-      Result result = (Result) resultsList.getSelectedValue();
-      // should check here to see if anything was actually selected !
-      //get the document content from the result object
-      // use a String for the moment to hold the contents
-      String documentContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
-      dataTextArea.setText(documentContents);
-      dataTextArea.setCaretPosition(0);
-    } //end valueChanged
-  }//end ResultListSelectionHandler
+
+
+    /* respond to the user pressing the Search button */
+
+public void actionPerformed(ActionEvent e) {
+      if (e.getSource() == searchButton ) { //assume only searchButton generates events
+       System.out.println("Search button pressed in SearchPanel");
+       //send query to collection
+       NzdlQuery nzdlQuery = new NzdlQuery( searchTextField.getText() );
+       // return the first numResults that match
+       //query.setEndResults( 15 );
+       // "-1" means consider all the documents that match
+       nzdlQuery.setMaxDocs( -1 );
+       String collectionName = collectionList.getSelectedItem().toString();
+       NzdlRequest request = new NzdlRequest( nzdlQuery );
+       NzdlResponse response = new NzdlResponse( );
+       csModel.getNzdlService().service( collectionName, request, response ); //nzdl object ????
+           NzdlResultSet results = response.getResultSet();
+       java.util.List docIDs = results.getDocumentIDs();
+       // paired collection of docIDs and Titles - but as Sets!
+       Map titleMetaData = csModel.getNzdlService().getMetaData( collectionName, docIDs, "Title" );
+       // created a paired collection of docIDs and Titles - as simple Strings!
+       HashMap titleMap = new HashMap();
+       for (ListIterator i = docIDs.listIterator(); i.hasNext(); ) {
+           String docID = (String) i.next();
+           Set titleSet = (Set) titleMetaData.get( docID );
+           ArrayList titleList = new ArrayList(titleSet);
+           // use the first title as *the* title
+           titleMap.put(docID, titleList.get(0)); 
+       } // end for
+       // update the results list
+       // empty previous results List
+       csModel.clearResults();
+       // System.err.println("Size of docIDs = " + docIDs.size());
+       if (docIDs.size() == 0 ) { // no real results
+           csModel.addResult(new Result(Result.FAKE_RESULT, "", ""));
+       }
+       else { // there are some results
+           Iterator docIDsIterator = docIDs.iterator();
+           while (docIDsIterator.hasNext()) {
+           String resultDocID =  (String) docIDsIterator.next();
+           //System.err.println("Adding result");
+           csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName ));
+           } //end while
+       } // end else
+           // default to showing the top ranked document
+           resultsList.setSelectedIndex(0); 
+       } // end if
+      else {
+       System.out.println("unknown Action event in SearchPanel");
+      }
+ } //end actionPerformed
+
+
+
+    /* handles selection events in the results list so that when the 
+       user selects a new title (say) the document contents is 
+       automatically displayed in the main panel */
+
+ class ResultListSelectionHandler implements ListSelectionListener {
+     public void valueChanged(ListSelectionEvent e) {
+     // get the result object from the SelectedIndex
+     // assume we only get here with events from resultsList
+     Result result =  (Result) resultsList.getSelectedValue();
+     if (result.toString() == Result.FAKE_RESULT) {
+         dataTextArea.setText(null);
+         //System.err.println("no results");
+     }
+     else {
+         //get the document content from the result object
+         // use a String for the moment to hold the contents
+         // should cache document contents here to speed access
+         String documentContents = csModel.getNzdlService().getDocument(result.getCollectionName(),  result.getDocID());
+         dataTextArea.setText(documentContents);
+         dataTextArea.setCaretPosition(0);
+     }
+     } //end valueChanged
+}//end ResultListSelectionHandler