Changeset 12088

Timestamp:

2006-07-07T13:06:01+12:00 (18 years ago)

Author:

kjdon

Message:

some changes that I am not sure what for :-). Also added SearchTypes to the list of commands

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Format.java (modified) (6 diffs)

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

@@ -41 +41 @@
 
     /** The default features (not all of these are in the Greenstone Developer's Guide). */
-    static final public String DEFAULT_FEATURES[] = { "", "AllowExtendedOptions", "Document", "DocumentArrowsBottom", "DocumentArrowsTop", "DocumentButtons", "DocumentContents", "DocumentHeading", "DocumentImages", "DocumentText", "DocumentTitles", "DocumentUseHTML", "RelatedDocuments", "Search" };
+    static final public String DEFAULT_FEATURES[] = { "", "AllowExtendedOptions", "Document", "DocumentArrowsBottom", "DocumentArrowsTop", "DocumentButtons", "DocumentContents", "DocumentHeading", "DocumentImages", "DocumentText", "DocumentTitles", "DocumentUseHTML", "RelatedDocuments", "Search", "SearchTypes" };
     /** The list of known feature parts. */
     static final public String DEFAULT_PARTS[] = { "", "DateList", "HList", "VList" };
@@ -76 +76 @@
     /** We keep a copy of the part because its slightly more computationally tricky to calculate. */
     private String part = null;
+    /** We keep a copy of the feature name */
+    private String feature_name = null;
     /** Cached result of toString. */
     private String text = null;
@@ -166 +168 @@
     }
     else if(element != null) {
-        String name = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
-        // Remove part
-        String part = getPart();
-        String feature;
-        if(part != null) {
-        feature = name.substring(0, name.length() - part.length());
-        }
-        else {
-        feature = name;
-        }
-        part = null;
-        name = null;
+        String feature = getFeatureName();
         // If the feature now refers to a classifier, retrieve it.
         if(feature.toUpperCase().startsWith(Classifier.CLASSIFIER_PREFIX)) {
@@ -197 +188 @@
     }
 
+    public String getFeatureName() {
+    if (feature_name == null) {
+        String name = element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        // Remove part
+        String part = getPart();
+        if(part != null) {
+        feature_name = name.substring(0, name.length() - part.length());
+        }
+        else {
+        feature_name = name;
+        }
+        part = null;
+        name = null;
+    }
+    return feature_name;
+        
+    }
     public String getName() {
     if(element != null) {
@@ -273 +281 @@
         if(feature instanceof Classifier) {
         classifier = (Classifier) feature;
+        feature_name = classifier.getPositionString(); 
         element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, classifier.getPositionString() + part);
         }
         else {
+        feature_name = feature.toString();
         element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, feature.toString() + part);
         }
@@ -344 +354 @@
     if(classifier != null) {
         element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, classifier.getPositionString() + getPart());
+        feature_name = classifier.getPositionString(); 
         text = null;
     }