Changeset 2320 for trunk/java-client/org

Timestamp:

2001-04-15T11:33:18+12:00 (23 years ago)

Author:

daven

Message:

correct a bug in the term frequency code from yesterday that lost
some items. Added comments.

Location:

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

Files:

• NzdlCollectionInfo.java (modified) (2 diffs)
• NzdlResultSet.java (modified) (3 diffs)

trunk/java-client/org/nzdl/gsdl/service/NzdlCollectionInfo.java

@@ -59 +59 @@
     for (int i=0;i< m_Info.collectionMeta.names.length; i++) {
         metaMap.put( NzdlCorbaFactory.toString(m_Info.collectionMeta.names[i]), NzdlCorbaFactory.toString(m_Info.collectionMeta.values[i]));
-        // System.err.println(NzdlCorbaFactory.toString(namesArray[i]) + " " + NzdlCorbaFactory.toString(valuesArray[i]));
+        //System.err.println(NzdlCorbaFactory.toString(m_Info.collectionMeta.values[i]));
     }
 
@@ -220 +220 @@
     }
 
+    /* this is currently leaving \n in the text whereas the 
+       version using nzdlService.getMetaData doesn't,
+       try the tcc description text to see an example,
+       something to do with the use of CorbaFactory method 
+       in the constructor is not quite right - Stuart will 
+       know what is wrong   -  Dave */
+
     public String getCollectionDescription() {
     return (String) metaMap.get(NzdlConstants.COLLECTION_DESCRIPTION);

trunk/java-client/org/nzdl/gsdl/service/NzdlResultSet.java

@@ -34 +34 @@
 import java.util.Iterator;
 import java.util.Comparator;
+import java.util.*;
 
 /**
@@ -42 +43 @@
  * @author Aziz Mahoui    ([email protected])
  * @author Gordon Paynter ([email protected])
+ * @author Dave Nichols   ([email protected])
  * @author Brett Sheeran ([email protected]) (comments)
  */
@@ -71 +73 @@
   }
 
-  public String getTermFrequencyString() {
-      return constructTermFrequencyString(null);
-  }
-
     /* 
      * display term frequency results in descending frequency order 
+     * for alternative sorting orders alter the compareTo method
      */
 
-    public String getOrderedTermFrequencyString() {
-     class DescendingOrder implements Comparator {
-        public int compare(Object o1, Object o2) {
-        return -((Comparable)o1).compareTo(o2);
+    public String getTermFrequencyString() {
+  
+    class TermFrequency implements Comparable {
+        String term; long frequency;
+        TermFrequency( String _term, Long _frequency) {
+        term = _term; frequency = _frequency.longValue(); 
+        }
+        public int compareTo (Object o1) {
+        TermFrequency test = (TermFrequency) o1;
+        if (frequency == test.frequency) return 0;
+        if (frequency < test.frequency) 
+            return -1;
+        else
+            return 1;
         }
     }
-    return constructTermFrequencyString(new DescendingOrder());
-    }
-
-
-    private String constructTermFrequencyString(Comparator comparator) {
-
-    TreeMap freqOrder = new TreeMap(comparator);
+
+    ArrayList freqList = new ArrayList();
     Iterator iter = m_frequencies.entrySet().iterator();
     while (iter.hasNext()) {
         Map.Entry mapEntry = (Map.Entry) iter.next();
-        freqOrder.put( mapEntry.getValue(), mapEntry.getKey());
+        freqList.add( new TermFrequency((String)mapEntry.getKey(), (Long)(mapEntry.getValue())));
     }
-
+    Collections.sort(freqList, Collections.reverseOrder());
     StringBuffer buf = new StringBuffer();
-    iter = freqOrder.keySet().iterator();
+    iter = freqList.iterator();
     while(iter.hasNext()) {
-        Object next = iter.next();
-        System.err.println("" + next);
-        buf.append(freqOrder.get(next)).append(':').append(next).append(' ').append(' ');
+        TermFrequency next = (TermFrequency) iter.next();
+        buf.append(next.term).append(':').append(next.frequency).append(' ').append(' ');
     }
     return buf.toString();
     }
-
+  
   /**
    * Adds a {@link NzdlQueryHit NzdlQueryHit} to a result set.