Changeset 3438

Timestamp:

2002-10-04T11:24:49+12:00 (22 years ago)

Author:

kjdon

Message:

added library name to the config class - dont assume that its always 'library' anymore

Location:

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

Files:

• LibraryServlet.java (modified) (1 diff)
• util/ConfigVars.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -32 +32 @@
 
     config_ = new ConfigVars();
+    String library_name_ = config.getInitParameter("libraryname");
     String sites_home_ = config.getInitParameter("siteshome");
     String site_name_ = config.getInitParameter("sitename");
     String interfaces_home_ = config.getInitParameter("interfaceshome");
     String interface_name_ = config.getInitParameter("interfacename");
-    if (sites_home_ == null || site_name_==null || interfaces_home_ ==null || interface_name_==null) {
+    if (library_name_ == null || sites_home_ == null || site_name_==null || interfaces_home_ ==null || interface_name_==null) {
         // must have this
         System.err.println("initialisation parameters not all set!");
-        System.err.println(" you must have siteshome, sitename, interfaceshome, interfacename");
+        System.err.println(" you must have libraryname, siteshome, sitename, interfaceshome, interfacename");
         System.exit(1);
     }
 
+    config_.library_name_ = library_name_;
     config_.sites_home_ = sites_home_;
     config_.site_name_ = site_name_;

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/ConfigVars.java

@@ -10 +10 @@
 public class ConfigVars {
 
+    public String library_name_=null;
     public String sites_home_=null;
     public String site_name_=null;
@@ -22 +23 @@
 
     config_xml_ = doc.createElement("config");
-    Element e = GSXML.createTextElement(doc, "sites_home", sites_home_);
+    Element e = GSXML.createTextElement(doc, "library_name", library_name_);
+    config_xml_.appendChild(e);
+    e = GSXML.createTextElement(doc, "sites_home", sites_home_);
     config_xml_.appendChild(e);
     e = GSXML.createTextElement(doc, "site_name", site_name_);