Changeset 2534 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2001-06-13T11:02:50+12:00 (23 years ago)

Author:

cs025

Message:

Added better monitoring of installation

File:

• trunk/gsinstaller/gsinstall.cpp (modified) (12 diffs)

trunk/gsinstaller/gsinstall.cpp

@@ -257 +257 @@
 
   // do the copy
-  this->manifest->copy(this->gsdlSourcePath);
-
-  return true;
+  return this->manifest->copy(this->gsdlSourcePath);
 }
 
@@ -413 +411 @@
   this->readLog();
   delete logPath;
-  
+
   return true;
 }
@@ -431 +429 @@
     {
       if (!this->manifest->undoAction(command, params))
-    { 
+    {
       if (!gsdlProfile.undoAction(command, params))
-        { 
+        {
           if (!this->gsRegister->undoAction(command, params))
-        { 
+        {
           if (!this->progman->undoAction(command, params))
             {
             }
+        else
+        {
+
+        }
         }
         }
     }
     }
-  
+
 }
 
@@ -456 +458 @@
     }
   if (this->installFullVolume)
-    {   
+    {
+      this->manifest->selectGroup("supporting", *this->dataDestPath);
       this->manifest->selectGroup("collection", *this->dataDestPath);
     }
   else
-    {   
+    {
       this->manifest->selectGroup("database", *this->dataDestPath);
     }
@@ -784 +787 @@
     }
       break;
-      
+
     case WM_NOTIFY:
       switch (((LPNMHDR) lParam)->code)
@@ -791 +794 @@
       {
         dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
-        
+
         // bodge to set the dialogue path to the correct value
         if (selector != rootSelector)
@@ -798 +801 @@
         SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
           }
-        
-        if (selector->isFinal())
-          {
-        PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_FINISH);
-          }
-        else
-          {
-        PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_NEXT);
-          }
+
+
+        PropSheet_SetWizButtons(GetParent(Dialog), (selector->isFirst() ? 0 : PSWIZB_BACK) |
+                                                 (selector->isFinal() ? PSWIZB_FINISH : PSWIZB_NEXT));
       }
       break;
@@ -856 +854 @@
 
 void GSInstall_init_propertySheet(PROPSHEETPAGE &ppage, char *prompt, char *optPrompt,
-                  char *title, GSInstall &installer, bool isFinal)
+                  char *title, GSInstall &installer, bool isFirst, bool isFinal)
 {
   GSInstall_dirPathData *data = new GSInstall_dirPathData;
@@ -862 +860 @@
   // create the directory Selector
   data->dirSelect = new dirSelector(prompt, optPrompt, title, installer.installPath());
+  data->dirSelect->setFirst(isFirst);
   data->dirSelect->setFinal(isFinal);
 
@@ -933 +932 @@
                 "Choose a directory to install your "
                                 "GreenStone software to.", NULL,
-                                "Select", install, false);
+                                "Select", install, true, false);
   GSInstall_init_propertySheet(ppage[1],
                    "Choose a directory to install the collection "
@@ -945 +944 @@
                    "computer.\n\n",
                    "Install all collection files",
-                   "Select", install, true);
+                   "Select", install, false, true);
 
   reply = (PropertySheet (&pshead) >= 0);
@@ -1041 +1040 @@
         install.setManifest();
 
-        install.copyFiles();       // caused page fault; Windows 3.1
+        if (!install.copyFiles())       // caused page fault; Windows 3.1
+      { MessageBox(0, "Not enough space to install required files", "Greenstone Installer", MB_OK);
+        install.abortLog();
+         DestroyWindow(Window);
+         return false;
+      }
         install.updateProgman();   // caused divide overflow; Windows 3.1
         install.updateRegistry();