Changeset 2256 for trunk/java-client/org

Timestamp:

2001-04-02T21:22:19+12:00 (23 years ago)

Author:

daven

Message:

added ranked and boolean searching options to the interface.

Location:

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

Files:

• Constants.java (modified) (1 diff)
• QueryHistoryModel.java (modified) (3 diffs)
• SearchPanel.java (modified) (6 diffs)

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

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

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

@@ -29 +29 @@
 
     private ArrayList historyItems; 
+    private ArrayList columnTitles;
+
+    private String COLLECTION = "Collection";
+    private String DATE_TIME = "Date/Time";
+    private String TERMS = "Terms";
+    private String HITS  = "Hits";
+
 
     public QueryHistoryModel() {
     super();
     historyItems = new ArrayList();
+    columnTitles = new ArrayList();
+    columnTitles.add( DATE_TIME);
+    columnTitles.add( COLLECTION);
+    columnTitles.add( TERMS);
+    columnTitles.add( HITS);
     }
 
@@ -43 +55 @@
     
     public int getColumnCount() {
-    return  QUERY_HISTORY_COLUMN_TITLES.length;
+    return columnTitles.size();
     }
 
@@ -55 +67 @@
 
     public String getColumnName(int column) {
-    return QUERY_HISTORY_COLUMN_TITLES[column];
+    return (String) columnTitles.get(column);
     }
 
     public Object getValueAt( int row, int column ) {
-    // column resolution is a bit awkward
-    // Collection = 0
-    // Terms = 1
+    QueryHistoryItem historyItem = (QueryHistoryItem)historyItems.get(row);
+    if (column == columnTitles.indexOf(DATE_TIME)) return historyItem.getDate();
+    if (column == columnTitles.indexOf(COLLECTION)) return new CollectionName(historyItem.getCollectionName());
+    if (column == columnTitles.indexOf(TERMS)) return new Query(historyItem.getQuery().toString());
+    if (column == columnTitles.indexOf(HITS)) return new Long(historyItem.getNumOfHits());
 
-    if (column == 0) return ((QueryHistoryItem)historyItems.get(row)).getDate();
-
-
-    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());
+    // something has gone wrong if we get here!
+    // but display something anyway...
     return "row" + row + "col" + column;
     }

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

@@ -38 +38 @@
 import org.nzdl.gsdl.service.NzdlService;
 import org.nzdl.gsdl.service.NzdlServiceClient;
-import org.nzdl.gsdl.util.NzdlPreferences;
+import org.nzdl.gsdl.util.*;
 
 
@@ -66 +66 @@
   JComboBox collectionList;  
   JPanel queryFormulationPanel, resultsPanel, dataPanel, optionsPanel; 
+    JPanel queryTypePanel, searchControlPanel;
   JPanel collectionListPanel, searchTextFieldPanel, searchButtonPanel;
   JList   resultsList;   
     JCheckBox stemCheckBox, caseFoldCheckBox;
+    JRadioButton rankedRadioButton, booleanRadioButton;
+    ButtonGroup buttonGroup;
   JScrollPane scrollResultsPane;
   JScrollPane scrollDataPane;
@@ -140 +143 @@
 
     optionsPanel = new JPanel();
+
+    queryTypePanel = new JPanel();
+    queryTypePanel.setLayout(new GridLayout(2,1));
+    rankedRadioButton = new JRadioButton("ranked");
+    rankedRadioButton.setActionCommand(rankedRadioButton.getText());
+    rankedRadioButton.setSelected(rankedRadioButton.getText() == NzdlConstants.DEFAULT_QUERY_TYPE);
+    rankedRadioButton.setToolTipText("Display results in a ranked list");
+    
+    booleanRadioButton = new JRadioButton("boolean");
+    booleanRadioButton.setActionCommand(booleanRadioButton.getText());
+    booleanRadioButton.setSelected(booleanRadioButton.getText() == NzdlConstants.DEFAULT_QUERY_TYPE);
+    booleanRadioButton.setToolTipText("Allows the use of Boolean operators: AND(&) OR(|) and NOT(!)");
+    buttonGroup = new ButtonGroup();
+    buttonGroup.add(rankedRadioButton);
+    buttonGroup.add(booleanRadioButton);
+    queryTypePanel.add(rankedRadioButton);
+    queryTypePanel.add(booleanRadioButton);
+    
     stemCheckBox = new JCheckBox("Stemming", true);
     stemCheckBox.setToolTipText("Strip endings such as '...ing', '...ed'");
     caseFoldCheckBox = new JCheckBox("Match case", false);
     caseFoldCheckBox.setToolTipText("Only match when the case is the same");
+
+    optionsPanel.add(queryTypePanel);
     optionsPanel.add(stemCheckBox);
     optionsPanel.add(caseFoldCheckBox);
@@ -149 +172 @@
     searchButtonPanel = new JPanel();
     searchButtonPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-    searchButtonPanel.add(optionsPanel);
     searchButtonPanel.add(searchButton);
+
+    searchControlPanel = new JPanel();
+    searchControlPanel.setLayout(new BorderLayout());
+    searchControlPanel.add(optionsPanel, BorderLayout.WEST);
+    searchControlPanel.add(searchButtonPanel, BorderLayout.EAST);
 
     queryFormulationPanel = new JPanel();
@@ -158 +185 @@
     queryFormulationPanel.add(collectionListPanel);
     queryFormulationPanel.add(searchTextFieldPanel);
-    queryFormulationPanel.add(searchButtonPanel);
+    queryFormulationPanel.add(searchControlPanel);
 
     resultsPanel = new JPanel();
@@ -219 +246 @@
       //send query to collection
       NzdlQuery nzdlQuery = new NzdlQuery(queryString);
+      nzdlQuery.setQueryType(buttonGroup.getSelection().getActionCommand());
+      System.err.println(buttonGroup.getSelection().getActionCommand());
+      //nzdlQuery.setQueryType("boolean");
       nzdlQuery.setStemming(stemCheckBox.isSelected());
       // interface reverses underlying logic so negate UI element state