Changeset 22677

Timestamp:

2010-08-18T21:13:11+12:00 (14 years ago)

Author:

ak19

Message:

More changes for making the collectdir movable (ticket 152): (1) Changes to GLI code so that llssite and glisite are updated to contain the COLLECTHOME property to tell server.exe where the new collect dir is. (2) server.exe must be told that it needs to restart (so it can read the new collecthome).

Location:

main/trunk/greenstone2/runtime-src/src

Files:

• recpt/configaction.cpp (modified) (2 diffs)
• w32server/fnord.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/configaction.cpp

@@ -31 +31 @@
 #  include <windows.h>
 #endif
+
+// constant for restart/reconfigure windows message (same as in w32server/fnord)
+// http://msdn.microsoft.com/en-us/library/ms644931%28v=VS.85%29.aspx on WM_USER
+// (also RegisterWindowMessage Function at http://msdn.microsoft.com/en-us/library/ms644947%28v=VS.85%29.aspx
+// http://msdn.microsoft.com/en-us/library/ms644927%28v=VS.85%29.aspx)
+#define WM_RESTART WM_USER+1
 
 configaction::configaction () {
@@ -87 +93 @@
     textout << "configured release-collection\n";
 
+  } else if ((args["cmd"] == "restart")) {
+    if(!args["c"].empty()) {
+        remove_colservr(args["c"], logout);
+        textout << "configured release-collection for reconfigure-restart\n";
+    }
+    textout << "reconfigure-restart\n";
+#ifdef GSDL_LOCAL_LIBRARY
+    HWND gw = FindWindow("Greenstone Digital Library Software",
+             "Greenstone Digital Library Software");
+    PostMessage(gw, WM_RESTART, 0, 0);
+#endif
   } else if (args["cmd"] == "kill") {
     textout << "killed\n";

main/trunk/greenstone2/runtime-src/src/w32server/fnord.cpp

@@ -100 +100 @@
 #define RESTARTBUTTONY (MAINWINDOWHEIGHT-RESTARTBUTTONHEIGHT-15)
 
+// constant for restart/reconfigure windows message (same as in recpt/configaction.cpp)
+// http://msdn.microsoft.com/en-us/library/ms644931%28v=VS.85%29.aspx on WM_USER
+// (also RegisterWindowMessage Function at http://msdn.microsoft.com/en-us/library/ms644947%28v=VS.85%29.aspx
+// http://msdn.microsoft.com/en-us/library/ms644927%28v=VS.85%29.aspx)
+#define WM_RESTART WM_USER+1
+
 const char versionstring[] = "version " GSDL_VERSION;
 
@@ -1070 +1076 @@
     while (!init_done) {
       if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) {
-    if (Message.message == WM_QUIT) return Message.wParam;
-    if (!IsDialogMessage (MainWindow, &Message)) {
-      TranslateMessage(&Message); /* translate keyboard messages */
-      DispatchMessage(&Message);  /* return control to Windows NT */
-    }
+        if (Message.message == WM_QUIT) return Message.wParam;
+        if (!IsDialogMessage (MainWindow, &Message)) {
+            TranslateMessage(&Message); /* translate keyboard messages */
+            DispatchMessage(&Message);  /* return control to Windows NT */
+        }
       } else {
-    Sleep (1);
+        Sleep (1);
       }
     }
@@ -1157 +1163 @@
   
   for (;;) {
-    if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) {
-      if (Message.message == WM_QUIT) break;
-      if (!IsDialogMessage (MainWindow, &Message)) {
-    TranslateMessage(&Message); /* translate keyboard messages */
-    DispatchMessage(&Message);  /* return control to Windows NT */
-      }
-      
+    if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) { 
+        if (Message.message == WM_QUIT) {
+            break;
+        }
+        
+        if (Message.message == WM_RESTART) {
+            
+            read_settings(0);
+            if (!gsdl_init(false)) { // do the same as when restart library is pressed
+                MessageBox(NULL,"Error re-initializing gsdl: gsdl_init()", 
+                    "Error initialising GSDL", MB_OK|MB_SYSTEMMODAL);
+                // when Restart Library is pressed, exit(0) is called) but a break here
+                // will exit Greenstone same as with WM_QUIT msg above
+                break;
+            }           
+        }
+        
+        if (!IsDialogMessage (MainWindow, &Message)) {
+            TranslateMessage(&Message); /* translate keyboard messages */
+            DispatchMessage(&Message);  /* return control to Windows NT */
+        }  
     } else {
       if (DiffTickCounts (lastcheck, GetTickCount()) > 500) {