Changeset 3794

Timestamp:

2003-03-05T13:53:10+13:00 (21 years ago)

Author:

mdewsnip

Message:

Equivalent term information is now stored in a separate class: MGEquivTermInfo.

Location:

trunk

Files:

• gsdl3/packages/mg/java/org/greenstone/mg/MGQueryResult.java (modified) (1 diff)
• gsdl3/packages/mg/java/org/greenstone/mg/MGTermInfo.java (modified) (3 diffs)
• gsdl3/src/packages/mg/java/org/greenstone/mg/MGQueryResult.java (modified) (1 diff)
• gsdl3/src/packages/mg/java/org/greenstone/mg/MGTermInfo.java (modified) (3 diffs)
• indexers/mg/java/org/greenstone/mg/MGQueryResult.java (modified) (1 diff)
• indexers/mg/java/org/greenstone/mg/MGTermInfo.java (modified) (3 diffs)

trunk/gsdl3/packages/mg/java/org/greenstone/mg/MGQueryResult.java

@@ -102 +102 @@
 
 
-    // public void addTerm(String term, int stem, long match, long freq)
-    public void addTerm(String term, String tag, int stem,
-            long match, long freq, String[] equivs)
+    public void addTerm(String term, int stem)
     {
     MGTermInfo ti = new MGTermInfo();
     ti.term_ = term;
-    ti.tag_ = tag;
     ti.stem_method_ = stem;
-    ti.match_docs_ = match;
-    ti.term_freq_ = freq;
-    if (equivs != null) {
-        for (int i = 0; i < equivs.length; i++) {
-        ti.equiv_terms_.add(equivs[i]);
+    terms_.add(ti);
+    System.out.println("(Java) Added term " + ti);
+    }
+
+
+    public void addEquivTerm(String term, String equivTerm,
+                 long match, long freq)
+    {
+    // Find the term to add the equivalent to
+    MGTermInfo ti = null;
+    for (int i = (terms_.size() - 1); i >= 0; i--) {
+        ti = (MGTermInfo) terms_.elementAt(i);
+        // Found
+        if (ti.term_ == term) {
+        break;
         }
     }
-    System.out.println("(Java) Added term " + ti);
 
-    terms_.add(ti);
+    if (ti == null) {
+        System.err.println("Internal error: No term exists to add to.\n");
+    }
+    else {
+        ti.addEquivTerm(equivTerm, match, freq);
+        System.out.println("(Java) Added equivalent term " + equivTerm + ", match: " + match + ", freq: " + freq);
+    }
     }
 

trunk/gsdl3/packages/mg/java/org/greenstone/mg/MGTermInfo.java

@@ -33 +33 @@
     public String term_ = null;
 
-    /** the tag - level or metadata - for which the query was done */
-    public String tag_ = null;
-
     /** the stem and casefold method used
     0 = none
@@ -42 +39 @@
     3 = casefold and stem */
     public int stem_method_ = 0;
-
-    /** the number of documents containing this term
-    (where document is defined by the tag data) */
-    public long match_docs_ = 0;
-
-    /** overall term freq - word level */
-    public long term_freq_ = 0;
 
     /** list of stemmed and casefolded equivalent terms - if stem_method_ is non-zero 
@@ -61 +51 @@
 
 
+    public void addEquivTerm(String equivTerm, long match, long freq)
+    {
+    equiv_terms_.add(new MGEquivTermInfo(equivTerm, match, freq));
+    }
+
+
     /** output the class as a string */
     public String toString()
     {
     String result = "\"" + term_ + "\"";
-    result += " tag(" + tag_ + ")";
     result += " stem(" + stem_method_ + ")";
-    result += " docs(" + match_docs_ + ")";
-    result += " freq(" + term_freq_ + ")";
-
     result += " equiv terms(";
     for (int i = 0; i < equiv_terms_.size(); i++) {
         if (i > 0) result += ", ";
-        result += (String) equiv_terms_.elementAt(i);
+        result += equiv_terms_.elementAt(i);
     }
     result += ")";
-
     return result;
     }

trunk/gsdl3/src/packages/mg/java/org/greenstone/mg/MGQueryResult.java

@@ -102 +102 @@
 
 
-    // public void addTerm(String term, int stem, long match, long freq)
-    public void addTerm(String term, String tag, int stem,
-            long match, long freq, String[] equivs)
+    public void addTerm(String term, int stem)
     {
     MGTermInfo ti = new MGTermInfo();
     ti.term_ = term;
-    ti.tag_ = tag;
     ti.stem_method_ = stem;
-    ti.match_docs_ = match;
-    ti.term_freq_ = freq;
-    if (equivs != null) {
-        for (int i = 0; i < equivs.length; i++) {
-        ti.equiv_terms_.add(equivs[i]);
+    terms_.add(ti);
+    System.out.println("(Java) Added term " + ti);
+    }
+
+
+    public void addEquivTerm(String term, String equivTerm,
+                 long match, long freq)
+    {
+    // Find the term to add the equivalent to
+    MGTermInfo ti = null;
+    for (int i = (terms_.size() - 1); i >= 0; i--) {
+        ti = (MGTermInfo) terms_.elementAt(i);
+        // Found
+        if (ti.term_ == term) {
+        break;
         }
     }
-    System.out.println("(Java) Added term " + ti);
 
-    terms_.add(ti);
+    if (ti == null) {
+        System.err.println("Internal error: No term exists to add to.\n");
+    }
+    else {
+        ti.addEquivTerm(equivTerm, match, freq);
+        System.out.println("(Java) Added equivalent term " + equivTerm + ", match: " + match + ", freq: " + freq);
+    }
     }
 

trunk/gsdl3/src/packages/mg/java/org/greenstone/mg/MGTermInfo.java

@@ -33 +33 @@
     public String term_ = null;
 
-    /** the tag - level or metadata - for which the query was done */
-    public String tag_ = null;
-
     /** the stem and casefold method used
     0 = none
@@ -42 +39 @@
     3 = casefold and stem */
     public int stem_method_ = 0;
-
-    /** the number of documents containing this term
-    (where document is defined by the tag data) */
-    public long match_docs_ = 0;
-
-    /** overall term freq - word level */
-    public long term_freq_ = 0;
 
     /** list of stemmed and casefolded equivalent terms - if stem_method_ is non-zero 
@@ -61 +51 @@
 
 
+    public void addEquivTerm(String equivTerm, long match, long freq)
+    {
+    equiv_terms_.add(new MGEquivTermInfo(equivTerm, match, freq));
+    }
+
+
     /** output the class as a string */
     public String toString()
     {
     String result = "\"" + term_ + "\"";
-    result += " tag(" + tag_ + ")";
     result += " stem(" + stem_method_ + ")";
-    result += " docs(" + match_docs_ + ")";
-    result += " freq(" + term_freq_ + ")";
-
     result += " equiv terms(";
     for (int i = 0; i < equiv_terms_.size(); i++) {
         if (i > 0) result += ", ";
-        result += (String) equiv_terms_.elementAt(i);
+        result += equiv_terms_.elementAt(i);
     }
     result += ")";
-
     return result;
     }

trunk/indexers/mg/java/org/greenstone/mg/MGQueryResult.java

@@ -102 +102 @@
 
 
-    // public void addTerm(String term, int stem, long match, long freq)
-    public void addTerm(String term, String tag, int stem,
-            long match, long freq, String[] equivs)
+    public void addTerm(String term, int stem)
     {
     MGTermInfo ti = new MGTermInfo();
     ti.term_ = term;
-    ti.tag_ = tag;
     ti.stem_method_ = stem;
-    ti.match_docs_ = match;
-    ti.term_freq_ = freq;
-    if (equivs != null) {
-        for (int i = 0; i < equivs.length; i++) {
-        ti.equiv_terms_.add(equivs[i]);
+    terms_.add(ti);
+    System.out.println("(Java) Added term " + ti);
+    }
+
+
+    public void addEquivTerm(String term, String equivTerm,
+                 long match, long freq)
+    {
+    // Find the term to add the equivalent to
+    MGTermInfo ti = null;
+    for (int i = (terms_.size() - 1); i >= 0; i--) {
+        ti = (MGTermInfo) terms_.elementAt(i);
+        // Found
+        if (ti.term_ == term) {
+        break;
         }
     }
-    System.out.println("(Java) Added term " + ti);
 
-    terms_.add(ti);
+    if (ti == null) {
+        System.err.println("Internal error: No term exists to add to.\n");
+    }
+    else {
+        ti.addEquivTerm(equivTerm, match, freq);
+        System.out.println("(Java) Added equivalent term " + equivTerm + ", match: " + match + ", freq: " + freq);
+    }
     }
 

trunk/indexers/mg/java/org/greenstone/mg/MGTermInfo.java

@@ -33 +33 @@
     public String term_ = null;
 
-    /** the tag - level or metadata - for which the query was done */
-    public String tag_ = null;
-
     /** the stem and casefold method used
     0 = none
@@ -42 +39 @@
     3 = casefold and stem */
     public int stem_method_ = 0;
-
-    /** the number of documents containing this term
-    (where document is defined by the tag data) */
-    public long match_docs_ = 0;
-
-    /** overall term freq - word level */
-    public long term_freq_ = 0;
 
     /** list of stemmed and casefolded equivalent terms - if stem_method_ is non-zero 
@@ -61 +51 @@
 
 
+    public void addEquivTerm(String equivTerm, long match, long freq)
+    {
+    equiv_terms_.add(new MGEquivTermInfo(equivTerm, match, freq));
+    }
+
+
     /** output the class as a string */
     public String toString()
     {
     String result = "\"" + term_ + "\"";
-    result += " tag(" + tag_ + ")";
     result += " stem(" + stem_method_ + ")";
-    result += " docs(" + match_docs_ + ")";
-    result += " freq(" + term_freq_ + ")";
-
     result += " equiv terms(";
     for (int i = 0; i < equiv_terms_.size(); i++) {
         if (i > 0) result += ", ";
-        result += (String) equiv_terms_.elementAt(i);
+        result += equiv_terms_.elementAt(i);
     }
     result += ")";
-
     return result;
     }