Changeset 1827

Timestamp:

2001-01-11T10:04:04+13:00 (23 years ago)

Author:

paynter

Message:

New version of the java client that handles thesaurus link data
and uses the new cgi arguments to phindcgi.

Location:

trunk/gsdl/src/phind/client

Files:

• Phind.java (modified) (8 diffs)
• ResultBox.java (modified) (21 diffs)
• ResultCanvas.java (modified) (14 diffs)
• ResultItem.java (modified) (3 diffs)
• ResultItemDocument.java (added)
• ResultItemLink.java (added)
• ResultItemPhrase.java (added)
• ResultTitle.java (modified) (2 diffs)

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

@@ -455 +455 @@
     //   3 = get another N phrases into same window
     //   4 = get another N documents into same window
+    //   5 = get another N thesaurus links into same window
 
     ResultBox lookupPhraseOnServer(ResultBox source, 
@@ -465 +466 @@
     if (queryMode <= 2) {
         r = new ResultBox(this, collection, key, phrase, source);
-    } else if ((queryMode == 3) || (queryMode == 4)) {
+    } else if ((queryMode == 3) || (queryMode == 4) || (queryMode == 5)) {
         r = source;
     }
@@ -512 +513 @@
     int first_d = 0;
     int last_d = 0;
+    int first_l = 0;
+    int last_l = 0;
 
     // the initial query
@@ -517 +520 @@
       last_e = phraseBlockSize;
       last_d = phraseBlockSize;
-    }
- 
+      last_l = phraseBlockSize;
+    }
+
     // add phrases to an existing result set
     else if (queryMode == 3) {
@@ -533 +537 @@
     }
 
-    query = query + "&f=" + first_d + "&d=" + last_d 
-                  + "&g=" + first_e + "&e=" + last_e;
+    // add thesaurus links to existing result set
+    else if (queryMode == 5) {
+      first_l = area.nextThesaurusLinkBlock * phraseBlockSize;
+      area.nextThesaurusLinkBlock++;
+      last_l = area.nextThesaurusLinkBlock * phraseBlockSize;
+    }
+
+    query = query + "&e=" + first_e + "&f=" + last_e
+                      + "&h=" + first_d + "&i=" + last_d
+                      + "&k=" + first_l + "&l=" + last_l;
 
     // Send the query to the phindcgi program 
@@ -658 +670 @@
     String tidy_URL(String address, boolean isCGI) {
 
-    System.out.println("tidy URL: " + address);
+    // System.out.println("tidy URL: " + address);
     
     // make sure the URL has protocol, host, and file
@@ -677 +689 @@
     }
 
-    // if the URL is a cgi script, make sure it has a "?" 
+    // if the URL is a cgi script, make sure it has a "?" in ti,
+    // and that it ends with a "?" or "&"
     if (isCGI) {
         if (address.indexOf((int) '?') == -1) { 
@@ -686 +699 @@
     }
 
-
-    System.out.println("tidy URL returning: " + address);
     return address;
     }

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

@@ -76 +76 @@
     int numberOfExpansions;
     int numberOfDocuments;
+    int numberOfThesaurusLinks;
 
     // The number of phrases and documents retrieved, and the number of
     // times the user has requested more phrases or documents.
+    int expansionsRetrieved;
     int documentsRetrieved;
-    int expansionsRetrieved;
+    int thesaurusLinksRetrieved;
     int nextPhraseBlock;
     int nextDocumentBlock;
+    int nextThesaurusLinkBlock;
     
-    // just why did i add these variables?
     int mode;
     final int initMode = 0;
@@ -115 +117 @@
     numberOfExpansions = -1;
     numberOfDocuments = -1;
+    numberOfThesaurusLinks = -1;
 
     expansionsRetrieved = 0;
     documentsRetrieved = 0;
+    thesaurusLinksRetrieved = 0;
+
     nextPhraseBlock = 1;
     nextDocumentBlock = 1;
+    nextThesaurusLinkBlock = 1;
 
 
@@ -140 +146 @@
 
     static String describeContents(String phrase, String c) {
-    return( "\"" +phrase + "\" in " + c + ".");
+    return( "\"" + phrase + "\" in " + c + ".");
     }
 
@@ -157 +163 @@
     
     numberOfExpansions = -1;
+    numberOfDocuments = -1;
+    numberOfThesaurusLinks = -1;
+
     expansionsRetrieved = 0;
-    numberOfDocuments = -1;
     documentsRetrieved = 0;
+    thesaurusLinksRetrieved = 0;
     }
 
@@ -230 +239 @@
 
     if (finished) {
-        c.updateMorePhrasesMarker();
-        c.updateMoreDocumentsMarker();
+        c.updateMarkers();
     } else {
         // We haven't finished, give some feedback about progress
@@ -273 +281 @@
     }
  
+    // The <thesaurus> tag
+    else if (buffer.startsWith("<thesaurus ")) {
+        item = buffer.substring(0, eol);
+        buffer = buffer.substring(eol + 1);
+        addThesaurusTag(item);
+        return true;
+    }
+ 
     // The <phinddata> tag introduces the dataset
     else if (buffer.startsWith("<phinddata ")) {
@@ -287 +303 @@
     }
     
-    // The <expansionlist> tag
-    else if (buffer.startsWith("<expansionlist ")) {
-
-    }
- 
-    // The <documentlist> tag
-    else if (buffer.startsWith("<documentlist ")) {
-
-    }
-
     // The <phinderror> tag contains an error message
     else if (buffer.startsWith("<phinderror")) {
@@ -307 +313 @@
     // Ignore the piece we've read
     item = buffer.substring(0, eol);
+    // System.out.println("discarding: " + item);
     buffer = buffer.substring(eol + 1);
     return true;
@@ -325 +332 @@
     // System.out.println( "addExpansionListTag: " + line);
 
-    String idStr = "", text = "", tfStr = "", efStr = "", dfStr = "";
-    int tf = 0, ef = 0, df = 0;
+    String idStr = "", text = "", tfStr = "", efStr = "", dfStr = "", lfStr = "";
+    int tf = 0, ef = 0, df = 0, lf = 0;
 
     // Break the tag down into its component parts
@@ -390 +397 @@
             dfStr = line.substring(0, nextSplit);
             df = Integer.valueOf(dfStr).intValue();
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("addExpansionListTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the thesaurus link frequency
+        else if (line.startsWith("lf")) {
+        line = line.substring(4);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            lfStr = line.substring(0, nextSplit);
+            lf = Integer.valueOf(lfStr).intValue();
             line = line.substring(nextSplit + 1);
         } else {
@@ -413 +433 @@
     numberOfExpansions = ef;
     numberOfDocuments = df;
+    numberOfThesaurusLinks = lf;
     return true;
     }
@@ -422 +443 @@
     //   <expansion num="3" id="8421" prefix="PEOPLE and" suffix="" tf="3" df="3"/>
     //   <expansion num="4" id="8696" prefix="" suffix="products" tf="3" df="3"/>
-    // Create a new ResultItem for display
+    // Create a new ResultItemPhrase for display
     //
     // Return true if successful, otherwise false.
@@ -525 +546 @@
     
     // Create a new ResultItem and add it to the display
-    ResultItem ri = new ResultItem(idStr, tfStr, dfStr, prefix, body, suffix);
+    ResultItemPhrase ri = new ResultItemPhrase(idStr, tfStr, dfStr, prefix, body, suffix);
     
     if (c.addResultItem(ri)) {
@@ -542 +563 @@
     //   <document num="3" hash="HASH01f08efd8752ad54ca0a99cf" freq="1" title="Tree mixtures"/>
     //
-    // Create a new ResultItem for display
+    // Create a new ResultItemDocument for display
     //
     // Return true if successful, otherwise false.
@@ -549 +570 @@
 
     // System.out.println( "addDocumentTag: " + line + " (" + documentsRetrieved + ")");
-
+    
     String num = "", hash = "", freq = "", title = "";
     line = line.substring(9);
-
+    
     // Break the tag down into its component parts
     int nextSplit;
@@ -566 +587 @@
             line = line.substring(nextSplit + 1);
         } else {
-            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+            System.err.println("ResultBox addDocumentTag: error parsing: " + line);
         }
         } 
@@ -578 +599 @@
             line = line.substring(nextSplit + 1);
         } else {
-            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+            System.err.println("ResultBox addDocumentTag: error parsing: " + line);
         }
         } 
@@ -590 +611 @@
             line = line.substring(nextSplit + 1);
         } else {
-            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+            System.err.println("ResultBox addDocumentTag: error parsing: " + line);
         }
         } 
@@ -602 +623 @@
             line = line.substring(nextSplit + 1);
         } else {
-            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+            System.err.println("ResultBox addDocumentTag: error parsing: " + line);
         }
         } 
@@ -618 +639 @@
     
     // Create a new ResultItem and add it to the display
-    ResultItem ri = new ResultItem(hash, title, freq);
-
+    ResultItemDocument ri = new ResultItemDocument(hash, title, freq);
+    
     if (c.addResultItem(ri)) {
         documentsRetrieved++;
@@ -627 +648 @@
     return false;
     }
+
+
+    // Add a thesaurus tag
+    //
+    // Given a string containing an XML document tag of the form:
+    //
+    // <thesaurus num="3" id="36506" tf="0" df="0" type="RT" text="ANGLOPHONE AFRICA"/>
+    // <thesaurus num="4" id="28724" tf="0" df="0" type="RT" text="FRANCOPHONE AFRICA"/>
+    //
+    // Create a new ResultItemLink for display
+    //
+    // Return true if successful, otherwise false.
+
+    boolean addThesaurusTag( String line ) {
+    
+    // System.out.println( "addThesaurusTag: " + line + " (" + thesaurusLinksRetrieved + ")");
+
+    String num = "", id = "", tf = "", df = "", type = "", text = "";
+    line = line.substring(10);
+
+    // Break the tag down into its component parts
+    int nextSplit;
+        while (line.length() > 0) {
+        line = line.trim();
+
+        // Read the expansion number
+        if (line.startsWith("num")) {
+        line = line.substring(5);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            num = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addThesaurusTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the phrase ID
+        else if (line.startsWith("id")) {
+        line = line.substring(4);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            id = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addThesaurusTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the phrase link type
+        else if (line.startsWith("type")) {
+        line = line.substring(6);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            type = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addThesaurusTag: error parsing: " + line);
+        }
+        } 
+
+
+        // Read the phrase text
+        else if (line.startsWith("text")) {
+        line = line.substring(6);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            text = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addThesaurusTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the frequency
+        else if (line.startsWith("tf")) {
+        line = line.substring(4);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            tf = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the document frequency
+        else if (line.startsWith("df")) {
+        line = line.substring(4);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            df = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+        }
+        } 
+
+
+        // Read some other tag or close the string off
+        else {
+        nextSplit = line.indexOf((int) ' ');
+        if (nextSplit >= 1) {
+            line = line.substring(nextSplit + 1);
+        } else {
+            line = "";
+        }
+        }
+    }
+    
+    // Create a new ResultItem and add it to the display
+    ResultItemLink ri = new ResultItemLink(id, text, type, tf, df);
+
+    if (c.addResultItem(ri)) {
+        thesaurusLinksRetrieved++;
+        return true;
+    }
+    
+    return false;
+    }
 }
 

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

@@ -31 +31 @@
 
 The results of a query are displayed on a ResultCanvas object.  Each 
-line of the result is stored in a ResultItem, and the ResultCanvas 
+entry in the result list is stored in a ResultItem, and the ResultCanvas 
 contains a Vector of ResultItems.
 
@@ -108 +108 @@
 
 
-    // add a new item of input.
-    // return true if successful, otherwise false.
+    // Add a new search result.
+    // Return true if successful, otherwise false.
     boolean addResultItem( ResultItem item ) {
  
@@ -120 +120 @@
            ((item.kind > ((ResultItem) phrases.elementAt(index)).kind) ||
         ((item.kind == ((ResultItem) phrases.elementAt(index)).kind) &&
-         (item.freq <= ((ResultItem) phrases.elementAt(index)).freq)))) {
+         (item.frequency <= ((ResultItem) phrases.elementAt(index)).frequency)))) {
         index++;
     }
