Changeset 4853 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

Timestamp:

2003-07-02T14:39:36+12:00 (21 years ago)

Author:

kjdon

Message:

now uses GS2PerlConstructor constatns rather than base class constants, since they have been shifted out of the base class

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (5 diffs)

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

@@ -141 +141 @@
 
     protected Element processNewCollection(Element request) {
-    return runCommand(request, CollectionConstructor.NEW);  
+    return runCommand(request, GS2PerlConstructor.NEW); 
     }
     
@@ -160 +160 @@
     }
     protected Element processImportCollection(Element request) {
-    return runCommand(request, CollectionConstructor.IMPORT);
+    return runCommand(request, GS2PerlConstructor.IMPORT);
     }
 
     protected Element processBuildCollection(Element request) {
-    return runCommand(request, CollectionConstructor.BUILD);
+    return runCommand(request, GS2PerlConstructor.BUILD);
     }
     protected Element processActivateCollection(Element request) {
-    Element response = runCommand(request, CollectionConstructor.ACTIVATE);
+    Element response = runCommand(request, GS2PerlConstructor.ACTIVATE);
     // this activates the collection on disk. but now we need to tell
     // the MR about it. but we have to wait until the process is finished.
@@ -504 +504 @@
     // do teh actual command
     String coll_name=null;
-    if (type==CollectionConstructor.NEW) {
+    if (type==GS2PerlConstructor.NEW) {
         String coll_title = (String)params.get(NEW_COL_TITLE_PARAM);
         coll_name = createNewCollName(coll_title);
@@ -516 +516 @@
     //create the constructor to do the work
 
-    CollectionConstructor constructor = new GS2PerlConstructor("perl_build");
+    GS2PerlConstructor constructor = new GS2PerlConstructor("perl_build");
     if (!constructor.configure()) {
         Text t = doc_.createTextNode(getTextString("general.configure_constructor_error", lang));
@@ -622 +622 @@
 
     Element param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    if (type == CollectionConstructor.NEW) {
+    if (type == GS2PerlConstructor.NEW) {
         Element param = doc_.createElement(GSXML.PARAM_ELEM);
         param.setAttribute(GSXML.NAME_ATT, "creator");