Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/cdm/Index.java

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

File:

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

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

@@ -30 +30 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.metadata.MetadataElement;
+import org.greenstone.gatherer.metadata.MetadataSet;
+import org.greenstone.gatherer.metadata.MetadataSetManager;
+import org.greenstone.gatherer.metadata.MetadataTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -73 +76 @@
         Element content_element = document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
         Object source_object = sources.get(i);
-        if(source_object instanceof ElementWrapper) {
-        ///DebugStream.println("Found ElementWrapper as source: " + ((ElementWrapper)source_object).getName());
-        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, ((ElementWrapper)source_object).getName());
+        if (source_object instanceof MetadataElement) {
+        // System.err.println("Constructing new Index with MetadataElement source...");
+        content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, ((MetadataElement) source_object).getFullName());
         }
         else {
-        ///DebugStream.println("Found String as source: " + source_object.toString());
+        // System.err.println("Constructing new Index with String source...");
         content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, source_object.toString());
         }
@@ -166 +169 @@
         for(int i = 0; i < sources_size; i++) {
         Object source_object = sources.get(i);
-        // If its an element wrapper use the unique name rather than the 
-        if(source_object instanceof ElementWrapper) {
-            String full_element_name = ((ElementWrapper)source_object).getName();
+        if (source_object instanceof MetadataElement) {
+            String full_element_name = ((MetadataElement)source_object).getFullName();
             if(full_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
                id_buffer.append(full_element_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()));
@@ -206 +208 @@
         for(int i = 0; i < content_elements_length; i++) {
         Element content_element = (Element) content_elements.item(i);
-        String source_str = (String) content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
-        ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(source_str);
-        if(element_wrapper != null) {
-            sources.add(element_wrapper);
+        String metadata_element_name_full = (String) content_element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
+        MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(metadata_element_name_full);
+        if (metadata_element != null) {
+            sources.add(metadata_element);
         }
         else {
-            sources.add(source_str);
+            sources.add(metadata_element_name_full);
         }
         }
@@ -267 +269 @@
         Element content_element = element.getOwnerDocument().createElement(CollectionConfiguration.CONTENT_ELEMENT);
         Object source_object = sources.get(i);
-        if(source_object instanceof ElementWrapper) {
-            //DebugStream.println("Found ElementWrapper as source: " + ((ElementWrapper)source_object).getName());
-            String name = ((ElementWrapper)source_object).getName();
+        if (source_object instanceof MetadataElement) {
+            String name = ((MetadataElement) source_object).getFullName();
             content_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
             name = null;