Changeset 1832

Timestamp:

2001-01-12T15:20:55+13:00 (23 years ago)

Author:

paynter

Message:

Numerous applet options to control the appearanceof the applet. The colour
of pretty much every component can be set, as can the column widths, fonts
initial search term, control panel visibility, and probably others that I
forget. This gives us most of what we need to embed a small, simple phind
applet in a search relsults page.

Location:

trunk/gsdl/src/phind/client

Files:

• Phind.java (modified) (15 diffs)
• ResultCanvas.java (modified) (20 diffs)
• ResultItemLink.java (modified) (1 diff)
• ResultItemPhrase.java (modified) (1 diff)

trunk/gsdl/src/phind/client/Phind.java

@@ -107 +107 @@
     public String library_address, phindcgi_address;
 
+    // Initial serach term
+    public String initialSearch;
+
     // Number of phrases to retrieve at any one time
     public int phraseBlockSize;
@@ -113 +116 @@
     public boolean vertical;
     public int depth;
+
+    // Font
     public int fontSize;
+    public String fontName;
     public Font plainFont, boldFont;
 
@@ -120 +126 @@
     public String backdrop_address;
     public Image backgroundImage;
+
+    // Colours
+    public Color panel_fg, panel_bg,
+    column_1_fg, column_1_bg, 
+    column_2_fg, column_2_bg,
+    highlight_fg, highlight_bg,
+    thesaurus_fg, thesaurus_bg, thesaurus_bar_fg, thesaurus_bar_bg,
+    expansion_fg, expansion_bg, expansion_bar_fg, expansion_bar_bg,
+    document_fg, document_bg, document_bar_fg, document_bar_bg,
+    message_fg, message_bg;
+    
+    // Column dimensions
+    int column_1_width, column_2_width;
+
+    // Where do we open new windows
+    String searchWindowName, documentWindowName;
 
     // the mode of operation
@@ -127 +149 @@
     final int searchMode = 2;
 
-    // elements of the page
+    // Elements of the control panel
+    boolean showControlPanel;
     Label titleLabel;
     TextField wordField;
@@ -170 +193 @@
     mode = initMode;
     
-    // Default applet parameters
-    collection = "";
-    phindcgi_address = "";
-    library_address = "";
-    
-    showImage = false;
-    backdrop_address = "";
- 
-    vertical = true;
-    depth = 3;
-
-    phraseBlockSize = 10;
-    fontSize = 12;
-
     // Read applet parameters
     getParameters();
 
-    
     // Initialise the user interface
-    setBackground(Color.white);
+    setBackground(panel_bg);
     lastQueryEndTime = new Date();
 
     // fonts used to output text
-    plainFont = new Font("Helvetica", Font.PLAIN, fontSize);
-    boldFont  = new Font("Helvetica", Font.BOLD, fontSize);
+    plainFont = new Font(fontName, Font.PLAIN, fontSize);
+    boldFont  = new Font(fontName, Font.BOLD, fontSize);
 
     // The phind applet layout manager
     setLayout(new BorderLayout());
 
