Changeset 7468

Timestamp:

2004-05-27T14:12:54+12:00 (20 years ago)

Author:

cs025

Message:

Used URLTools to get File converted to URL

File:

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

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

@@ -41 +41 @@
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.XMLConverter;
-
+import org.greenstone.gsdl3.util.URLTools;
 
 /**
@@ -60 +60 @@
   GS3SQLConnection   database;       // the database to store everything in
   String             collectionHome;
-    String           siteHome;
+  String             siteHome;
   String             collectionName;
-    String           qualifiedCollectionName; // used as the database name 
-
-    BuildManager     buildManager;
+  String             qualifiedCollectionName; // used as the database name 
+
+  BuildManager       buildManager;
    
   class CollectionClassifier
@@ -113 +113 @@
 
     public ClassifierInterface getClassifier()
-    {
-     ClassifierInterface classifier = null;
+    { ClassifierInterface classifier = null;
 
       if (this.type == null) {
@@ -120 +119 @@
       }
       System.out.println(this.type.toLowerCase());
+      
       if (this.type.toLowerCase().equals("hierarchy")) {
-      classifier = new HierarchyClassifier(this.className, this.file, this.fields, this.sort);
+    classifier = new HierarchyClassifier(this.className, this.file, this.fields, this.sort);
       }
       else if (this.type.toLowerCase().equals("azlist")) {
-      classifier = new AZListClassifier(this.className, this.fields);
+    classifier = new AZListClassifier(this.className, this.fields);
       }
 
@@ -137 +137 @@
    *  @param collection <code>String</code> the name of the 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;
-    }
-    
+  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);
+      System.out.println("Error: Non-existant site ("+site+") specified");
+      System.exit(1);
     }
     site_dir = null;
@@ -157 +157 @@
     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);
+      System.out.println("Error: Non-existant collection ("+collection+") specified in site "+site);
+      System.exit(1);
     }
     collect_dir = null;
@@ -165 +165 @@
     this.qualifiedCollectionName = site+"_"+collection;
 
-      this.database = GS3SQLConnectionFactory.createConnection(this.qualifiedCollectionName);
+    this.database = GS3SQLConnectionFactory.createConnection(this.qualifiedCollectionName);
     /*    if (this.database != null) {
       this.database.clearCollection(collection);
@@ -178 +178 @@
     this.metadata = new CollectionMetadata();
 
-    
     File buildDirectory = new File(GSFile.collectionBuildDir(this.collectionHome));
     if (!buildDirectory.exists()) {
@@ -201 +200 @@
 
     try {
-      etcURL = new URL("file://"+etcFile.toString());
+      etcURL = URLTools.getFileURL(etcFile);
     }
     catch (java.net.MalformedURLException malEx) {