Changeset 18770 for greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java

Timestamp:

2009-03-24T16:03:39+13:00 (15 years ago)

Author:

ak19

Message:

On error, the correct location of the logs folder needs to be displayed which is different between GS2 and GS3, so this is set by the subclass constructors.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/server/BaseServer.java

@@ -36 +36 @@
     protected boolean configure_required_ = true;
     protected String gsdl_home;
+    protected String logs_folder;
     protected BaseServerControl server_control_;    
     
-    protected BaseServer(String gsdl_home, String lang, String build_properties_path)
+    protected BaseServer(String gsdl_home, String lang, String build_properties_path, String logs)
     {
     this.gsdl_home = gsdl_home;
+    // expand the relative location of the logs folder
+    this.logs_folder = this.gsdl_home+File.separator+logs;
 
     // make sure we write to the correct logs
@@ -134 +137 @@
     
     protected void recordError(String message){
-        message = dictionary.get("ServerControl.Error",new String[]{message,gsdl_home});
+        message = dictionary.get("ServerControl.Error",new String[]{message,logs_folder});
     server_control_.displayMessage(message);
     logger_.error(dictionary.get("ServerControl.Failed",new String[]{message}));
@@ -141 +144 @@
 
     protected void recordError(String message, Exception e){
-        message = dictionary.get("ServerControl.Error",new String[]{message,gsdl_home});
+        message = dictionary.get("ServerControl.Error",new String[]{message,logs_folder});
     server_control_.displayMessage(message);
     logger_.error(dictionary.get("ServerControl.Failed",new String[]{message}),e);