-    // the Panel containing the displays is in the center of the display
+    // Panel containing the displays is in the center of the display
     resultPanel = new Panel();
     if (vertical) {
@@ -209 +217 @@
     add("Center", resultPanel);
 
-    // Create ResultDisplays and place in the interface
+    // Create ResultDisplays and place into the interface
     ResultDisplay d1, d2 = null;
     firstDisplay = new ResultDisplay(this, null);
     resultPanel.add(firstDisplay);
 
-    d1 = firstDisplay;
-    for (int i = 2; i <= depth; i++) {
-        d2 = new ResultDisplay(this, d1);
-        resultPanel.add(d2);
-        d1 = d2;
-    }
-        lastDisplay = d2;
-
-
-    // The "control panel" 
-    Panel p1 = new Panel();
-    add("North", p1);
-    p1.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
-
-    searchButton = new Button("Search");
-    searchButton.setFont(boldFont);
-    p1.add(searchButton);
-
-    Label tempLabel = new Label("  for");
-    tempLabel.setFont(boldFont);
-    p1.add(tempLabel);
-
-    wordField = new TextField(12);
-    wordField.setFont(boldFont);
-    p1.add(wordField);
-
-    Label temp2 = new Label("          ");
-    p1.add(temp2);
-
-    prevButton = new Button("Previous");
-    prevButton.setFont(boldFont);
-    prevButton.disable();
-    p1.add(prevButton);
-
-    nextButton = new Button("  Next  ");
-    nextButton.setFont(boldFont);
-    nextButton.disable();
-    p1.add(nextButton);
+    if (depth == 1) {
+        lastDisplay = firstDisplay;
+    } else {
+        d1 = firstDisplay;
+        for (int i = 2; i <= depth; i++) {
+        d2 = new ResultDisplay(this, d1);
+        resultPanel.add(d2);
+        d1 = d2;
+        }
+        lastDisplay = d2;
+    }
+
+    // The control panel
+    initialiseControlPanel();
 
     // lets get started then
     setStatus("Welcome to Phind.");
     mode = idleMode;
-    }
-
-
-    // Get the applet parameters
-    void getParameters() {
-
-
-    // What is this collection called?
-    try { 
-        collection = new String(getParameter("collection"));
-        System.out.println("Phind collection: " + collection);
-    } catch (Exception e) {
-        System.err.println("Phind could not read collection name: " + e.toString());
-        stop();
-    }
-
-    // Where do we get the phind data
-    try { 
-        phindcgi_address = new String(getParameter("phindcgi"));
-        phindcgi_address = tidy_URL(phindcgi_address, true);
-        System.out.println("Phind phindcgi: " + phindcgi_address);
-    } catch (Exception e) { 
-        System.err.println("Phind could not process phindcgi URL: " + e.toString());
-        stop();
-    }
-
-    // Where is the collection served from
-    try { 
-        library_address = new String(getParameter("library"));
-        library_address = tidy_URL(library_address, true);
-        System.out.println("Phind library: " + library_address);
-    } catch (Exception e) { 
-        System.err.println("Phind library: not specified");
-        library_address = "";
-    }
-
-    // Should we display a background image?
-    try {
-        backdrop_address = new String(getParameter("backdrop"));
-        backdrop_address = tidy_URL(backdrop_address, false);
-        URL backdrop_url = new URL(backdrop_address);
-        backgroundImage = getImage(backdrop_url);
-        showImage = true;
-        System.out.println("Phind backdrop: " + backdrop_address);
-    } catch (Exception e) { 
-        System.out.println("Phind backdrop not set: " + e.toString());
-    }
-
-    // Are the windows arranged vertically or horizontally
-    try {
-        if (getParameter("orientation").toLowerCase().startsWith("h")) {
-        vertical = false;
-        System.out.println("Phind orientation: horizontal");
-        }
-    } catch (Exception e) { 
-        System.out.println("Phind orientation: vertical");
-    }
-
-    // How many phind windows are there?
-    try { 
-        depth = Integer.valueOf(getParameter("depth")).intValue();
-    } catch (Exception e) {
-        depth = 3;
-    }
-    System.out.println("Phind depth: " + depth);
-
-    // How many phrases should we fetch at any given time?
-    try { 
-        phraseBlockSize = Integer.valueOf(getParameter("blocksize")).intValue();
-    } catch (Exception e) { 
-        phraseBlockSize = 10;
-    }
-    System.out.println("Phind retrieval block size: " + phraseBlockSize);
-
-    // How large should the font be?
-    try { 
-        fontSize = Integer.valueOf(getParameter("fontsize")).intValue();
-    } catch (Exception e) { 
-        fontSize = 12;
-    }
-    System.out.println("Phind font size: " + fontSize);
-    }
-
+
+    // Perform initial search, if requested
+    if (initialSearch.length() > 0) {
+        searchForWord(initialSearch);
+    }
+    }
+
+
+    // Display a message in the status bar
     void setStatus(String status) {
     showStatus(status);
     }
 
