Changeset 7311 for trunk

Timestamp:

2004-05-12T13:59:15+12:00 (20 years ago)

Author:

kjdon

Message:

the indexers now output their overallName as baseIndexPrefix in the serviceRack element

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build

Files:

• CollectionManager.java (modified) (1 diff)
• indexers/MGIndexer.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

@@ -315 +315 @@
           searchName = searchAttribute.getNodeValue();
       }
-
+      if (searchName == null) {
+          searchName = "idx"; // need to modify this if we have two search elements with no names
+      }
       // create the pertinent indexer...
       IndexerInterface indexer = IndexerFactory.makeIndexer(searchType, searchName);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/indexers/MGIndexer.java

@@ -754 +754 @@
     Element default_index = doc.createElement("defaultIndex");
     default_index.setAttribute(GSXML.NAME_ATT, def_index);
-
+    Element base_index_name = doc.createElement("baseIndexPrefix");
+    base_index_name.setAttribute(GSXML.NAME_ATT, overallName);
     Element search_service_elem = doc.createElement(GSXML.SERVICE_CLASS_ELEM);
     Element retrieve_service_elem = doc.createElement(GSXML.SERVICE_CLASS_ELEM);
@@ -760 +761 @@
     service_rack_list.appendChild(retrieve_service_elem);
 
-    search_service_elem.setAttribute(GSXML.NAME_ATT, "GS3MGSearch");
-    
+    search_service_elem.setAttribute(GSXML.NAME_ATT, "GS3MGSearch");  
     search_service_elem.appendChild(index_list);
     search_service_elem.appendChild(default_index);
+    search_service_elem.appendChild(base_index_name);
+
     retrieve_service_elem.setAttribute(GSXML.NAME_ATT, "GS3MGRetrieve");
     retrieve_service_elem.appendChild(default_index.cloneNode(true));
+    retrieve_service_elem.appendChild(base_index_name.cloneNode(true));
+
     return true;
     }