Changeset 2275 for trunk/java-client/org

Timestamp:

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

Author:

daven

Message:

updated QueryHistory to include options (stemming) and to display them..
however there is a screen real estate problem :-(
But checking in the underlying support anyway. Will sort out display soon.

Location:

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

Files:

• QueryHistoryItem.java (modified) (4 diffs)
• QueryHistoryModel.java (modified) (3 diffs)
• SearchPanel.java (modified) (2 diffs)

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

@@ -33 +33 @@
     private String collectionName;
     private long numOfHits;
+    private String queryType; // boolean or ranked
+    private boolean stemmed;
+    private boolean caseMatched;
 
        // time
@@ -38 +41 @@
        // etc
        
-    public QueryHistoryItem(Query newQuery, Date newDate, String newCollectionName, String newUser, long newNumOfHits) {
+    public QueryHistoryItem(Query newQuery, Date newDate, String newCollectionName, String newUser, long newNumOfHits, String newQueryType, boolean newStemmed, boolean newCaseMatched) {
     query = newQuery;
     date = newDate;
@@ -44 +47 @@
     collectionName = newCollectionName;
     numOfHits = newNumOfHits;
+    queryType = newQueryType;
+    stemmed = newStemmed;
+    caseMatched = newCaseMatched;
     }
 
@@ -66 +72 @@
     }
 
+    public String getQueryType() {
+    return queryType;
+    }
+
+    public boolean getStemmed() {
+    return stemmed;
+    }
+
+    public boolean getCaseMatched() {
+    return caseMatched;
+    }
+
     public String toString () {
     return( user + " " + date + " "  + collectionName +" terms");

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

@@ -35 +35 @@
     private String TERMS = "Terms";
     private String HITS  = "Hits";
+    private String QUERYTYPE = "Type";
+    private String STEMMED = "Stemmed?";
+    private String CASEMATCHED = "Case match?";
 
 
@@ -44 +47 @@
     columnTitles.add( COLLECTION);
     columnTitles.add( TERMS);
+    columnTitles.add(QUERYTYPE);
+    columnTitles.add(STEMMED);
+    columnTitles.add(CASEMATCHED);
     columnTitles.add( HITS);
     }
@@ -76 +82 @@
     if (column == columnTitles.indexOf(TERMS)) return new Query(historyItem.getQuery().toString());
     if (column == columnTitles.indexOf(HITS)) return new Long(historyItem.getNumOfHits());
+    if (column == columnTitles.indexOf(QUERYTYPE)) return new String(historyItem.getQueryType());
+    if (column == columnTitles.indexOf(STEMMED)) return new Boolean(historyItem.getStemmed());
+    if (column == columnTitles.indexOf(CASEMATCHED)) return new Boolean( historyItem.getCaseMatched());
 
     // something has gone wrong if we get here!

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

@@ -147 +147 @@
     queryType = NzdlPreferences.getInstance().getString(NzdlConstants.QUERYTYPE);
     }
-    System.err.println(queryType);
     // check integrity of queryType
-    if (!((queryType.equals(NzdlConstants.RANKED_STRING)) | (queryType.equals(NzdlConstants.BOOLEAN_STRING)))) 
+    if (!((queryType.equals(NzdlConstants.RANKED_STRING)) | (queryType.equals(NzdlConstants.BOOLEAN_STRING)))) {
     // preferences may have been corrupted!
     queryType = NzdlConstants.DEFAULT_QUERY_TYPE;
+    }
     boolean stemming = NzdlConstants.DEFAULT_STEMMING;
     if (NzdlPreferences.getInstance().isBoolean(NzdlConstants.STEMMING))
@@ -311 +311 @@
 
 
-      csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user",docIDs.size() ));
+      csModel.getQueryHistoryModel().add( new QueryHistoryItem(new Query(queryString), new Date(), collectionName, "user",docIDs.size(),buttonGroup.getSelection().getActionCommand(),stemCheckBox.isSelected(), caseFoldCheckBox.isSelected() ));
 
       titleMap.clear();