+    // The user performs an action in the interface
     public boolean action(Event evt, Object arg) {
 
     if (evt.target == searchButton) {
-        searchForWord();
+        searchForWord(getSearchTerm());
     } else if (evt.target == wordField) {
-        searchForWord();
+        searchForWord(getSearchTerm());
     } else if (evt.target == prevButton) {
         shiftPrevious();
@@ -354 +265 @@
         shiftNext();
     } else {
-        System.out.println("unknown action: " + evt.toString() + ", object: " + arg.toString());
+        System.out.println("unknown action: " + evt.toString() 
+                   + ", object: " + arg.toString());
     }
     return true;
@@ -362 +274 @@
     // Search for a word 
     //
-    // called when the "Search" Button is pressed
-    void searchForWord() {
+    // Clled on two occasions:
+    //   when the "Search" Button is pressed, or
+    //   to perform an "initial search"
+    void searchForWord(String searchWord) {
 
     if (mode == idleMode) {
-
+        
         // transform the word to an appropriate search key
-        String searchWord = wordField.getText().trim().toLowerCase();
+        searchWord = searchWord.trim().toLowerCase();
         for (int i = 0; i < searchWord.length(); i++) {
         if ((searchWord.charAt(i) < 'a') || (searchWord.charAt(i) > 'z')) {
@@ -374 +288 @@
         }
         }
-        wordField.setText(searchWord);
+        setSearchTerm(searchWord);
 
         // look up the word
@@ -410 +324 @@
     if (mode == idleMode) {
 
-        // If we are going to replace the next ResultDisplay, then empty it
+        // If we are going to replace the first ResultDisplay, then empty it
         if (queryMode <= 2) {
         if (source.display.next != null) source.display.next.emptyContents();
@@ -452 +366 @@
                    boolean keyKnown, String key, String phrase, 
                    int queryMode) { 
-        searchButton.disable();
+        disableSearchButton();
     mode = searchMode;
     ResultBox r = null;
@@ -468 +382 @@
         setStatus("Query error: " + e.toString());
         mode = idleMode;
-        searchButton.enable();
+        enableSearchButton();
         return null;
     }
@@ -475 +389 @@
     setStatus(r.c.numberOfItems + " results for \"" + phrase + "\""); 
     mode = idleMode;
-    searchButton.enable();
+    enableSearchButton();
     lastQueryEndTime = new Date();
 
@@ -566 +480 @@
     }
     
-
-    // Previous and Next button functionality
-
-    // enable or disable the "Previous" and "Next" buttons
-    void enablePreviousAndNext() {
-
-    Component c = firstDisplay.current;
-    if (c.getClass().getName().equals("ResultBox")) {
-        if (((ResultBox) c).prevBoxExists()) {
-        prevButton.enable();
-        } else {
-        prevButton.disable();
-        }
-    }
-
-    c = lastDisplay.current;
-    if (c.getClass().getName().equals("ResultBox")) {
-        if (((ResultBox) c).nextBoxExists()) {
-        nextButton.enable();
-        } else {
-        nextButton.disable();
-        }
-    }
-    }
-
-    // Shift to previous box
-    //
-    // If the user clicks "Previous" then scroll up.
-    void shiftPrevious() {
-
-    Component c = firstDisplay.current;
-    if (c.getClass().getName().equals("ResultBox")) {
-
-        ResultBox b = (ResultBox) c;
-        if (b.prevBoxExists()) {
-        b = b.prev;
-
-        // empty all the displays
-        firstDisplay.emptyContents();
-
-        // add as many result boxes as there are displays
-        for (int i = 1 ; ((i <= depth) && (b != null)); i++) {
-            lastDisplay.display(b);
-            b.resize(b.display.size());
-            b.paintAll(b.getGraphics());
-            b = b.next;
-        }
-        }
-    }
-    enablePreviousAndNext();
-    }
-
-
-    // Shift to next box
-    //
-    // If the user clicks "Next" then scroll down if possible
-    void shiftNext() {
-
-    Component c = lastDisplay.current;
-    if (c.getClass().getName().equals("ResultBox")) {
-
-        ResultBox b = (ResultBox) c;
-        if (b.nextBoxExists()) {
-
-        // find the new "first" displayed box
-        c = firstDisplay.current;
-        b = (ResultBox) c;
-        b = b.next;
-
-        // empty all the displays
-        firstDisplay.emptyContents();
-
-        // add as many result boxes as there are displays
-        for (int i = 1 ; ((i <= depth) && (b != null)); i++) {
-            lastDisplay.display(b);
-            b.resize(b.display.size());
-            b.paintAll(b.getGraphics());
-            b = b.next;
-        }
-        }
-    }
-    enablePreviousAndNext();
-    }
-
-
 
     // Tidy up URLs
@@ -710 +539 @@
     }
 
+
+    // Get the applet parameters
+    void getParameters() {
+
+    // What is this collection called?
+    collection = parameterValue("collection");
+    System.out.println("Phind collection: " + collection);
+
+    // Where is the phind CGI script
+    phindcgi_address = parameterValue("phindcgi");
+    phindcgi_address = tidy_URL(phindcgi_address, true);
+    System.out.println("Phind phindcgi: " + phindcgi_address);
+
+    // Where is the Greenstone library
+    library_address = parameterValue("library");
+    library_address = tidy_URL(library_address, true);
+    System.out.println("Phind library: " + library_address);
+    
+    // Is there a default search term?
+    initialSearch = parameterValue("initial_search", "");
+
+    // Should we display the control panel
+    showControlPanel = true;
+    if (parameterValue("control_panel", "show").toLowerCase().equals("hide")) {
+        showControlPanel = false;
+    }
+    
+    // Should we show a background image?
+    backdrop_address = parameterValue("backdrop", "");
+    if (backdrop_address.length() > 0) {
+        backdrop_address = tidy_URL(backdrop_address, false);
+        System.out.println("Phind backdrop URL: " + backdrop_address);
+
+        try {
+        URL backdrop_url = new URL(backdrop_address);
+        backgroundImage = getImage(backdrop_url);
+        showImage = true;
+        } catch (Exception e) { 
+        System.out.println("Phind could not load " + backdrop_address);
+        showImage = false;
+        }
+    }
+
+    // Are the windows arranged vertically or horizontally
+    if (parameterValue("orientation", "vertical").toLowerCase().startsWith("hori")) {
+        vertical = false;
+    } else {
+        vertical = true;
+    }
+
+    // How many phind windows are there?
+    depth = parameterValue("depth", 3);
+
+    // How many phrases should we fetch at any given time?
+    phraseBlockSize = parameterValue("blocksize", 10);
+
+    // What font should we use?
+    fontSize = parameterValue("fontsize", 10);
+    fontName = parameterValue("fontname", "Helvetica");
+
+    // Column dimensions
+    column_1_width = parameterValue("first_column_width", 6);
+    column_2_width = parameterValue("second_column_width", column_1_width);
+    
+    // Where do we open new windows
+    searchWindowName = parameterValue("search_window", "phindsearch");
+    documentWindowName = parameterValue("document_window", "phinddoc");
+
+    // Colours
+    panel_fg = parameterValue("panel_fg", panel_fg);
+    panel_bg = parameterValue("panel_bg", panel_bg);
+
+    highlight_bg = parameterValue("highlight_bg", new Color(255, 220, 115));
+
+    expansion_fg = parameterValue("expansion_fg", Color.black);
+    thesaurus_fg = parameterValue("thesaurus_fg", new Color(0, 100, 0));
+    document_fg = parameterValue("document_fg", Color.blue);
+
+    thesaurus_bar_fg = parameterValue("thesaurus_bar_fg", Color.black);
+    expansion_bar_fg = parameterValue("expansion_bar_fg", Color.black);
+    document_bar_fg = parameterValue("document_bar_fg", Color.black);
+
+    thesaurus_bar_bg = parameterValue("thesaurus_bar_bg", new Color(160, 160, 190));
+    expansion_bar_bg = parameterValue("expansion_bar_bg", new Color(255, 200, 200));
+    document_bar_bg = parameterValue("document_bar_bg", new Color(150, 193, 156));
+
+    column_1_fg = parameterValue("first_column_fg", Color.black);
+    column_1_bg = parameterValue("first_column_bg", new Color(235, 245, 235));
+    column_2_fg = parameterValue("second_column_fg", Color.black);
+    column_2_bg = parameterValue("second_column_bg", new Color(200, 220, 200));
+
+    message_fg = parameterValue("message_fg", Color.black);
+    message_bg = parameterValue("message_bg", Color.white);
+
+    // Colours I don't use, yet
+    // thesaurus_bg = parameterValue("thesaurus_bg", Color.white);
+    // expansion_bg = parameterValue("expansion_bg", Color.white);
+    // document_bg = parameterValue("document_bg", Color.white);
+    }
+
+    // Get the value of a parameter given its name.
+    // There are many types of parameters, hence the variety of functions.
+
+    // Get a REQUIRED string.  Stop the applet if we cannot.
+    String parameterValue(String name) {
+    try { 
+        return getParameter(name);
+    } catch (Exception e) {
+        System.err.println("Phind: you must give a parameter for \"" 
+                   + name + "\".  Stopping.");
+        stop();
+    }
+    return "";
+    }
+
+    // Get an optional parameter.  Return a default if we cannot.
+    String parameterValue(String name, String defaultValue) {
+    String text = getParameter(name);
+    if (text == null) {
+        return defaultValue;
+    }
+    System.out.println("Phind " + name + ": " + text);
+    return text;
+    }
+
+    int parameterValue(String name, int defaultValue) {
+    int value;
+    try { 
+        value = Integer.parseInt(getParameter(name));
+    } catch (Exception e) {
+        return defaultValue;
+    }
+    System.out.println("Phind " + name + ": " + value);
+    return value;
+    }
+
+    Color parameterValue(String name, Color defaultValue) {
+
+    String text = getParameter(name);
+    if (text == null) {
+        return defaultValue;
+    }
+    text = text.toLowerCase();
+
+    // a number of the form "#ddffee" 
+    if (text.startsWith("#") && (text.length() == 7)) {
+        text = text.substring(1);
+        int r, g, b;
+        try {
+        r = Integer.parseInt(text.substring(0,2), 16);
+        g = Integer.parseInt(text.substring(2,4), 16);
+        b = Integer.parseInt(text.substring(4), 16);
+        return new Color(r, g, b);
+        }  catch (Exception e) {
+        return defaultValue;
+        }
+    }
+
+    // a known Java colour string
+    else if (text.equals("black")) { return Color.black; }
+    else if (text.equals("blue")) { return Color.blue; }
+    else if (text.equals("cyan")) { return Color.cyan; }
+    else if (text.equals("darkgray")) { return Color.darkGray; }
+    else if (text.equals("gray")) { return Color.gray; }
+    else if (text.equals("green")) { return Color.green; }
+    else if (text.equals("lightgray")) { return Color.lightGray; }
+    else if (text.equals("magenta")) { return Color.magenta; }
+    else if (text.equals("orange")) { return Color.orange; }
+    else if (text.equals("pink")) { return Color.pink; }
+    else if (text.equals("red")) { return Color.red; }
+    else if (text.equals("white")) { return Color.white; }
+    else if (text.equals("yellow")) { return Color.yellow; }
+
+    return defaultValue;
+    }
+
+
+    // Control panel operations
+
+    // Initialise the control panel
+    void initialiseControlPanel() {
+    
+    if (showControlPanel) {
+        Panel p1 = new Panel();
+        add("North", p1);
+        p1.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        
+        searchButton = new Button("Search");
+        searchButton.setFont(boldFont);
+        p1.add(searchButton);
+        
+        Label tempLabel = new Label("  for");
+        tempLabel.setFont(boldFont);
+        p1.add(tempLabel);
+        
+        wordField = new TextField(12);
+        wordField.setFont(boldFont);
+        p1.add(wordField);
+        
+        Label temp2 = new Label("          ");
+        p1.add(temp2);
+        
+        prevButton = new Button("Previous");
+        prevButton.setFont(boldFont);
+        prevButton.disable();
+        
+        p1.add(prevButton);
+        
+        nextButton = new Button("  Next  ");
+        nextButton.setFont(boldFont);
+        nextButton.disable();
+        p1.add(nextButton);
+        
+    }
+    }
+    
+    // Button and field functionality
+    
+    // Enable and disable the word field
+    void enableSearchButton() {
+    if (showControlPanel) {
+        searchButton.enable();
+    }
+    }
+    void disableSearchButton() {
+    if (showControlPanel) {
+        searchButton.disable();
+    }
+    }
+
+    // Get and set the search text in the wordField
+    String getSearchTerm() {
+    if (showControlPanel) {
+        return wordField.getText();
+    } else {
+        return initialSearch;
+    }
+    }
+    void setSearchTerm(String word) {
+    if (showControlPanel) {
+        wordField.setText(word);
+    } 
+    }
+
+    // Enable or disable the "Previous" and "Next" buttons
+    void enablePreviousAndNext() {
+
+    if (showControlPanel) {
+        Component c = firstDisplay.current;
+        if (c.getClass().getName().equals("ResultBox")) {
+        if (((ResultBox) c).prevBoxExists()) {
+            prevButton.enable();
+        } else {
+            prevButton.disable();
+        }
+        }
+        
+        c = lastDisplay.current;
+        if (c.getClass().getName().equals("ResultBox")) {
+        if (((ResultBox) c).nextBoxExists()) {
+            nextButton.enable();
+        } else {
+            nextButton.disable();
+        }
+        }
+    }
+    }
+
+    // Shift to previous box
+    //
+    // If the user clicks "Previous" then scroll up.
+    void shiftPrevious() {
+
+    Component c = firstDisplay.current;
+    if (c.getClass().getName().equals("ResultBox")) {
+
+        ResultBox b = (ResultBox) c;
+        if (b.prevBoxExists()) {
+        b = b.prev;
+
+        // empty all the displays
+        firstDisplay.emptyContents();
+
+        // add as many result boxes as there are displays
+        for (int i = 1 ; ((i <= depth) && (b != null)); i++) {
+            lastDisplay.display(b);
+            b.resize(b.display.size());
+            b.paintAll(b.getGraphics());
+            b = b.next;
+        }
+        }
+    }
+    enablePreviousAndNext();
+    }
+
+    // Shift to next box
+    //
+    // If the user clicks "Next" then scroll down if possible
+    void shiftNext() {
+
+    Component c = lastDisplay.current;
+    if (c.getClass().getName().equals("ResultBox")) {
+
+        ResultBox b = (ResultBox) c;
+        if (b.nextBoxExists()) {
+
+        // find the new "first" displayed box
+        c = firstDisplay.current;
+        b = (ResultBox) c;
+        b = b.next;
+
+        // empty all the displays
+        firstDisplay.emptyContents();
+
+        // add as many result boxes as there are displays
+        for (int i = 1 ; ((i <= depth) && (b != null)); i++) {
+            lastDisplay.display(b);
+            b.resize(b.display.size());
+            b.paintAll(b.getGraphics());
+            b = b.next;
+        }
+        }
+    }
+    enablePreviousAndNext();
+    }
+
+
+
+
+
 }

trunk/gsdl/src/phind/client/ResultCanvas.java

@@ -205 +205 @@
     void updateMoreLinksMarker() {
     
-    System.out.println("updateMoreLinksMarker() ");
-    System.out.println("retreived: " + parent.thesaurusLinksRetrieved);
-    System.out.println("total: " + parent.numberOfThesaurusLinks);
+    // System.out.println("updateMoreLinksMarker() ");
 
     // look for a marker
@@ -255 +253 @@
     g.setFont(areaPlain);
     int space = g.getFontMetrics().stringWidth(" ");
-    int margin = g.getFontMetrics().stringWidth(" 8888 ");
-
-    int secondColumn = canvasSize.width - margin;
-    int firstColumn = secondColumn - margin;
-
-    int leftMargin = 0;
-    int rightMargin = firstColumn;
+    int nought = g.getFontMetrics().stringWidth("0");
+
+    int firstColumnWidth = phind.column_1_width * nought;
+    int secondColumnWidth = phind.column_2_width * nought;
+    int columnWidth = firstColumnWidth + secondColumnWidth;
+
+    int firstColumnLeft = canvasSize.width - columnWidth;
+    int secondColumnLeft = firstColumnLeft + firstColumnWidth;
+
+    int mainLeftMargin = 0;
+    int mainRightMargin = firstColumnLeft;
 
     // the number of items that will fit on the canvas
@@ -276 +278 @@
 
     // Draw the phrase area
+    Color fore = phind.panel_fg;
+    Color back = phind.panel_bg;
+
 
     // draw the background
@@ -281 +286 @@
         try {
         g.drawImage(backgroundImage, 
-                leftMargin, 0, rightMargin, canvasSize.height, 
-                Color.white, null);
+                mainLeftMargin, 0, mainRightMargin, canvasSize.height, 
+                back, null);
         } catch (Exception e) {
         phind.showImage = false;
         System.err.println("ResultCanvas paint error: " + e); 
-        g.setColor(Color.white);
+        g.setColor(back);
         g.fillRect(0, 0, canvasSize.width, canvasSize.height);
         }
     } else {
-        g.setColor(Color.white);
+        g.setColor(back);
         g.fillRect(0, 0, canvasSize.width, canvasSize.height);
     }
@@ -296 +301 @@
     // If there are no phrases, output a brief explanation.
     if (numberOfItems == 0) {
-        g.drawString("No phrases match this query.", leftMargin + 10, lineSpacing);
+        g.drawString("No phrases match this query.", mainLeftMargin + 10, lineSpacing);
     }
 
@@ -302 +307 @@
     ResultItem result;
     int tab, i, y = 0;
-    int center = leftMargin 
-        + ((rightMargin - leftMargin 
+    int center = mainLeftMargin 
+        + ((mainRightMargin - mainLeftMargin 
         - g.getFontMetrics().stringWidth(parent.searchPhrase)) / 2);
-    int thesColumn = leftMargin + margin 
+    int thesColumn = mainLeftMargin + firstColumnWidth 
         + g.getFontMetrics().stringWidth("Narrower term");
 
@@ -320 +325 @@
         g.setFont(areaPlain);
 
-        // Highlight if the selected phrase.
+        // Highlight the selected phrase.
         if (i == itemSelected) {
-        g.setColor(new Color(255, 220, 115));
-        g.fillRect(leftMargin, y-lineSpacing+2, rightMargin, lineSpacing);
-        g.setColor(Color.black);
+        g.setColor(phind.highlight_bg);
+        g.fillRect(mainLeftMargin, y-lineSpacing+2, mainRightMargin, lineSpacing);
         }
 
@@ -335 +339 @@
         suffix = result.suffixText();
         
-        g.setColor(Color.black);
+        g.setColor(phind.expansion_fg);
         g.setFont(areaPlain);
         tab = center - g.getFontMetrics().stringWidth(prefix) - space;
@@ -342 +346 @@
         g.setFont(areaBold);
         g.drawString(body, center, y);
+        
         tab = center + space + g.getFontMetrics().stringWidth(body);
-        
         g.setFont(areaPlain);
         g.drawString(suffix, tab, y);
@@ -353 +357 @@
         body = result.mainText();
 
+        g.setColor(phind.document_fg);
         g.setFont(areaPlain);
-        g.setColor(Color.blue);
-        tab = (rightMargin - g.getFontMetrics().stringWidth(body)) / 2;
+        tab = (mainRightMargin - g.getFontMetrics().stringWidth(body)) / 2;
         g.drawString(body, tab, y);
       
@@ -366 +370 @@
         tab = thesColumn - g.getFontMetrics().stringWidth(prefix) - space;
 
-        g.setColor(new Color(0, 100, 0));
+        g.setColor(phind.thesaurus_fg);
         g.setFont(areaPlain);
         g.drawString(prefix, tab, y);
@@ -380 +384 @@
         
         if (result.isMorePhrases()) {
-            g.setColor(new Color(255, 200, 200));
+            g.setColor(phind.expansion_bar_bg);
+        } else if (result.isMoreDocuments()) {
+            g.setColor(phind.document_bar_bg);
         } else {
-            g.setColor(new Color(150, 193, 156));
+            g.setColor(phind.thesaurus_bar_bg);         
         }
-        g.fillRect(leftMargin, y-lineSpacing+2, rightMargin, lineSpacing);
-
-        g.setColor(Color.black);
+        g.fillRect(mainLeftMargin, y-lineSpacing+2, mainRightMargin, lineSpacing);
+
+        if (result.isMorePhrases()) {
+            g.setColor(phind.expansion_bar_fg);
+        } else if (result.isMoreDocuments()) {
+            g.setColor(phind.document_bar_fg);
+        } else {
+            g.setColor(phind.thesaurus_bar_fg);         
+        }
         g.setFont(areaPlain);
-        tab = (rightMargin - g.getFontMetrics().stringWidth(body)) / 2;
+        tab = (mainRightMargin - g.getFontMetrics().stringWidth(body)) / 2;
         g.drawString(body, tab, y);
         } 
@@ -396 +408 @@
 
     // column backgrounds
-    g.setColor(new Color(235, 245, 235));
-    g.fillRect(firstColumn, 0, margin, canvasSize.height);
-    g.setColor(new Color(200, 220, 200));
-    g.fillRect(secondColumn, 0, margin, canvasSize.height);
+    g.setColor(phind.column_1_bg);
+    g.fillRect(firstColumnLeft, 0, firstColumnWidth, canvasSize.height);
+    g.setColor(phind.column_2_bg);
+    g.fillRect(secondColumnLeft, 0, secondColumnWidth, canvasSize.height);
 
     // fill in the numbers
-    g.setColor(Color.black);
+    g.setColor(phind.column_1_fg);
     g.setFont(areaPlain);
     y = 0;
@@ -420 +432 @@
         // Write the document frequency
         if (docsText.length() > 0) {
-        tab = secondColumn - space - g.getFontMetrics().stringWidth(docsText);
+        tab = secondColumnLeft - space - g.getFontMetrics().stringWidth(docsText);
         g.drawString(docsText, tab, y);
         }
@@ -426 +438 @@
         // Write the term frequency
         if (freqText.length() > 0) {
-        tab = secondColumn + margin - space - g.getFontMetrics().stringWidth(freqText);
+        tab = secondColumnLeft + secondColumnWidth 
+            - space - g.getFontMetrics().stringWidth(freqText);
         g.drawString(freqText, tab, y);
         }
@@ -447 +460 @@
     }
 
+    
+    g.setColor(phind.panel_fg);
     g.drawRect(0,0, canvasSize.width - 1, canvasSize.height - 1);
     }
