Changeset 8652 for trunk/gli/src/org/greenstone/gatherer/gems

Timestamp:

2004-11-24T15:00:44+13:00 (20 years ago)

Author:

mdewsnip

Message:

Removed more dead code, and moved most of the XML stuff out of Utility and into XMLTools.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• GValueModel.java (modified) (2 diffs)
• MetadataSet.java (modified) (5 diffs)
• MetadataSetManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GValueModel.java

@@ -149 +149 @@
     ///ystem.err.println("Retrieve the value for: " + index_str);
     GValueNode result = null;
-    if(isHierarchy() && Utility.isIndex(index_str)) {
+    if(isHierarchy() && isIndex(index_str)) {
         // StringTokenize the index
         StringTokenizer tokenizer = new StringTokenizer(index_str, ".");
@@ -180 +180 @@
     }
 
+
+    /** A string is a valid hierarchy index if it matches '[0-9](\.[0-9])*' */
+    public boolean isIndex(String raw) {
+    boolean result = true;
+    for(int i = 0; result && i < raw.length(); i++) {
+        char c = raw.charAt(i);
+        if(Character.isDigit(c) || (c == '.' && (i != 0 || i != raw.length() - 1))) {
+        // Valid index
+        }
+        else {
+        result = false;
+        }
+    }
+    return result;
+    }
+
     public boolean isHierarchy() {
     boolean result = false;

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSet.java

@@ -46 +46 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
 /** An semi-data class to hold details about a loaded metadata set, it also provides some methods to manipulating the data within. 
@@ -96 +97 @@
     this.file = file;
     this.value_trees = new Hashtable();
-    this.document = Utility.parse(file, false);
+    this.document = XMLTools.parse(file, false);
 
     init(false); // don't use class loader
@@ -502 +503 @@
     Element name_element = null;
     Element metadataset_element = document.getDocumentElement();
-    NodeList name_elements = metadataset_element.getElementsByTagName(Utility.NAME_ELEMENT);
+    NodeList name_elements = metadataset_element.getElementsByTagName(StaticStrings.NAME_ELEMENT);
     for(int i = 0; i < name_elements.getLength(); i++) {
         Element possible_name_element = (Element) name_elements.item(i);
-        if(possible_name_element.getAttribute(Utility.LANGUAGE_ATTRIBUTE).equals(Utility.ENGLISH_VALUE)) {
+        if(possible_name_element.getAttribute(StaticStrings.LANGUAGE_ATTRIBUTE).equals(Utility.ENGLISH_VALUE)) {
         // Found it.
         name_element = possible_name_element;
@@ -512 +513 @@
     // If there is none add one. Note that we can only add english metadata sets. Although others can edit them to add further names as necessary.
     if(name_element == null) {
-        name_element = document.createElement(Utility.NAME_ELEMENT);
-        name_element.setAttribute(Utility.LANGUAGE_ATTRIBUTE, Utility.ENGLISH_VALUE);
+        name_element = document.createElement(StaticStrings.NAME_ELEMENT);
+        name_element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Utility.ENGLISH_VALUE);
         metadataset_element.insertBefore(name_element, metadataset_element.getFirstChild());
     }
@@ -627 +628 @@
             }
             else {
-            value_document = Utility.parse(value_file, false);
+            value_document = XMLTools.parse(value_file, false);
             }
             if(value_document != null) {

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

@@ -48 +48 @@
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.*;
+import org.greenstone.gatherer.util.XMLTools;
 import org.apache.xerces.parsers.*;
 import org.apache.xml.serialize.*;
@@ -503 +504 @@
                
             // System.out.println("::: " + mds_file.toString());
-         Utility.export(set.getDocument(), mds_file);
+         XMLTools.export(set.getDocument(), mds_file);
              
              set.setSetChanged(false);
@@ -518 +519 @@
                 //File value_file = new File(file, value_element.getName() + ".mdv");
                 ///ystem.err.println("Saving value file: " + value_file.toString());
-                //Utility.export(value_tree.getDocument(), value_file);
+                //XMLTools.export(value_tree.getDocument(), value_file);
                 // If this is a hierarchy element, write hierarchy file.
                 //if(value_element.getNamespace().equals(MetadataSetManager.HIDDEN) || value_tree.isHierarchy()) {