Changeset 4330

Timestamp:

2003-05-26T16:00:05+12:00 (21 years ago)

Author:

jmt12

Message:

Added a new comparator to sort metadata by standard order before alphabetic order - John

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -52 +52 @@
  * @version 2.3
  **************************************************************************************/
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.TreeSet;
-import java.util.Vector;
+import java.io.*;
+import java.util.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
 import org.greenstone.gatherer.mem.Attribute;
@@ -70 +61 @@
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+import org.w3c.dom.*;
 /** This class contains a plethora of methods associated with handling the content of <strong>MetadataSet</strong>s and the <strong>Element</strong>s within. For example this is where you will find methods for comparing various parts of two <strong>MetadataSet</strong>s for equality. It also has methods for extracting common and useful data from <strong>Element</strong>s such as the AssignedValue nodes.
  * @author John Thompson, Greenstone Digital Libraries
@@ -80 +67 @@
  */
 public class MSMUtils {
+     /** Used to order metadata according to set standard element order then alphabetically by value. */
+     static public MetadataComparator METADATA_COMPARATOR = new MetadataComparator();
      /** An element of the enumeration of type filter. */
      static public final int NONE = 0;
@@ -849 +838 @@
           return false;
      }
+
+     /** A comparator for sorting metadata element-value pairs into their standard order (elements) then alphabetical order (values). */
+     static final private class MetadataComparator
+          implements Comparator {
+          /** Compares its two arguments for order. */
+          public int compare(Object o1, Object o2) {
+                int result = 0;
+                Metadata m1 = (Metadata) o1;
+                Metadata m2 = (Metadata) o2;
+                ///ystem.err.println("MSMUtils.compare(" + m1 + ", " + m2 + ") = ");
+                ElementWrapper e1 = m1.getElement();
+                ElementWrapper e2 = m2.getElement();
+                // First we compare the namespaces
+                result = e1.getNamespace().compareTo(e2.getNamespace());
+                if(result == 0) {
+                     // Now, given both elements are in the same set, we compare the element ordering using methods in MetadataSet
+                     MetadataSet set = Gatherer.c_man.getCollection().msm.getSet(e1.getNamespace());
+                     ///ystem.err.print("MetadataSet.compare(" + e1 + ", " + e2 + ") = ");
+                     result = set.compare(e1.getElement(), e2.getElement());
+                     ///ystem.err.println(result);
+                     if(result == 0) {
+                          // Finally we compare the values alphabetically.
+                          result = m1.getValue().compareTo(m2.getValue());
+                     }
+                }
+                ///ystem.err.println("Result: " + result);
+                return result;
+          }
+          
+          /** Indicates whether some other object is "equal to" this Comparator. */
+          public boolean equals(Object obj) { 
+               return compare(this, obj) == 0;
+          }
+     }
 }