@@ -128 +128 @@
     }
 
+
+    // Update more phrases/documents/links markers
+    void updateMarkers() {
+    updateMorePhrasesMarker();
+    updateMoreDocumentsMarker();
+    updateMoreLinksMarker();
+    }
 
     // Make sure the more Phrases item only appears in the list
@@ -140 +147 @@
     while (!found && (index < numberOfPhrases)) {
         if (((ResultItem) phrases.elementAt(index)).isMorePhrases()) {
-        // System.out.println("found marker at: " + index + " of " + numberOfPhrases);
         found = true;
         } else {
@@ -149 +155 @@
     if (parent.expansionsRetrieved == parent.numberOfExpansions) {
         // there should be no marker
-        // System.out.println("No marker needed");
         if (found) {
-        // System.out.println("Remove marker");
         phrases.removeElementAt(index);
         numberOfPhrases--;
@@ -157 +161 @@
 
     } else if (parent.expansionsRetrieved < parent.numberOfExpansions) {
-        // there should be a marker
-        // System.out.println("Needs marker");
-
         if (!found) {
-        // System.out.println("Add marker");
-        ResultItem ri = new ResultItem(ResultItem.morePhrases, parent.searchKey);
+        ResultItem ri = new ResultItem(ResultItem.morePhrases);
         addResultItem(ri);
         }
@@ -195 +195 @@
         // there should be a marker
         if (!found) {
-        ResultItem ri = new ResultItem(ResultItem.moreDocuments, parent.searchKey);
+        ResultItem ri = new ResultItem(ResultItem.moreDocuments);
+        addResultItem(ri);
+        }
+    }
+    }
+
+      
+    // Make sure the more links marker appears when required
+    void updateMoreLinksMarker() {
+    
+    System.out.println("updateMoreLinksMarker() ");
+    System.out.println("retreived: " + parent.thesaurusLinksRetrieved);
+    System.out.println("total: " + parent.numberOfThesaurusLinks);
+
+    // look for a marker
+    boolean found = false;
+    int index = 0;
+    while (!found && (index < numberOfPhrases)) {
+        if (((ResultItem) phrases.elementAt(index)).isMoreLinks()) {
+        found = true;
+        } else {
+        index++;
+        }
+    }
+
+    if (parent.thesaurusLinksRetrieved == parent.numberOfThesaurusLinks) {
+        // there should be no marker
+        if (found) {
+        phrases.removeElementAt(index);
+        numberOfPhrases--;
+        }
+
+    } else if (parent.thesaurusLinksRetrieved < parent.numberOfThesaurusLinks) {
+        // there should be a marker
+        if (!found) {
+        ResultItem ri = new ResultItem(ResultItem.moreLinks);
         addResultItem(ri);
         }
@@ -270 +305 @@
         + ((rightMargin - leftMargin 
         - g.getFontMetrics().stringWidth(parent.searchPhrase)) / 2);
+
+    String body, prefix, suffix;
     
     for (i = scrollValue; 
@@ -290 +327 @@
         // Draw the item
 
+        // Draw a phrase item
         if (result.isPhrase()) {
-        // The item is a Phrase
-        tab = center - g.getFontMetrics().stringWidth(result.prefix) - space;
-        g.drawString(result.prefix, tab, y);
+        prefix = result.prefixText();
+        body = result.mainText();
+        suffix = result.suffixText();
+        
+        g.setColor(Color.black);
+        g.setFont(areaPlain);
+        tab = center - g.getFontMetrics().stringWidth(prefix) - space;
+        g.drawString(prefix, tab, y);
+        
         g.setFont(areaBold);
-        g.drawString(result.body, center, y);
-        tab = center + space + g.getFontMetrics().stringWidth(result.body);
+        g.drawString(body, center, y);
+        tab = center + space + g.getFontMetrics().stringWidth(body);
+        
         g.setFont(areaPlain);
-        g.drawString(result.suffix, tab, y);
+        g.drawString(suffix, tab, y);
     
-        } else if (result.isDocument()){
-        // The item is a URL
+        } 
+
+        // Draw a document item
+        else if (result.isDocument()){
+        body = result.mainText();
+
         g.setFont(areaPlain);
         g.setColor(Color.blue);
-        tab = (rightMargin - g.getFontMetrics().stringWidth(result.body)) / 2;
-        g.drawString(result.body, tab, y);
+        tab = (rightMargin - g.getFontMetrics().stringWidth(body)) / 2;
+        g.drawString(body, tab, y);
+      
+        } 
+    
+        // Draw a thesaurus link item
+        else if (result.isLink()){
+        prefix = result.prefixText() + ":";
+        body = result.mainText();
+
+        g.setFont(areaPlain);
+        g.setColor(new Color(0, 100, 0));
+        tab = center - g.getFontMetrics().stringWidth(prefix) - space;
+        // tab = margin + margin - g.getFontMetrics().stringWidth(prefix);
+        g.drawString(prefix, tab, y);
+
+        g.setFont(areaBold);
+        g.drawString(body, center, y);
+      
+        } 
+        
+        // Draw a "more phrases/documents/links" marker
+        else if (result.isMorePhrases() 
+             || result.isMoreDocuments() 
+             || result.isMoreLinks()){
+        body = result.mainText();
+        
+        if (result.isMorePhrases()) {
+            g.setColor(new Color(255, 200, 200));
+        } else {
+            g.setColor(new Color(150, 193, 156));
+        }
+        g.fillRect(leftMargin, y-lineSpacing+2, rightMargin, lineSpacing);
+
         g.setColor(Color.black);
-      
-        } else if (result.isMorePhrases()){
-        // The item is a More documents marker
-        g.setColor(new Color(255, 200, 200));
-        g.fillRect(leftMargin, y-lineSpacing+2, rightMargin, lineSpacing);
-        g.setColor(Color.black);
-
         g.setFont(areaPlain);
-        tab = (rightMargin - g.getFontMetrics().stringWidth("Get more phrases")) / 2;
-        g.drawString("Get more phrases", tab, y);
-
-        } else if (result.isMoreDocuments()){
-        // The item is a More documents marker
-        g.setColor(new Color(150, 193, 156));
-        g.fillRect(leftMargin, y-lineSpacing+2, rightMargin, lineSpacing);
-        g.setColor(Color.black);
-
-        g.setFont(areaPlain);
-        tab = (rightMargin - g.getFontMetrics().stringWidth("Get more documents")) / 2;
-        g.drawString("Get more documents", tab, y);
-
-        }
-
+        tab = (rightMargin - g.getFontMetrics().stringWidth(body)) / 2;
+        g.drawString(body, tab, y);
+        } 
     }
 
@@ -355 +417 @@
 
         // Write the document frequency
-        if ((result.documents > 1) || result.isPhrase()) {
-        g.drawString(" " + Integer.toString(result.documents), firstColumn, y);
+        if (result.docsText().length() > 0) {
+        g.drawString(" " + result.docsText(), firstColumn, y);
         }
 
         // Write the term frequency
-        if (result.freq > 0) {
-        g.drawString(" " + Integer.toString(result.freq), secondColumn, y);
+        if (result.freqText().length() > 0) {
+        g.drawString(" " + result.freqText(), secondColumn, y);
         }
     }
@@ -407 +469 @@
         ResultItem item = (ResultItem) phrases.elementAt(itemSelected);
 
-        // System.out.println("Select: " + String.valueOf(rowSelected) );
         if (itemSelected <= numberOfPhrases) {
     
-        // What do we do with the event?
-        // If user clicks on a phrase, we expand the phrase
-        // or send the phrase to a search engine (right click)
-
+        //User clicks on a phrase
         if (item.isPhrase()) {
-            // Expand the phrase
 
             phraseSelected = itemSelected;
             update(getGraphics());
       
-            parent.lookupPhrase(item.rule, item.toString(), 2);
-
+            parent.lookupPhrase(item.hiddenText(), item.toString(), 2);
+
+            // If meta key is held down, send query to search engine
             if (event.metaDown()) { 
-            // Also send to search engine
             if (phind.search_url.equals("none") || phind.search_url.equals("")) {
                 System.out.println("No searching in this collection");
@@ -435 +492 @@
                 System.out.println("URL error: " + e.toString());
                 }
-            } 
+            }
             }
 
-        } else if (item.isDocument()) {
-            // The user clicks on a URL; display it.
+        } 
+
+        // Click on a thesaurus link
+        else if (item.isLink()) {
+            phraseSelected = itemSelected;
+            update(getGraphics());
+            parent.lookupPhrase(item.hiddenText(), item.toString(), 2);
+        } 
+
+        // The user clicks on a URL; display it.
+        else if (item.isDocument()) {
             phraseSelected = itemSelected;
             update(getGraphics());
@@ -447 +513 @@
             String address = phind.library_address 
                 + "a=d&c=" + phind.collection 
-                + "&d=" + item.rule
+                + "&d=" + item.hiddenText()
                 + "&q=" + parent.searchPhrase.replace(' ', '+');
             url = new URL(address);
             System.out.println("URL selected: " + url.toString());
-            phind.getAppletContext().showDocument(url);
+            phind.getAppletContext().showDocument(url, "phinddoc");
             } catch (Exception e) {
             System.out.println("URL error: " + e.toString());
             }
-
-        } else if (item.isMorePhrases()){
-            // The user clicks on a "get more phrases" marker.
-            // We have to send a new query to the host
+        }
+         
+        // When the user clicks on "get more phrases" or other marker,
+        // we have to send a new query to the host
+        else if (item.isMorePhrases()){
             parent.lookupPhrase(parent.searchKey, parent.searchPhrase, 3);
-
         } else if (item.isMoreDocuments()){
             parent.lookupPhrase(parent.searchKey, parent.searchPhrase, 4);
+        } else if (item.isMoreLinks()){
+            parent.lookupPhrase(parent.searchKey, parent.searchPhrase, 5);
 
 

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

@@ -1 +1 @@
 /**********************************************************************
  *
- * ResultBox.java -- a list of phrases in the Phind java interface
+ * ResultItemDocument.java -- a result in the Phind applet
  *
- * Copyright 1997-2000 Gordon W. Paynter
+ * Copyright 2000 Gordon W. Paynter
  * Copyright 2000 The New Zealand Digital Library Project
  *
@@ -30 +30 @@
 This class is used in the Phind java applet (Phind.java).
 
-A result item object holds the data describing a single line returned from
-a query to the server.  It therefore contains either information describing
-a phrase or a URL.
+A result item holds the data describing a single line returned from a phind
+query.  The complex functionality of phrase and URL items is implemented in
+subclasses; the base class handles simpler cases like the "get more phrases" 
+marker.
 
 **********************************************************************/
@@ -39 +40 @@
 public class ResultItem {
 
-    // There are four kinds of item
-    //   1. a phrase
-    //   2. a document (or URL)
-    //   3. a "get more phrases" marker
+    // There are several kinds of ResultItem
+    //   1. a phrase (expansion)
+    //   2. a "get more phrases" marker
+    //   3. a document (or URL)
     //   4. a "get more documents" marker
-    // These should possibly be written as subclasses of a ResultItem
-    // superclass, but I cannot be bothered rewriting it for now.
+    //   5. a thesaurus link
+    //   6. a "get more thesaurus links" marker
 
-    final static int phraseItem = 1;
-    final static int morePhrases = 2;
-    final static int documentItem = 3;
-    final static int moreDocuments = 4;
+    final static int linkItem = 1;
+    final static int moreLinks = 2;
+    final static int phraseItem = 3;
+    final static int morePhrases = 4;
+    final static int documentItem = 5;
+    final static int moreDocuments = 6;
+    final static int unknownResultItem = 9;
 
-    // What kind is this item:
-    int kind;
+    // A text string describing the item
+    String text = "Generic ResultItem";
 
-    // The "rule" is the unique identifier of this item.  For a phrase,
-    // this is its "phrase number", and is also stored as a number in
-    // symbol.  For a document it is the document's OID (hash) value.
-    String rule;
-    int symbol;
+    // The kind of the item
+    int kind = unknownResultItem;
 
-    // The term frequency of the item
-    int freq;
-
-    // The document frequency of the item
-    int documents;
-
-    // Can this item be expanded?  ---- obsolete?
-    int expansion;
-
-    // When the item is a phrase, the text of the item is split into a
-    // prefix, body, and suffix.  The body is the search term and the
-    // prefix and suffix the surrounding text in the new phrase.
-    // When the item is a document, its title is stored in the body.
-    String prefix;
-    String body;
-    String suffix;
+    // The frequency of the item
+    int frequency = 0;
 
 
-    // Create a ResultItem for a phrase
-    ResultItem(String r, String f, String d, 
-           String p, String b, String s) {
-
-    kind = phraseItem;
-    rule = r;
-    symbol = Integer.valueOf(rule).intValue();
-
-    freq = Integer.valueOf(f).intValue();
-    documents = Integer.valueOf(d).intValue();
-    expansion = 0;
-
-    prefix = p;
-    body = b;
-    suffix = s;
-
+    // Create a blank ResultItem
+    ResultItem() {
+    text = "Unknown result type";
+    kind = unknownResultItem;
+    frequency = 0;
     }
 
+    // Create a new ResultItem of some given kind
+    ResultItem(int newKind) {
+    kind = newKind;
+    frequency = 0;
 
-    // Create a ResultItem for a document
-    ResultItem(String hash, String title, String df) {
-    
-    kind = documentItem;
-    rule = hash;
-    body = title;
-    documents = Integer.valueOf(df).intValue();
-    
-    // not needed for a document
-    symbol = 0;
-    freq = 0;
-    expansion = 0;
-    prefix = "";
-    suffix = "";
+    if (kind == moreLinks) {
+        text = "get more thesaurus links";
+    } else if (kind == morePhrases) {
+        text = "get more phrases";
+    } else if (kind == moreDocuments) {
+        text = "get more documents";
+    } else {
+        text = "Unknown result type";
+    }
     }
 
+    // Test the type of a ResultItem
+    public boolean isLink() { return false; }
+    public boolean isMoreLinks() { return (kind == moreLinks); }
+    public boolean isPhrase() { return false; }
+    public boolean isMorePhrases() { return (kind == morePhrases); }
+    public boolean isDocument() { return false; }
+    public boolean isMoreDocuments() { return (kind == moreDocuments); }
 
-    // Create an empty ResultItem of a given kind
-    ResultItem(int k, String r) {
+    // Return the bare text of the item
+    public String toString() { return(text); }
 
-    kind = k;
-
-    rule = r;
-    symbol = -1;
-
-    freq = 0;
-    expansion = 0;
-    documents = 0;
-
-    prefix = "";
-    body = "";
-    suffix = "";
-    }
-
-    // Return the full phrase described by the item.
-    public String toString() {
-    String result = "";
-    if (!prefix.equals("")) result = prefix.replace(' ', '+') + "+";
-    result += body.replace(' ', '+');
-    if (!suffix.equals("")) result += "+" + suffix.replace(' ', '+');
-    return(result.trim());
-    }
-
-    // Is the item a phrase?
-    public boolean isPhrase() {
-    return (kind == phraseItem);
-    }
-
-    // Is the item a document?
-    public boolean isDocument() {
-    return (kind == documentItem);
-    }
-
-    public boolean isMorePhrases() {
-    return (kind == morePhrases);
-    }
-
-    public boolean isMoreDocuments() {
-    return (kind == moreDocuments);
-    }
-
-
+    // Return the text of the item components
+    public String mainText() { return text; }
+    public String freqText() { return Integer.toString(frequency); }
+    public String docsText() { return ""; }
+    public String prefixText() { return ""; }
+    public String suffixText() { return ""; }
+    public String hiddenText() { return ""; }
 }
 
-

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

@@ -103 +103 @@
  
     // Construct the description phrase
+    String links = "";
+    if (parent.numberOfThesaurusLinks <= 0) {
+    links = "";
+    } else if (parent.numberOfThesaurusLinks == 1) { 
+    links = "1 link";
+    } else if (parent.thesaurusLinksRetrieved == parent.numberOfThesaurusLinks) {
+    links = parent.numberOfThesaurusLinks + " links";
+    } else {
+    links = parent.thesaurusLinksRetrieved + " of " 
+        + parent.numberOfThesaurusLinks + " links";
+    }
+
     String expansions = "";
     if (parent.numberOfExpansions <= 0) {
-      expansions = "no phrases";
+    expansions = "no phrases";
     } else if (parent.numberOfExpansions == 1) { 
-      expansions = "1 phrase";
+    expansions = "1 phrase";
     } else if (parent.expansionsRetrieved == parent.numberOfExpansions) {
-      expansions = parent.numberOfExpansions + " phrases";
+    expansions = parent.numberOfExpansions + " phrases";
     } else {
-      expansions = "first " + parent.expansionsRetrieved + " of " + parent.numberOfExpansions + " phrases";
+    expansions = parent.expansionsRetrieved + " of " 
+        + parent.numberOfExpansions + " phrases";
     }
 
     String documents = "";
     if (parent.numberOfDocuments <= 0) { 
-      documents = "no documents";
+    documents = "no documents";
     } else if (parent.documentsRetrieved == 1) {
-      documents = "1 document";
+    documents = "1 document";
     } else if (parent.documentsRetrieved == parent.numberOfDocuments) {
-      documents = parent.numberOfDocuments + " documents";
+    documents = parent.numberOfDocuments + " documents";
     } else {
-      documents = "first " + parent.documentsRetrieved + " of " + parent.numberOfDocuments + " documents";
+    documents = parent.documentsRetrieved + " of " 
+        + parent.numberOfDocuments + " documents";
     }
+
+    String status = "(";
+    if (parent.numberOfThesaurusLinks > 0) {
+    status = status + links + ", ";
+    } 
+    status = status + links + expansions + ", " + documents + ")";
+
 
     // Draw the text 
@@ -131 +152 @@
 
     g.setFont(plain);
-    String status = "(" + expansions + ", " + documents + ")";
     g.drawString(status, tab, y);
     tab = tab + g.getFontMetrics().stringWidth(status);