Changeset 15927 for other-projects/trunk/gsinstaller

Timestamp:

2008-06-09T14:34:46+12:00 (16 years ago)

Author:

anna

Message:

The old method for checking free disk space overflows (returns a negative number) when the physical free disk space is bigger than 4G. So instead of comparing by byte, now we compare by K. The return type is also changed, from unsigned long to double.

Location:

other-projects/trunk/gsinstaller

Files:

• DiskSpace.cpp (modified) (1 diff)
• DiskSpace.h (modified) (1 diff)
• README.txt (modified) (1 diff)
• fileCopier.cpp (modified) (3 diffs)
• fileCopier.h (modified) (1 diff)

other-projects/trunk/gsinstaller/DiskSpace.cpp

@@ -54 +54 @@
 }
 
-unsigned long DiskSpace::totalFreeSpace()
-{ return this->freeClusters * this->sectorsPerCluster * this->bytesPerSector;
+unsigned double DiskSpace::totalFreeSpace()
+{   return this->freeClusters * (((double) (this->sectorsPerCluster * this->bytesPerSector)) / (double) (1024));
 }
 

other-projects/trunk/gsinstaller/DiskSpace.h

@@ -15 +15 @@
   int                   fileClusters(int fileSize);
   BOOL                  initialisedOk();
-  unsigned long totalFreeSpace();
+  unsigned double totalFreeSpace();
 };
 

other-projects/trunk/gsinstaller/README.txt

@@ -16 +16 @@
 1. C:\MSDEV\bin\VCVARS32.bat
 2. nmake /f win32.mak (in the gsinstaller directory)
+
+Note: stlport.zip is required for compiling. This file is avaible in Greenstone SVN at http://svn.greenstone.org/gsdl/trunk/packages/windows/stlport/. Download and unzip the zip file, and change the include path in win32.mak accordingly.

other-projects/trunk/gsinstaller/fileCopier.cpp

@@ -216 +216 @@
 }
 
-unsigned long fileCopySet::getCopiedSize(DiskSpace &space)
+unsigned double fileCopySet::getCopiedSize(DiskSpace &space)
 {
   // initialise counters for size
@@ -229 +229 @@
       here ++;
     }
-  return copiedSize;
+  return (double) copiedSize / (double) 1024;
 }
 
@@ -303 +303 @@
       if (space.totalFreeSpace() < copiedSize)
     {
+      char buffer[100];
+      sprintf(buffer, "Total free space on disk %3.1fMb, but the size of the copied collection is %3.1fMb", (double) space.totalFreeSpace() / (double) (1024), (double) copiedSize / (double) (1024));        
+      MessageBox(0, buffer, "Greenstone Installer", MB_OK);
+
       return false;
     }

other-projects/trunk/gsinstaller/fileCopier.h

@@ -29 +29 @@
   unsigned long getOriginalSize();
   unsigned long getOriginalFiles();
-  unsigned long getCopiedSize(DiskSpace &space);
+  unsigned double getCopiedSize(DiskSpace &space);
   bool ensureParent(FilePath &child, fileCopyMonitor *monitor);
   bool copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar);