Changeset 36190

Timestamp:

2022-05-16T14:45:49+12:00 (2 years ago)

Author:

kjdon

Message:

updated to use new SearchMeta instead of collectionmeta

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/BaseIndexManager.java (modified) (8 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/BaseIndexManager.java

@@ -121 +121 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    protected void addIndex(Index index, CollectionMeta metadatum) {
+    protected void addIndex(Index index, SearchMeta metadatum) {
     ///ystem.err.println("Adding an index: " + index.toString());
     if(!contains(index)) {
-        CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
+        CollectionDesignManager.searchmeta_manager.addMetadatum(metadatum);
         // Retrieve the currently last index
         if(getSize() > 0) {
@@ -235 +235 @@
     if(index != null) {
         // Remove any current metadata from this index
-        CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + index.getID());
+        //CollectionDesignManager.searchmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + index.getID());
+        CollectionDesignManager.searchmeta_manager.removeMetadata(index.getID(), SearchMeta.TYPE_INDEX);
         // Remove the index
         remove(index);
@@ -257 +258 @@
        different name, or may be a new index altogether */
     protected void replaceIndex(Index old_index, Index new_index,
-                  CollectionMeta coll_meta) {
+                  SearchMeta coll_meta) {
     if (old_index == null || new_index == null || coll_meta == null) {
         return;
@@ -266 +267 @@
     }
     // Remove the old index coll meta
-    CollectionDesignManager.collectionmeta_manager.removeMetadata(StaticStrings.STOP_CHARACTER + old_index.getID());
+    CollectionDesignManager.searchmeta_manager.removeMetadata(/*StaticStrings.STOP_CHARACTER +*/ old_index.getID(), old_index.getType());
     // Add the new coll meta
-    CollectionDesignManager.collectionmeta_manager.addMetadatum(coll_meta);
+    CollectionDesignManager.searchmeta_manager.addMetadatum(coll_meta);
 
     // get the position of the old one
@@ -719 +720 @@
         }
         
-        protected CollectionMeta generateCollectionMeta(Index index) {
-        CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
+        protected SearchMeta generateSearchMeta(Index index) {
+        SearchMeta metadatum = new SearchMeta(/*StaticStrings.STOP_CHARACTER +*/ index.getID(), index.getType());
         if (use_macro_as_display_name(index.getID())) {
             metadatum.setValue(get_macro_name(index.getID()));
@@ -727 +728 @@
         }
                 // is this right? Index vs index
-                metadatum.setType(index_element_name);
+                //metadatum.setType(index_element_name);
         return metadatum;
         }
@@ -739 +740 @@
             if (index != null) {
             
-            CollectionMeta metadatum = generateCollectionMeta(index);
+            SearchMeta metadatum = generateSearchMeta(index);
             // Add the index
             addIndex(index, metadatum);
@@ -768 +769 @@
             Index index = generateNewIndex();
             if (index != null) {
-            CollectionMeta metadatum = generateCollectionMeta(index);
+            SearchMeta metadatum = generateSearchMeta(index);
             // replace the index
             replaceIndex((Index) index_list.getSelectedValue(), index, metadatum);