Changeset 6871 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3Search.java

Timestamp:

2004-02-24T11:10:50+13:00 (20 years ago)

Author:

kjdon

Message:

sql database name is now a combination of site name and coll name

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS3Search.java (modified) (2 diffs)

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

@@ -28 +28 @@
 import org.w3c.dom.NodeList; 
 
+import java.io.File;
 
 /**
@@ -115 +116 @@
     //}
     // open the database for querying
-    if (!database.setDatabase(this.cluster_name)) {
+    // the database name is a combination of site name and collection name
+
+    // check that site_home is set
+    if (this.site_home == null || this.site_home.equals("")) {
+        System.err.println("GS3Search Error: site_home is not set, so cannot work out the site name and cannot determine the database name");
+        return false;
+    }
+    String site_name = this.site_home.substring(this.site_home.lastIndexOf(File.separator)+1);
+    if (site_name.equals("")) {
+        System.err.println("GS3Search Error: Cannot extract the site name from site home: "+this.site_home);
+        return false;
+    }
+    if (!database.setDatabase(site_name+"_"+this.cluster_name)) {
         System.err.println("GS3Search Error: Could not open SQL database!");
         return false;