Changeset 36301

Timestamp:

2022-07-22T10:59:27+12:00 (22 months ago)

Author:

kjdon

Message:

tidying up by removing commented out code

File:

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

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

@@ -126 +126 @@
           // Try to retrieve existing metadatum
           String source_str = new_index.getID();
-          SearchMeta metadatum = CollectionDesignManager.searchmeta_manager.getMetadatum(/*StaticStrings.STOP_CHARACTER +*/ source_str, new_index.getType(), false);
+          SearchMeta metadatum = CollectionDesignManager.searchmeta_manager.getMetadatum(source_str, new_index.getType(), false);
           // If no metadata was found, add new pseudo metadata using the id
           if(metadatum == null) {
-          metadatum = new SearchMeta(/*StaticStrings.STOP_CHARACTER +*/ source_str, new_index.getType());
+          metadatum = new SearchMeta(source_str, new_index.getType());
         metadatum.setAssigned(true);
         metadatum.setValue(source_str);
@@ -199 +199 @@
         // Try to retrieve existing metadatum
         source_str = new_index.getID();
-        SearchMeta metadatum = CollectionDesignManager.searchmeta_manager.getMetadatum(/*StaticStrings.STOP_CHARACTER +*/ source_str, new_index.getType(), false);
+        SearchMeta metadatum = CollectionDesignManager.searchmeta_manager.getMetadatum(source_str, new_index.getType(), false);
         // If no metadata was found, add new pseudo metadata using the id
         if(metadatum == null) {
-            metadatum = new SearchMeta(/*StaticStrings.STOP_CHARACTER +*/ source_str, new_index.getType());
+            metadatum = new SearchMeta(source_str, new_index.getType());
             metadatum.setAssigned(true);
             metadatum.setValue(source_str);
@@ -494 +494 @@
         
 
-        // /** add all sources as separate indexes (fields).  */
-        // private class AddAllIndexActionListener
-        //     implements ActionListener {
-
-        //     public void actionPerformed(ActionEvent event) {
-        //         ArrayList all_sources = source_list.getAll();
-        //         all_sources.add(0, StaticStrings.TEXT_STR);
-        //         ArrayList new_sources = new ArrayList();
-        //         for(int i = 0; i < all_sources.size(); i++) {
-        //      Object source = all_sources.get(i);
-
-        //      // Create new index
-        //      new_sources.clear();
-        //      new_sources.add(source);
-        //      Index index = new Index(new_sources);
-        //      if(!index_model.contains(index)) {
-        //          // Determine the metadatum value
-        //          String name = source.toString();
-        //          if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) && name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
-        //          name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
-        //          }
-        //          // Create new metadatum
-        //          CollectionMeta metadatum = new CollectionMeta(StaticStrings.STOP_CHARACTER + index.getID());
-        //          metadatum.setValue(name);
-        //          name = null;
-        //          // Assign new index
-        //          addIndex(index, metadatum);
-        //      }
-        //      source = null;
-        //      index = null;
-        //         }
-        //         new_sources = null;
-        //         new_index_prompt.dispose();
-        
-        //     }
-        // }
     
         private class AllFieldsBoxListener