Changeset 16880

Timestamp:

2008-08-18T14:22:55+12:00 (16 years ago)

Author:

kjdon

Message:

don't use dot prefix at all for search collection meta for gs3, so removed the code using it

File:

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

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

@@ -1727 +1727 @@
             e.setAttribute (StaticStrings.LANGUAGE_ATTRIBUTE, lang);
             XMLTools.setNodeText (e, text);
-            
             display_item_list.add (e);
         }
@@ -1881 +1880 @@
             Element e = (Element)index_children.item (i);
             String index_str = e.getAttribute (StaticStrings.NAME_ATTRIBUTE);
-            String index_str_display = index_str;//for creating collectionmetadata for this index
+            String index_str_display = index_str;//for creating collectionmetadata for this index 
             
             // Handling 'index' element
@@ -3099 +3098 @@
             StaticStrings.NAME_ATTRIBUTE, index_value);
             
-            if (collectionmetadata_list == null) {
-                //try adding the "." prefix
-                index_value = StaticStrings.DOT_CHARACTER + index_value;
-                collectionmetadata_list = XMLTools.getNamedElementList (source,
-                StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                StaticStrings.NAME_ATTRIBUTE, index_value);
-            }
             if (collectionmetadata_list != null) {
                 
@@ -3158 +3150 @@
             StaticStrings.NAME_ATTRIBUTE, name_str);
             
-            if (collectionmetadata_list == null) {
-                //try adding the "." prefix
-                name_str = StaticStrings.DOT_CHARACTER + name_str;
-                collectionmetadata_list = XMLTools.getNamedElementList (source,
-                StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                StaticStrings.NAME_ATTRIBUTE, name_str);
-            }
             if (collectionmetadata_list != null) {
                 
@@ -3300 +3285 @@
             StaticStrings.NAME_ATTRIBUTE, temp_str);
             
-            if (collectionmetadata_list == null) {
-                //try adding the "." prefix
-                String with_dot_str = StaticStrings.DOT_CHARACTER + temp_str;
-                collectionmetadata_list = XMLTools.getNamedElementList (source,
-                StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                StaticStrings.NAME_ATTRIBUTE, with_dot_str);
-                
-                if (collectionmetadata_list == null) {
-                    //try the full name, i.e. with 'ex.'
-                    if (mg_indexer == true) {
-                        full_index_name = level_str+StaticStrings.COLON_CHARACTER+full_index_name;
-                    }
-                    collectionmetadata_list = XMLTools.getNamedElementList (source,
-                    StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                    StaticStrings.NAME_ATTRIBUTE, full_index_name);
-                }
-                if (collectionmetadata_list == null) {
-                    with_dot_str = StaticStrings.DOT_CHARACTER + full_index_name;
-                    collectionmetadata_list = XMLTools.getNamedElementList (source,
-                    StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                    StaticStrings.NAME_ATTRIBUTE, with_dot_str);
-                }
-            }
+        if (collectionmetadata_list == null) {
+          //try the full name, i.e. with 'ex.'
+          if (mg_indexer == true) {
+        // but first append level info if we are mg
+        full_index_name = level_str+StaticStrings.COLON_CHARACTER+full_index_name;
+          }
+          collectionmetadata_list = XMLTools.getNamedElementList (source,
+                 StaticStrings.COLLECTIONMETADATA_ELEMENT,
+                 StaticStrings.NAME_ATTRIBUTE, full_index_name);
+        }
+    
             if (collectionmetadata_list != null) {
                 
@@ -3377 +3350 @@
             StaticStrings.NAME_ATTRIBUTE, name_str);
             
-            if (collectionmetadata_list == null) {
-                //try adding the "." prefix
-                name_str = StaticStrings.DOT_CHARACTER + name_str;
-                collectionmetadata_list = XMLTools.getNamedElementList (source,
-                StaticStrings.COLLECTIONMETADATA_ELEMENT,
-                StaticStrings.NAME_ATTRIBUTE, name_str);
-            }
             if (collectionmetadata_list != null) {