Changeset 1635 for trunk/gsdl

Timestamp:

2000-10-31T12:19:50+13:00 (24 years ago)

Author:

paynter

Message:

Read phrases in prefix/body/suffix form for formatted display.

File:

• trunk/gsdl/src/phind/client/ResultBox.java (modified) (7 diffs)

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

@@ -67 +67 @@
     Panel label;
 
-  // The key identifying the phrase displayed, with its text and the
-  // collection from which it is drawn
-    String searchKey, searchPhrase;
-    String searchCollection;
+    // The key identifying the phrase displayed, with its text and the
+    // collection from which it is drawn
+    String searchKey, searchPhrase, searchCollection;
     
-  // The total frequency, expansion frequency, and document frequency
-  // of the phrase
-  int numberOfOccurances;
+    // The total frequency, expansion frequency, and document frequency
+    // of the phrase
+    int numberOfOccurances;
     int numberOfExpansions;
     int numberOfDocuments;
 
-  // The number of phrases and documents retrieved, and the number of
-  // times the user has requested more phrases or documents.
-  int documentsRetrieved;
-  int expansionsRetrieved;
+    // The number of phrases and documents retrieved, and the number of
+    // times the user has requested more phrases or documents.
+    int documentsRetrieved;
+    int expansionsRetrieved;
     int nextPhraseBlock;
     int nextDocumentBlock;
@@ -318 +317 @@
     // System.out.println( "addExpansionListTag: " + line);
 
-    String idStr = "", tfStr = "", efStr = "", dfStr = "";
+    String idStr = "", text = "", tfStr = "", efStr = "", dfStr = "";
     int tf = 0, ef = 0, df = 0;
 
@@ -351 +350 @@
         } 
 
+        // Read the text of the phrase
+        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("addExpansionListTag: error parsing: " + line);
+        }
+        } 
+
         // Read the expansion frequency
         else if (line.startsWith("ef")) {
@@ -390 +401 @@
     // Add the data to the ResultBox
     searchKey = idStr;
+    searchPhrase = text;
     numberOfOccurances = tf;
     numberOfExpansions = ef;
@@ -410 +422 @@
     // System.out.println( "addExpansionTag: " + line + " (" + expansionsRetrieved + ")");
 
-    String numStr = "", idStr = "", tfStr = "", dfStr = "", body = "";
+    String numStr = "", idStr = "", tfStr = "", dfStr = "", 
+        prefix = "", body = "", suffix = "";
+
+    body = searchPhrase;
 
     // Break the tag down into its component parts
@@ -442 +457 @@
         } 
 
+        // Read the prefix of the phrase
+        else if (line.startsWith("prefix")) {
+        line = line.substring(8);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            prefix = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+        }
+        } 
+
+        // Read the suffix of the phrase
+        else if (line.startsWith("suffix")) {
+        line = line.substring(8);
+        nextSplit = line.indexOf((int) '"');
+        if (nextSplit >= 1) {
+            suffix = line.substring(0, nextSplit);
+            line = line.substring(nextSplit + 1);
+        } else {
+            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+        }
+        } 
+
         // Read the text of the phrase
-        else if (line.startsWith("text")) {
-        line = line.substring(6);
-        nextSplit = line.indexOf((int) '"');
-        if (nextSplit >= 1) {
-            body = line.substring(0, nextSplit);
-            line = line.substring(nextSplit + 1);
-        } else {
-            System.err.println("ResultBox addExpansionTag: error parsing: " + line);
-        }
-        } 
+        //      else if (line.startsWith("text")) {
+        //line = line.substring(6);
+        //nextSplit = line.indexOf((int) '"');
+        //if (nextSplit >= 1) {
+        //    body = line.substring(0, nextSplit);
+        //    line = line.substring(nextSplit + 1);
+        //} else {
+        //    System.err.println("ResultBox addExpansionTag: error parsing: " + line);
+        //}
+        //} 
 
         // Read the frequency
@@ -490 +529 @@
     
     // Create a new ResultItem and add it to the display
-    ResultItem ri = new ResultItem(idStr, tfStr, dfStr, "", body, "");
+    ResultItem ri = new ResultItem(idStr, tfStr, dfStr, prefix, body, suffix);
     
     if (c.addResultItem(ri)) {