Changeset 14359

Timestamp:

2007-08-09T16:32:13+12:00 (17 years ago)

Author:

xiao

Message:

modify to make a Format4gs3 object contain two format features: feature_format - contains format statements plus classifier options if this object is a classifier, displayed on the format list in GLI; pure_format - contains only format statements, displayed in the format editor in GLI.

File:

• gli/trunk/src/org/greenstone/gatherer/cdm/Format4gs3.java (modified) (9 diffs)

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

@@ -44 +44 @@
     /** We keep a copy of the feature name */
     private String feature_name = null;
-    /** The format statement for this feature. */
+    /** The format statement for this feature (also contains classifier options if its a classifier), used by the format list on the top in GLI. */
     private String feature_format = null;
+    
+    /** The format statement for this feature (does not contain options in the front), displayed in the format editor at the bottom in GLI. 
+     *  If this format is not a classifier, feature_format==pure_format*/
+    private String pure_format = null;
     
     /** Wether this feature is about a classifier. The other way to check this is to see if feature_name starts with "CL" */
@@ -71 +75 @@
             classifier_options = classifier.toString();
 
-            feature_format = toOneLineFormat(XMLTools.getNodeText(element));
-            feature_format = classifier_options + " " + feature_format;
+                    
+            pure_format = toOneLineFormat(XMLTools.getNodeText(element));
+            feature_format = classifier_options + " " + pure_format;
         } else {
             feature_name = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
             feature_format = toOneLineFormat(XMLTools.getNodeText(element));
+            pure_format = feature_format;
         }
 
@@ -83 +89 @@
         this.feature_name = feature_name;
         this.feature_format = feature_format;
+        this.pure_format = feature_format;
+        
         is_classifier = feature_name.startsWith (Classifier.CLASSIFIER_PREFIX);
         
         element = CollectionConfiguration.createElement (StaticStrings.FORMAT_STR);
-        if(feature_name.startsWith(Classifier.CLASSIFIER_PREFIX)) {
+        if(is_classifier) {
             
             //Now get the options of the classifier
@@ -92 +100 @@
             //set the classifier_options string
             classifier_options = classifier.toString();
-
+            
             feature_format = classifier_options + " " + feature_format;
         } else {
@@ -98 +106 @@
         }
 
-        XMLTools.setNodeText(element, toOneLineFormat(feature_format));
+        XMLTools.setNodeText(element, toOneLineFormat(pure_format));
 
     }
@@ -138 +146 @@
     }
             
-    /** Method to translate this classes information into a line of text as you would expect on the format list panel
+    /** Method to translate this class information into a line of text as you would expect on the format list panel
      * @return A <strong>String</strong> containing the format command.
      */
@@ -152 +160 @@
             //update the classifier_options string
             classifier_options = classifier.toString();
-
-            feature_format = classifier_options + " " + toOneLineFormat(XMLTools.getNodeText(element));
+            pure_format = toOneLineFormat(XMLTools.getNodeText(element));
+            feature_format = classifier_options + " " + pure_format;
         }
     }    
@@ -159 +167 @@
         return toFormatedFormat(feature_format);
     }
+    public String getPureFormat() {
+        return toFormatedFormat(pure_format);
+    }
+    
     public Classifier getClassifier() {
         if(!isClassifier()) {
@@ -176 +188 @@
      */
     public void setFeatureFormat (String value) {
-        feature_format = value;
-        XMLTools.setNodeText(element, feature_format);
+        if(is_classifier) {
+          feature_format = classifier_options + " " + value;
+        } else {
+          feature_format = value;
+        }
+    }
+    public void setPureFormat (String value) {
+        pure_format = value;
+        setFeatureFormat (value);
+        XMLTools.setNodeText(element, pure_format);
     }
     public static String toOneLineFormat(String str) {