Changeset 2251

Timestamp:

2001-04-02T17:12:54+12:00 (23 years ago)

Author:

daven

Message:

updated QueryHistory to show time and num of hits. Removed restriction on
number of hits returned (which was 10).

Location:

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

Files:

• Constants.java (modified) (1 diff)
• QueryHistoryItem.java (modified) (3 diffs)
• QueryHistoryModel.java (modified) (1 diff)
• QueryHistoryPanel.java (modified) (4 diffs)
• SearchPanel.java (modified) (2 diffs)

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

@@ -66 +66 @@
     /* Query History Table Column Titles */
     
-    String[]  QUERY_HISTORY_COLUMN_TITLES = {"Collection", "Terms"};
+    String[]  QUERY_HISTORY_COLUMN_TITLES = {"Time/Date", "Collection", "Terms", "Hits"};
 
 

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

@@ -32 +32 @@
     private Query query;
     private String collectionName;
+    private long numOfHits;
 
        // time
@@ -37 +38 @@
        // etc
        
-    public QueryHistoryItem(Query newQuery, Date newDate, String newCollectionName, String newUser) {
+    public QueryHistoryItem(Query newQuery, Date newDate, String newCollectionName, String newUser, long newNumOfHits) {
     query = newQuery;
     date = newDate;
     user = newUser;
     collectionName = newCollectionName;
+    numOfHits = newNumOfHits;
     }
 
@@ -60 +62 @@
     }
 
+    public long getNumOfHits() {
+    return numOfHits;
+    }
+
     public String toString () {
     return( user + " " + date + " "  + collectionName +" terms");

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

@@ -63 +63 @@
     // Terms = 1
 
-    if (column == 0) return new CollectionName(((QueryHistoryItem)historyItems.get(row)).getCollectionName());
+    if (column == 0) return ((QueryHistoryItem)historyItems.get(row)).getDate();
 
-    if (column == 1) return ((QueryHistoryItem)historyItems.get(row)).getQuery();
+
+    if (column == 1) return new CollectionName(((QueryHistoryItem)historyItems.get(row)).getCollectionName());
+
+    if (column == 2) return ((QueryHistoryItem)historyItems.get(row)).getQuery();
+    if (column == 3) return new Long(((QueryHistoryItem)historyItems.get(row)).getNumOfHits());
     return "row" + row + "col" + column;
     }

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

@@ -28 +28 @@
 import java.awt.event.*;
 import java.util.*;
+import java.text.*;
 
 
@@ -54 +55 @@
 
     personalQueryHistoryTable.setDefaultRenderer(QueryHistoryModel.CollectionName.class, new CollectionNameRenderer());
+    personalQueryHistoryTable.setDefaultRenderer(Date.class, new DateRenderer());
 
     personalQueryHistoryTable.setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
     personalScrollQueryPane = new JScrollPane(personalQueryHistoryTable);
     
-    personalQueryHistoryTable.getColumnModel().getColumn(0).setMaxWidth(100);
-
+    //this needs to be not hard-coded
+    personalQueryHistoryTable.getColumnModel().getColumn(0).setMaxWidth(110);
+    personalQueryHistoryTable.getColumnModel().getColumn(0).setMinWidth(110);
+    personalQueryHistoryTable.getColumnModel().getColumn(1).setMaxWidth(100);
+    personalQueryHistoryTable.getColumnModel().getColumn(3).setMaxWidth(50);
 
     tabbedPane= new JTabbedPane();
@@ -79 +84 @@
       this.setFont(queryHistoryFont);
       this.setToolTipText(csModel.getLongCollectionName(value.toString()));
+      this.setBorder(BorderFactory.createEmptyBorder(0,5,0,2));
       return this;
   } // end getTableCellRendererComponent
@@ -87 +93 @@
   } //  end CollectionNameRenderer
 
+class DateRenderer extends JLabel implements TableCellRenderer {
+  
+  public Component getTableCellRendererComponent(JTable table,
+                                               Object value,
+                                               boolean isSelected,
+                                               boolean hasFocus,
+                                               int row,
+                           int column) {
+      Date date = (Date) value;
+      this.setText(DateFormat.getInstance().format(date));
+      this.setFont(queryHistoryFont);
+      this.setToolTipText(DateFormat.getDateTimeInstance().format(date));
 
+      this.setBorder(BorderFactory.createEmptyBorder(0,5,0,2));
+      return this;
+  } // end getTableCellRendererComponent
+  
+    
+
+  
+  } //  end DateRenderer
 
 

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

@@ -210 +210 @@
       NzdlQuery nzdlQuery = new NzdlQuery(queryString);
       // return the first numResults that match
-      //query.setEndResults( 15 );
+      nzdlQuery.setEndResults( -1 );
       // "-1" means consider all the documents that match
       nzdlQuery.setMaxDocs( -1 );
@@ -245 +245 @@
     } //end while
     if (NzdlPreferences.getInstance().getBoolean(Constants.DISPLAY_FIRST_DOC))
-    resultsList.setSelectedIndex(0); // should be under Preference control!
+    resultsList.setSelectedIndex(0); 
       } // end else
 
 
-      csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user"));
+      csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user",docIDs.size() ));
 
       titleMap.clear();