@@ -470 +485 @@
         // which Item is selected?
         int rowSelected = event.y / lineSpacing;
-        int itemSelected = rowSelected + firstItemDisplayed;
+        itemSelected = rowSelected + firstItemDisplayed;
         ResultItem item = (ResultItem) items.elementAt(itemSelected);
 
@@ -486 +501 @@
                 + "a=q&c=" + phind.collection
                 + "&q=%22" + item.toString().replace(' ', '+') + "%22";
-            phind.displayWebPage(address, "phindsearch");
+            phind.displayWebPage(address, phind.searchWindowName);
             }
         } 
@@ -501 +516 @@
                 + "a=q&c=" + phind.collection
                 + "&q=%22" + item.toString().replace(' ', '+') + "%22";
-            phind.displayWebPage(address, "phindsearch");
+            phind.displayWebPage(address, phind.searchWindowName);
             }
         } 
@@ -514 +529 @@
             + "&d=" + item.hiddenText()
             + "&q=" + parent.searchPhrase.replace(' ', '+');
-            phind.displayWebPage(address, "phinddoc");
+            phind.displayWebPage(address, phind.documentWindowName);
         }
          

trunk/gsdl/src/phind/client/ResultItemLink.java

@@ -58 +58 @@
     id = newId;
     symbol = Integer.valueOf(newId).intValue();
-    text = newText;
+    text = newText.trim();
     linkType = newLinkType;
     frequency = Integer.valueOf(tf).intValue();

trunk/gsdl/src/phind/client/ResultItemPhrase.java

@@ -66 +66 @@
     body = b;
     suffix = s;
-    text = prefix + " " + body + " " + suffix;
+    text = (prefix + " " + body + " " + suffix).trim();
     }