Changeset 4564 for trunk/gli

Timestamp:

2003-06-11T13:50:52+12:00 (21 years ago)

Author:

jmt12

Message:

2030118: Extended the MetadataComparator to allow it to correctly sort ElementWrapper lists. This is then used to sort the columns in the MetaAudit viewby the natural ordering.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (1 diff)

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

@@ -867 +867 @@
     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 && Gatherer.c_man != null && Gatherer.c_man.ready() && e1.getNamespace() != null) {
-        // 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().toLowerCase().compareTo(m2.getValue().toLowerCase());
-        }
-        }
-                ///ystem.err.println("Result: " + result);
+        ElementWrapper e1 = null;
+        ElementWrapper e2 = null;
+        String v1 = null;
+        String v2 = null;
+        if(o1 instanceof Metadata && o2 instanceof Metadata) {
+        Metadata m1 = (Metadata) o1;
+        Metadata m2 = (Metadata) o2;
+        ///ystem.err.println("MSMUtils.compare(" + m1 + ", " + m2 + ") = ");
+        e1 = m1.getElement();
+        e2 = m2.getElement();
+        v1 = m1.getValue().toLowerCase();
+        v2 = m2.getValue().toLowerCase();
+        }
+        else if(o1 instanceof ElementWrapper && o2 instanceof ElementWrapper) {
+        e1 = (ElementWrapper) o1;
+        e2 = (ElementWrapper) o2;
+        }
+        if(e1 != null && e2 != null) {
+        // First we compare the namespaces
+        result = e1.getNamespace().compareTo(e2.getNamespace());
+        if(result == 0 && Gatherer.c_man != null && Gatherer.c_man.ready() && e1.getNamespace() != null) {
+            // 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 && v1 != null && v2 != null) {
+            // Finally we compare the values alphabetically.
+            result = v1.compareTo(v2);
+            }
+        }
+        }
+        else {
+        result = o1.toString().compareTo(o2.toString());
+        }
+        ///ystem.err.println("Result: " + result);
         return result;
     }