Changeset 38338 for main/trunk/greenstone3

Timestamp:

2023-10-31T12:59:50+13:00 (7 months ago)

Author:

kjdon

Message:

lets set up collectionList in configure, not every time we need it.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -112 +112 @@
     }
 
-  // in configure we set up any params that should be saved to the session. At this stage, assuming none should be saved.
-  
+
     /** returns a specific service description */
     protected Element getServiceDescription(Document doc, String service, String lang, String subset)
     {
-
-        Element description = doc.createElement(GSXML.SERVICE_ELEM);
+          
+          Element description = doc.createElement(GSXML.SERVICE_ELEM);
         description.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
         description.setAttribute(GSXML.NAME_ATT, service);
@@ -150 +149 @@
             {
 
-                this.collection_list = getCollectionList();
                 Element param = GSXML.createParameterDescription(doc, COL_PARAM, getTextString("param." + COL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, null, this.collection_list, this.collection_list);
                 param_list.appendChild(param);
@@ -687 +685 @@
     }
 
+    
+
     /**
      * configure the service module for now, all services have type=build - need
      * to think about this
      */
+  // in configure we set up any params that should be saved to the session. At this stage, assuming none should be saved.
     public boolean configure(Element info, Element extra_info)
     {
@@ -699 +700 @@
 
         logger.info("configuring GS2Construct");
+
+                // read thru collect folder and set up collectionList
+                this.collection_list = getCollectionList();
 
         Element e = null;