Changeset 10868

Timestamp:

2005-11-08T13:26:17+13:00 (18 years ago)

Author:

kjdon

Message:

now uses GSDL3SRCHOME to find the sample collectionConfig.xml file

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/Create.java (modified) (5 diffs)

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

@@ -7 +7 @@
 {
     String gsdl3_home = null;
+    String gsdl3_srchome = null;
+    String site = null;
     String site_home = null;
     String collection = null;
 
-    public Create(String gsdl3_home, String site, String collection)
+    public Create(String gsdl3_home, String gsdl3_srchome, String site, 
+          String collection)
     { 
     this.gsdl3_home = gsdl3_home;
+    this.gsdl3_srchome = gsdl3_srchome;
+    this.site = site;
     this.site_home = GSFile.siteHome(gsdl3_home, site);
     this.collection = collection;
@@ -38 +43 @@
     createDirectory(new File(GSFile.collectionEtcDir(coll_home)));
 
-    File config_template = new File(gsdl3_home + File.separator+ "resources"+File.separator + "xml"+File.separator+"collectionConfig.xml");
+    File config_template = new File(gsdl3_srchome + File.separator+ "resources"+File.separator + "xml"+File.separator+"collectionConfig.xml");
     if (!config_template.isFile()) {
         System.err.println("Couldn't find the config file template "+config_template.getPath());
@@ -48 +53 @@
 
     System.err.println("New collection created in "+coll_home);
-    System.err.println("Put source documents into import, set the collection's configuration in etc/collectionConfig.xml, then run gs3-build.sh (linux) or gs3-build (windows) to build the collection");
+    System.err.println("Put source documents into import, set the collection's configuration in etc/collectionConfig.xml, then run \"gs3-build.(sh|bat) "+ this.site+" "+this.collection+"\" to build the collection");
     }
 
@@ -62 +67 @@
     { 
     String gsdl3_home = System.getProperty("GSDL3HOME");
+    String gsdl3_srchome = System.getProperty("GSDL3SRCHOME");
     if (gsdl3_home == null) {
         System.out.println("Error: Unable to locate GSDL3HOME");
+        System.exit(1);
+    }
+    if (gsdl3_srchome == null) {
+        System.out.println("Error: Unable to locate GSDL3SRCHOME");
         System.exit(1);
     }
@@ -100 +110 @@
     }
     
-    Create c = new Create(gsdl3_home, site, collection);
+    Create c = new Create(gsdl3_home, gsdl3_srchome, site, collection);
     c.makeCollection();
     return;