Changeset 4852

Timestamp:

2003-07-02T14:38:27+12:00 (21 years ago)

Author:

kjdon

Message:

changed the base constructor class a bit - the import, build, new stuff is moved into the sub class - so the constructro class can be used as a base for other building activities, such as daniels extract keywords stuff. so now you cant go CollectionConstructor.NEW, you have to use the sub class name.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/build

Files:

• CollectionConstructor.java (modified) (2 diffs)
• ConstructCollection.java (modified) (3 diffs)
• GS2PerlConstructor.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/build/CollectionConstructor.java

@@ -9 +9 @@
 public abstract class CollectionConstructor 
     extends Thread {
-
-    public static final int NEW = 0;
-    public static final int IMPORT = 1;
-    public static final int BUILD = 2;
-    public static final int ACTIVATE = 3;
 
     /** the site in which building is to take place */
@@ -99 +94 @@
     }
     
-    public void run(){
-    String msg;
-    ConstructionEvent evt;
-    if (process_type_ == -1) {
-        msg = "Error: you must set the action type";
-        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
-        sendMessage(evt);
-        return;
-    }
-    if (site_home_==null) { 
-        msg = "Error: you must set site_home";
-        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
-        sendMessage(evt);
-        return;
-    }
-    if (process_type_ != NEW && collection_name_ ==null) {
-        msg = "Error: you must set collection_name";
-        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
-        sendMessage(evt);
-        return;
-    }
-    
-    switch (process_type_) {
-    case NEW:
-        newCollection();
-        break;
-    case IMPORT:
-        importCollection();
-        break;
-    case BUILD:
-        buildCollection();
-        break;
-    case ACTIVATE:
-        activateCollection();
-        break;
-    default:
-        msg = "wrong type of action specified!";
-        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
-        sendMessage(evt);
-        break;
-    }
-
-    }
-
-    abstract protected void newCollection();
-    abstract protected void importCollection();
-    abstract protected void buildCollection();
-    abstract protected void activateCollection();
+    abstract public void run();
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/build/ConstructCollection.java

@@ -49 +49 @@
         }
         if (val.equals("new")) {
-            process_mode = CollectionConstructor.NEW;
+            process_mode = GS2PerlConstructor.NEW;
         } else if (val.equals("import")) {
-            process_mode = CollectionConstructor.IMPORT;
+            process_mode = GS2PerlConstructor.IMPORT;
         } else if (val.equals("build")) {
-            process_mode = CollectionConstructor.BUILD;
+            process_mode = GS2PerlConstructor.BUILD;
         } else if (val.equals("activate")) {
-            process_mode = CollectionConstructor.ACTIVATE;
+            process_mode = GS2PerlConstructor.ACTIVATE;
         }
 
@@ -85 +85 @@
     // check that the collection name is valid - ie the directory exists if this is not a new one, or doesn't exist if we are creating a new one
     File coll_dir = new File(GSFile.collectionBaseDir(site_home, coll_name));
-    if (process_mode != CollectionConstructor.NEW && !coll_dir.exists()) {
+    if (process_mode != GS2PerlConstructor.NEW && !coll_dir.exists()) {
         System.out.println("ERROR: Invalid collection ("+coll_name+").");
         printUsage();
         return;
-    } else if (process_mode == CollectionConstructor.NEW && 
+    } else if (process_mode == GS2PerlConstructor.NEW && 
            coll_dir.exists()) {
         System.out.println("ERROR: there is already a collection named "+coll_name);
@@ -98 +98 @@
    
     ConstructCollection processor = new ConstructCollection();
-    CollectionConstructor constructor = new GS2PerlConstructor("perl_build");
+    GS2PerlConstructor constructor = new GS2PerlConstructor("perl_build");
     if (!constructor.configure()) {
         System.out.println("couldn't configure the constructor!!");

trunk/gsdl3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -19 +19 @@
 public class GS2PerlConstructor 
     extends CollectionConstructor {
+
+    public static final int NEW = 0;
+    public static final int IMPORT = 1;
+    public static final int BUILD = 2;
+    public static final int ACTIVATE = 3;
 
     /** gsdlhome for greenstone 2 - we use the perl modules and building 
@@ -56 +61 @@
     }
 
+    public void run() {
+    String msg;
+    ConstructionEvent evt;
+    if (process_type_ == -1) {
+        msg = "Error: you must set the action type";
+        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
+        sendMessage(evt);
+        return;
+    }
+    if (site_home_==null) { 
+        msg = "Error: you must set site_home";
+        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
+        sendMessage(evt);
+        return;
+    }
+    if (process_type_ != NEW && collection_name_ ==null) {
+        msg = "Error: you must set collection_name";
+        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
+        sendMessage(evt);
+        return;
+    }
+    
+    switch (process_type_) {
+    case NEW:
+        newCollection();
+        break;
+    case IMPORT:
+        importCollection();
+        break;
+    case BUILD:
+        buildCollection();
+        break;
+    case ACTIVATE:
+        activateCollection();
+        break;
+    default:
+        msg = "wrong type of action specified!";
+        evt = new ConstructionEvent(this, GSStatus.ERROR, msg);
+        sendMessage(evt);
+        break;
+    }
+
+    }
+
     protected void newCollection() {
     sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: new collection."));