Changeset 10964 for trunk/gli

Timestamp:

2005-11-30T15:51:10+13:00 (18 years ago)

Author:

kjdon

Message:

default index doesn't need a level now, fixed a couple of bugs. index list now displays metadata display name not identifier

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Index.java (modified) (3 diffs)

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

@@ -183 +183 @@
         }
         sources = null;
-        id = id_buffer.substring(0, id_buffer.length() - 1);
+        if (id_buffer.length()==0) {
+        id = "";
+        } else {
+        id = id_buffer.substring(0, id_buffer.length() - 1);
+        }
     }
     return id;
@@ -208 +212 @@
         Element content_element = (Element) content_elements.item(i);
         String metadata_element_name_full = (String) content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
-        MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(metadata_element_name_full);
+        //MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(metadata_element_name_full);
+        MetadataElement metadata_element = MetadataTools.getMetadataElementWithName(metadata_element_name_full);
         if (metadata_element != null) {
             sources.add(metadata_element);
@@ -244 +249 @@
     // System.err.println("SetLevel(" + new_level + ")");
     if(element != null && element.getNodeName().equals(CollectionConfiguration.INDEX_DEFAULT_ELEMENT)) {
-        element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[new_level]);
+        if (0 <= new_level && new_level < 3) {
+        element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, LEVEL[new_level]);
+        } else {
+        element.setAttribute(CollectionConfiguration.LEVEL_ATTRIBUTE, "");
+        }
         this.id = null; // Regenerate ID.
         this.level = new_level;