Changeset 18650 for gli/trunk

Timestamp:

2009-03-10T13:42:44+13:00 (15 years ago)

Author:

ak19

Message:

Renaming toplevel gsdlsite.cfg to llssite.cfg (lls = local library server)

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (15 diffs)

gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -45 +45 @@
     static final private String QUIT_COMMAND = "?a=config&cmd=kill";
 
-    static private GSDLSiteConfig gsdlsite_cfg_file = null;
+    static private LLSSiteConfig llssite_cfg_file = null;
     static private File local_library_server_file = null;
 
@@ -97 +97 @@
     {
     if (!running) return false;
-    gsdlsite_cfg_file.load();
-    if (gsdlsite_cfg_file.getURL() == null)  return false;
+    llssite_cfg_file.load();
+    if (llssite_cfg_file.getURL() == null)  return false;
     return true;
     }
@@ -124 +124 @@
 
     // Check if the server is already running
-    gsdlsite_cfg_file = new GSDLSiteConfig(local_library_server_file);
-    String url = gsdlsite_cfg_file.getURL();
+    llssite_cfg_file = new LLSSiteConfig(local_library_server_file);
+    String url = llssite_cfg_file.getURL();
     if (url != null) {
         // If it is already running then set the Greenstone web server address and we're done
@@ -139 +139 @@
 
     // Configure the server for immediate entry
-    //gsdlsite_cfg_file.set();
+    //llssite_cfg_file.set();
 
     // Spawn local library server process
-    String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + gsdlsite_cfg_file.getSiteConfigFilename();
+    String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + llssite_cfg_file.getSiteConfigFilename();
     Gatherer.spawnApplication(local_library_server_command);
 
     // Wait until program has started, by reloading and checking the URL field
-    gsdlsite_cfg_file.load();
+    llssite_cfg_file.load();
     int attempt_count = 0;
-    while (gsdlsite_cfg_file.getURL() == null) {
+    while (llssite_cfg_file.getURL() == null) {
         new OneSecondWait();  // Wait one second (give or take)
-        gsdlsite_cfg_file.load();
+        llssite_cfg_file.load();
         attempt_count++;
 
@@ -165 +165 @@
     // Ta-da. Now the url should be available
     try {
-        Configuration.library_url = new URL(gsdlsite_cfg_file.getURL());
+        Configuration.library_url = new URL(llssite_cfg_file.getURL());
     }
     catch (MalformedURLException exception) {
@@ -180 +180 @@
         try {
         // If this fails then we try changing the url to be localhost
-        Configuration.library_url = new URL(gsdlsite_cfg_file.getLocalHostURL());
+        Configuration.library_url = new URL(llssite_cfg_file.getLocalHostURL());
         DebugStream.println("Try connecting to server on local host: '" + Configuration.library_url + "'");
         URLConnection connection = Configuration.library_url.openConnection();
@@ -206 +206 @@
 
     // Wait until program has stopped, by reloading and checking the URL field
-    gsdlsite_cfg_file.load();
+    llssite_cfg_file.load();
     int attempt_count = 0;
-    while (gsdlsite_cfg_file.getURL() != null) {
+    while (llssite_cfg_file.getURL() != null) {
         new OneSecondWait();  // Wait one second (give or take)
-        gsdlsite_cfg_file.load();
+        llssite_cfg_file.load();
         attempt_count++;
 
@@ -223 +223 @@
     }
 
-    // Restore the gsdlsite_cfg.
-    gsdlsite_cfg_file.restore();
+    // Restore the llssite_cfg.
+    llssite_cfg_file.restore();
 
     // If the local server is still running then our changed values will get overwritten.
-    if (gsdlsite_cfg_file.getURL() != null) {
+    if (llssite_cfg_file.getURL() != null) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitManual"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
     }
@@ -236 +236 @@
     static public void checkServerRunning() {
     if (!running) return; // don't worry about it if its not supposed to be running 
-    gsdlsite_cfg_file.load();
-    if (gsdlsite_cfg_file.getURL() == null) {
+    llssite_cfg_file.load();
+    if (llssite_cfg_file.getURL() == null) {
         // need to restart the server again
-        gsdlsite_cfg_file.set();
+        llssite_cfg_file.set();
 
         // Spawn local library server process
-        String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + gsdlsite_cfg_file.getSiteConfigFilename();
+        String local_library_server_command = local_library_server_file.getAbsolutePath() + " " + llssite_cfg_file.getSiteConfigFilename();
         Gatherer.spawnApplication(local_library_server_command);
 
@@ -262 +262 @@
 
 
-    static public class GSDLSiteConfig
+    static public class LLSSiteConfig
     extends LinkedHashMap {
-    private File gsdlsite_cfg;
+    private File llssite_cfg;
     private File glisite_cfg;
     private String autoenter_initial;
@@ -275 +275 @@
     static final private String GLISITE_CFG = "glisite.cfg";
     static final private String GSDL = "gsdl";
-    static final private String GSDLSITE_CFG = "gsdlsite.cfg";
+    static final private String LLSSITE_CFG = "llssite.cfg";
     static final private String LOCAL_HOST = "http://localhost"; 
     static final private String PORTNUMBER = "portnumber";
@@ -284 +284 @@
     static final private String URL = "url";
 
-    public GSDLSiteConfig(File server_exe) {
-        debug("New GSDLSiteConfig for: " + server_exe.getAbsolutePath());
+    public LLSSiteConfig(File server_exe) {
+        debug("New LLSSiteConfig for: " + server_exe.getAbsolutePath());
         
-        gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG);
+        llssite_cfg = new File(server_exe.getParentFile(), LLSSITE_CFG);
         glisite_cfg = new File(server_exe.getParentFile(), GLISITE_CFG);
 
@@ -293 +293 @@
         if(glisite_cfg.exists()) {
         configFile = glisite_cfg;
-        } else if(gsdlsite_cfg.exists()) {
-        configFile = gsdlsite_cfg;
+        } else if(llssite_cfg.exists()) {
+        configFile = llssite_cfg;
         } else {
-        debug("Neither the file glisite.cfg nor GSDLsite.cfg can be found!");
+        debug("Neither the file glisite.cfg nor llssite.cfg can be found!");
         }
         
@@ -329 +329 @@
     
     public boolean exists() {
-        return gsdlsite_cfg.exists();
+        return llssite_cfg.exists();
     }
 
@@ -449 +449 @@
 
     private void save() {
-        //debug("Save: " + gsdlsite_cfg.getAbsolutePath());
+        //debug("Save: " + llssite_cfg.getAbsolutePath());
         debug("Save: " + glisite_cfg.getAbsolutePath());
         try {
-        //BufferedWriter out = new BufferedWriter(new FileWriter(gsdlsite_cfg, false));
+        //BufferedWriter out = new BufferedWriter(new FileWriter(llssite_cfg, false));
         BufferedWriter out = new BufferedWriter(new FileWriter(glisite_cfg, false));
         for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {