Index: win_installer/src/installer.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/src/Attic/installer.nsi,v
diff -u -r1.29 -r1.30
--- win_installer/src/installer.nsi	5 Dec 2006 02:03:45 -0000	1.29
+++ win_installer/src/installer.nsi	15 Dec 2006 02:32:19 -0000	1.30
@@ -750,14 +750,9 @@
     ${EndIf}
     */
     
-    ${if} $RETAIN_FILES == '1'
-        #replace the install dump with the retained dump
-        #MessageBox MB_OK|MB_ICONEXCLAMATION "Rebuilding datbase" 
-        CopyFiles "$INSTDIR\backup\lamsDump.sql" "dump.sql"
-        DetailPrint "Using retained database: $INSTDIR\backup\lamsDump.sql"
-    ${endif}
     
     
+    
     # use Ant to import database
     DetailPrint '$INSTDIR\apache-ant-1.6.5\bin\ant.bat import-db'
     nsExec::ExecToStack '$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat import-db'
@@ -774,6 +769,23 @@
         goto error
     ${EndIf}
     
+    ${if} $RETAIN_FILES == '1'
+        #replace the install dump with the retained dump
+        #CopyFiles "$INSTDIR\backup\lamsDump.sql" "$TEMP\dump.sql"
+        DetailPrint "Using retained database: $INSTDIR\backup\lamsDump.sql"
+        strcpy $0 "$MYSQL_DIR\bin\mysql $DB_NAME -uroot - p$MYSQL_ROOT_PASS < $INSTDIR\backup\lamsDump.sql"
+        nsExec::ExecToStack $0
+        pop $1
+        pop $2
+        DetailPrint $0
+        DetailPrint $1
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Rebuilding datbase $\n$0 $\n$1 $\n$2" 
+    
+        ${if} $0 != 0
+            goto error
+        ${endif}
+    ${endif}
+    
     goto done
     
     error:
@@ -838,12 +850,12 @@
 FunctionEnd
 
 Function SetupStartMenu
-	CreateDirectory "$SMPROGRAMS\LAMSv2"
+    CreateDirectory "$SMPROGRAMS\LAMSv2"
     CreateShortCut "$SMPROGRAMS\LAMSv2\Access LAMS.lnk" "http://$LAMS_DOMAIN:$LAMS_PORT/lams/"
     CreateShortCut "$SMPROGRAMS\LAMSv2\LAMS Community.lnk" "http://www.lamscommunity.org"
-	CreateShortCut "$SMPROGRAMS\LAMSv2\Start LAMS.lnk" "$INSTDIR\lams-start.exe"
-	CreateShortCut "$SMPROGRAMS\LAMSv2\Stop LAMS.lnk" "$INSTDIR\lams-stop.exe"
-	CreateShortCut "$SMPROGRAMS\LAMSv2\Uninstall LAMS.lnk" "$INSTDIR\lams-uninstall.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Start LAMS.lnk" "$INSTDIR\lams-start.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Stop LAMS.lnk" "$INSTDIR\lams-stop.exe"
+    CreateShortCut "$SMPROGRAMS\LAMSv2\Uninstall LAMS.lnk" "$INSTDIR\lams-uninstall.exe"
 FunctionEnd
 
 
@@ -1124,4 +1136,4 @@
     RMDir /r "$SMPROGRAMS\LAMSv2"
     DetailPrint "Removed start menu entries."
     DetailPrint "Uninstall complete."
-SectionEnd
+SectionEnd
\ No newline at end of file