Changeset 6870

Timestamp:

2004-02-24T11:09:11+13:00 (20 years ago)

Author:

kjdon

Message:

now uses GSXML static strings for elem and att names, uses GSFile methods to find directories and config files for a collection, uses site name as well as coll name, sql database name is now a combination of sitename and collname

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java (modified) (10 diffs)

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

@@ -34 +34 @@
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnectionFactory;
 import org.greenstone.gsdl3.gs3build.util.DOMUtils;
+
+import org.greenstone.gsdl3.util.GSFile;
+import org.greenstone.gsdl3.util.GSXML;
 
 /**
@@ -52 +55 @@
   GS3SQLConnection   database;       // the database to store everything in
   String             collectionHome;
+    String           siteHome;
   String             collectionName;
-
+    String           qualifiedCollectionName; // used as the database name 
+
+   
   class CollectionClassifier
   { File file;
@@ -111 +117 @@
    *  Create the collection manager for a given collection
    *
-   *  @param <code>String</code> the name of the collection
+   * @param site the name of the site
+   *  @param collection <code>String</code> the name of the collection
    */
-  public CollectionManager(String collection)
-  { String collectRoot = System.getProperty("GSDL3HOME");
-  
-    this.database = GS3SQLConnectionFactory.createConnection(collection);
+    public CollectionManager(String site, String collection) {
+    
+    String gsdl3Root = System.getProperty("GSDL3HOME");
+    if (gsdl3Root == null) {
+        System.out.println("Error: Unable to locate GSDL3HOME");
+        System.exit(1);
+        //return;
+    }
+    
+    this.siteHome = GSFile.siteHome(gsdl3Root, site);
+    File site_dir = new File(this.siteHome);
+    if (!site_dir.exists()) {
+    System.out.println("Error: Non-existant site ("+site+") specified");
+    System.exit(1);
+    }
+    site_dir = null;
+    this.collectionHome = GSFile.collectionBaseDir(this.siteHome, collection);
+    
+    File collect_dir = new File(this.collectionHome);
+    if (!collect_dir.exists()) {
+    System.out.println("Error: Non-existant collection ("+collection+") specified in site "+site);
+    System.exit(1);
+    }
+    collect_dir = null;
+
+    this.collectionName = collection;
+    this.qualifiedCollectionName = site+"_"+collection;
+
+      this.database = GS3SQLConnectionFactory.createConnection(this.qualifiedCollectionName);
     /*    if (this.database != null) {
       this.database.clearCollection(collection);
@@ -124 +156 @@
     if (this.database == null) {
       this.database = GS3SQLConnectionFactory.createConnection("test");
-      this.database.initCollection(collection);
+      this.database.initCollection(this.qualifiedCollectionName);
     }
 
     this.metadata = new CollectionMetadata();
 
-    if (collectRoot == null)
-    { System.out.println("Unable to locate GSDL3HOME");
-      //      System.exit(1);
-      return;
-    }
-
-    if (collectRoot.endsWith(System.getProperty("file.separator"))) 
-    { this.collectionHome = collectRoot + "web/sites/localsite/collect" + System.getProperty("file.separator") + collection;
-    }
-    else
-    { this.collectionHome = collectRoot + System.getProperty("file.separator") + "web/sites/localsite/collect" + System.getProperty("file.separator") + collection;
-    }
-    this.collectionName = collection;
-
-    File buildDirectory = new File(this.collectionHome, "building");
+    
+    File buildDirectory = new File(GSFile.collectionBuildDir(this.collectionHome));
     if (!buildDirectory.exists()) {
       buildDirectory.mkdir();
     }
 
-    File archiveDirectory = new File(this.collectionHome, "archives");
+    File archiveDirectory = new File(GSFile.collectionArchiveDir(this.collectionHome));
     if (!archiveDirectory.exists()) {
       archiveDirectory.mkdir();
@@ -169 +188 @@
       System.out.println(name);
 
-      if (name.equals("classifier"))
+      if (name.equals(GSXML.CLASSIFIER_ELEM))
       { 
     NamedNodeMap atts = children.item(c).getAttributes();
-    Node attribute = atts.getNamedItem("type");
+    Node attribute = atts.getNamedItem(GSXML.TYPE_ATT);
     if (attribute == null) {
       continue;
@@ -190 +209 @@
 
   public void configureCollection(BuildManager buildManager)
-  { File collectionConfig = new File(collectionHome, "/etc/collectionConfig.xml");
+  { File collectionConfig = new File(GSFile.collectionConfigFile(this.collectionHome));
     
     // get the File and read it in
@@ -207 +226 @@
       Element rootElement = document.getDocumentElement();
 
-      if (rootElement.getTagName() != "collectionConfig")
+      if (rootElement.getTagName() != GSXML.COLLECTION_CONFIG_ELEM)
       { // TODO: throw exception
       }
@@ -223 +242 @@
 
     // the name is a plugin element
-    if (name.equals("search")) {
+    if (name.equals(GSXML.SEARCH_ELEM)) {
       // pick up attributes from the <search> tag now...
       NamedNodeMap searchAttributes = children.item(c).getAttributes();
-      Node searchAttribute = searchAttributes.getNamedItem("type");
-      String searchType = searchAttribute.getNodeValue();
-
-      searchAttribute = searchAttributes.getNamedItem("name");
+      Node searchAttribute = searchAttributes.getNamedItem(GSXML.TYPE_ATT);
+      String searchType = null;
+      if (searchAttribute != null) {
+          searchType = searchAttribute.getNodeValue();
+      } else {
+          System.out.println("no "+GSXML.TYPE_ATT+" attribute found for the "+GSXML.SEARCH_ELEM+" element, assuming mg");
+          searchType = MGIndexer.MG_INDEX_TYPE;
+      }
+      
+      searchAttribute = searchAttributes.getNamedItem(GSXML.NAME_ATT);
       String searchName = null;
-
       if (searchAttribute != null) {
-        searchName = searchAttribute.getNodeValue();
+          searchName = searchAttribute.getNodeValue();
       }
 
@@ -249 +273 @@
       buildManager.addIndexer(indexer);
     }
-    else if (name.equals("browse"))
+    else if (name.equals(GSXML.BROWSE_ELEM))
     { this.configureBrowsers(buildManager, children.item(c));
     }
@@ -276 +300 @@
 
   public String getEtcDirectory()
-  { return this.collectionHome + File.separator + "etc";
+  
+  { return GSFile.collectionEtcDir(this.collectionHome);
   }
 
   public String getImportDirectory()
-  { return this.collectionHome + File.separator + "import";
+  { return GSFile.collectionImportDir(this.collectionHome);
   }
 
   public String getBuildDirectory()
-  { return this.collectionHome + File.separator + "building";
+  { return GSFile.collectionBuildDir(this.collectionHome);
   }
 
   public String getArchiveDirectory()
-  { return this.collectionHome + File.separator + "archives";
+  { return GSFile.collectionArchiveDir(this.collectionHome);
   }