Changeset 4567

Timestamp:

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

Author:

kjdon

Message:

for parsing and writing classifier args: use toStringCOnfig for writing to file, and when reading in, if type is metadata, then make the value have the ex name space if it doesn't already have one.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -286 +286 @@
         }
 
-                // Create the process.
+        // Create the process.
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
@@ -297 +297 @@
         xml.append("\n");
         }
-                // Then read the xml from the piped input stream.
+        // Then read the xml from the piped input stream.
         InputSource source = new InputSource(new StringReader(xml.toString()));
         DOMParser parser = new DOMParser();
@@ -305 +305 @@
     catch (Exception error) {
         error.printStackTrace();
-                //ystem.err.println("Error: Cannot parse " + getClassifierName(classifier));
+        ///ystem.err.println("Error: Cannot parse " + getClassifierName(classifier));
     }
     if(document != null) {
@@ -356 +356 @@
                 if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
                 String value = tokenizer.nextToken();
-                value = value.replace(':', MSMUtils.NS_SEP);
+                // special hack for metadata
+                if (argument.getType() == Argument.METADATA) {
+                    value = value.replace(':', MSMUtils.NS_SEP);
+                    if (value.indexOf(MSMUtils.NS_SEP)==-1){
+                    value = Utility.EXTRACTED_METADATA_NAMESPACE +MSMUtils.NS_SEP+value;
+                    }
+                }
+                // shoudl probably do the same for METADATUM
+                
                 argument.setValue(value);
                 }
@@ -497 +505 @@
         if(object instanceof Classifier) {
         Classifier classifier = (Classifier) object;
-        text.append(classifier.toString());
+        text.append(classifier.toStringConfig());
         }
         else if(object instanceof CustomClassifier) {
@@ -574 +582 @@
     File files[] = directory.listFiles();
     if(files != null) {
-                // Create a progress indicator.
+        // Create a progress indicator.
         ParsingProgress progress = new ParsingProgress(get("CDM.ClassifierManager.Parsing.Title"), get("CDM.ClassifierManager.Parsing.Message"), files.length);
         for(int i = 0; i < files.length; i++) {
@@ -611 +619 @@
         classifier.setDesc(MSMUtils.getValue(node));
         }
-                // Parse the multitude of arguments.
+        // Parse the multitude of arguments.
         else if(node_name.equals("Arguments")) {
         for(Node arg = node.getFirstChild(); arg != null; arg = arg.getNextSibling()) {