Changeset 7603

Timestamp:

2004-06-17T11:12:25+12:00 (20 years ago)

Author:

kjdon

Message:

removed the xml stuff - we don't use it at present and it is confusing. also while reading in the collect.cfg file, if we find a command we are not looking for, we read in all teh tokens for that command (using CommandTokeniser) so that multi line tokens are eaten up

File:

• trunk/gli/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java

@@ -50 +50 @@
     implements Comparable {
     
-    private Element creator_element;
-    private Element description_element;
-    private Element maintainer_element;
-    private Element name_element;
     private File file;
-    private String creator;
-    private String description;
-    private String maintainer;
-    private String name;
-    
-    private String site; // used for gs3 colls
+    private String creator = "";
+    private String description = "";
+    private String maintainer = "";
+    private String name = "";
+    
+    private String site = null; // used for gs3 colls
     
     public BasicCollectionConfiguration(File file) {
@@ -69 +65 @@
         return;
         }
-        if(filename.endsWith(".xml")) {
-        // This is where G3 compliant code will one day live
-        }
-        else if(filename.endsWith(".cfg")) {
+        if(filename.endsWith(".cfg")) {
         FileInputStream fis = new FileInputStream(file);
         InputStreamReader isr = new InputStreamReader(fis, "UTF-8");
@@ -128 +121 @@
                 value_str = null;
                 meta_type_str = null;
+            } else {
+                // we want to process all the tokens to make sure we get rid of multi line commands before trying to find the next one
+                while (tokenizer.hasMoreTokens()) {
+                    tokenizer.nextToken();
+                }
+
             } // end of coll meta bit
             command_type_str = null;
@@ -170 +169 @@
      */
     public String getCreator() {
-    String result = StaticStrings.EMPTY_STR;
-    if(creator_element != null) {
-        result = MSMUtils.getValue(creator_element);
-    }
-    else if(creator != null) {
-        result = creator;
-    }
-    return result;
+    return creator;
     }
 
     public String getDescription() {
-    String result = StaticStrings.EMPTY_STR;
-    if(description_element != null) {
-        result = MSMUtils.getValue(description_element);
-    }
-    else if(description != null) {
-        result = description;
-    }
-    return result;
+    return description;
     }
 
@@ -196 +181 @@
     
     public String getMaintainer() {
-    String result = StaticStrings.EMPTY_STR;
-    if(maintainer_element != null) {
-        result = MSMUtils.getValue(maintainer_element);
-    }
-    else if(maintainer != null) {
-        result = maintainer;
-    }
-    return result;
+    return maintainer;
     }
 
     public String getName() {
-    String result = StaticStrings.EMPTY_STR;
-    if(name_element != null) {
-        result = MSMUtils.getValue(name_element);
-    }
-    else if(name != null) {
-        result = name;
-    }
-    return result;
+    return name;
     }