Changeset 5889

Timestamp:

2003-11-19T12:14:36+13:00 (20 years ago)

Author:

jmt12

Message:

Added a new argument to the server, --cmd=init, which is used to generate the GSDLSite.cfg file without starting the server itself. Thus it can be run once during the Greenstone installation to create the file needed for GLI to run properly

File:

• trunk/gsdl/src/w32server/fnord.cpp (modified) (16 diffs)

trunk/gsdl/src/w32server/fnord.cpp

@@ -140 +140 @@
 int init_done = 0;
 
-void finish_up() {
+
+// Added an argument so you can specify not to do any of the windows orientated clean up - jmt12 18/11/2003
+void finish_up(bool init_only) {
   // remember the current preferences
   write_settings("");
 
-  // Shutdown the HTTP server
+  if(init_only) {
+    return;
+  }
+   
+ // Shutdown the HTTP server
   EndHTTPServer();
   
@@ -539 +545 @@
     break;
       case ID_PROJECT_EXIT:
-        finish_up();
+        finish_up(false);
         break;
       default:
@@ -556 +562 @@
     
   case WM_DESTROY:
-    finish_up();
+    finish_up(false);
     break;
     
@@ -669 +675 @@
             "Greenstone Digital Library Software", MB_OK|MB_APPLMODAL);
     PostMessage(MsgWindow,WM_CLOSE,0,0);
-    finish_up(); // will unload winsock
+    finish_up(false); // will unload winsock
     exit(0);      // nothing more to do
       }
@@ -831 +837 @@
 // --config=file (the path to the configuration file to use which defaults
 // to GSDLHOME\gsdlsite.cfg)
-static void parse_args(const text_t cmdline, text_t &location, text_t &config_file) {
+// --cmd=init  Used to initialize the gsdlsite.cfg file onlt - jmt12 18/11/2003
+static void parse_args(const text_t cmdline, text_t &location, text_t &config_file, text_t &command) {
 
   location.clear();
   config_file.clear();
+  command.clear(); // jmt12 18/11/2003
 
   if (cmdline.size() < 3) return;
@@ -849 +857 @@
       } else if (name == "config") {
     config_file = val;
+      } 
+      // jmt12 18/11/2003
+      else if(name == "cmd") {
+    command = val;
       }
       foundname = false;
@@ -869 +881 @@
     config_file = val;
   }
-}
-
-
+  // jmt12 18/11/2003
+  else if(name == "cmd") {
+    command = val;
+  }
+}
+
+// Added code to allow for an 'init' run of the server which just creates the gsdlsite.cfg file
 int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
   HWND MainWindow;  MSG Message;  WNDCLASS MainClass;  
 
   // parse arguments
-  text_t location, config_file;
-  parse_args(CmdLineStr, location, config_file);
+  text_t location, config_file, command;
+  parse_args(CmdLineStr, location, config_file, command);
   gsdl_conffile = config_file;
+
+  // jmt12 18/11/2003
+  if(command == "init") {
+    // init various modules
+    read_settings(0); // don't know if netscape is needed at this point
+    finish_up(true);
+    exit(0);
+  }
 
   //Create a window class
@@ -894 +918 @@
     return 0;
   
-
+  
   // Load various bitmaps
   coltitlebitmap = LoadBitmap (Instance, MAKEINTRESOURCE(GSDL_COL_TITLE));
   logobitmap= LoadBitmap (Instance, MAKEINTRESOURCE(GSDL_LOGO));
-
+  
   // Create the main window
   MainWindow = CreateWindow("Greenstone Digital Library Software", 
@@ -928 +952 @@
   GetTextMetrics(pdc, &tm);
   line_spacing = tm.tmHeight + tm.tmExternalLeading;
-  GSDL_Window = MainWindow;
-  
+  GSDL_Window = MainWindow;  
+
   // init various modules
   read_settings (0); // don't know if netscape is needed at this point
-
+  
   if (!gsdl_auto_enter) {
-
+    
     // add the select version checkbox
     Enter = CreateWindow("BUTTON",             // predefined class 
@@ -971 +995 @@
                   Instance, 
                   NULL);                   // pointer not needed 
-
+    
     HANDLE i_icon = LoadImage (Instance, MAKEINTRESOURCE(GSDL_ICBMP), IMAGE_BITMAP, 
                    INFOBUTTONWIDTH-4, ALTERNATIVEBUTTONHEIGHT-4, LR_DEFAULTCOLOR);
     SendMessage (InfoRestricted, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)i_icon);
-
+    
     SetFocus (Enter);
     
     enterstring = strenterlib;
     paint_window (pdc, windowRect);
-
+    
     // message loop for init buttons
     while (!init_done) {
@@ -993 +1017 @@
       }
     }
-
+    
     // don't want these buttons anymore
     DestroyWindow (Enter);
     DestroyWindow (EnterRestricted);
     DestroyWindow (InfoRestricted);
-
+    
     enterstring = strnothing;
     paint_window (pdc, windowRect);
-
+    
   } else {
     // auto enter is enabled - start up standard version
@@ -1007 +1031 @@
     init_done = 1;
   }
-
+  
   // draw the main window containing an init message
   infostring = strinit;
   paint_window (pdc, windowRect);
   DWORD lastcheck = GetTickCount();
-
+  
   have_networking = initnetwork (Instance, MainWindow);
   if (!have_networking) {
@@ -1020 +1044 @@
     exit (0);
   }
-
+  
   if (!gsdl_init()) // quit if can't initialise the library correctly
     exit (0);
   initstartbrowser();
   log_computer_info ();
-
+  
   // show the initialising message for at least 1 second
   while (DiffTickCounts (lastcheck, GetTickCount()) < 1000) {
@@ -1057 +1081 @@
   infostring = strrestartlib;
   paint_window (pdc, windowRect);
-
+  
   // release the DC used to display the init messages
   ReleaseDC (MainWindow, pdc);
@@ -1110 +1134 @@
     } else {
       // no browser was found
-
+      
       if (seenbrowser) {
         // we have seen a browser in the past
@@ -1130 +1154 @@
   return Message.wParam;
 }
+