Changeset 7a75401 in tol

Timestamp:

Jun 24, 2010, 1:52:18 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

c92c7d9

Parents:

4e559163

Message:

Refs #922
Fixes syntax an logical errors

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2320 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/PackArchive

Files:

• PackArchive.cpp (modified) (3 diffs)
• StoreZipArchive.cpp (modified) (19 diffs)

tol/PackArchive/PackArchive.cpp

@@ -48 +48 @@
 HashStoreByHandle Store::_instances;
 bool Store::_isInitialized = false;
-int Store::_uniqueId = 0;
-
+int Store::_uniqueId = 1;
+
+bool _Store_initialize_ = Store::Initialize(); 
 
 
@@ -164 +165 @@
 //--------------------------------------------------------------------
   DeclareContensClass(BDat, BDatTemporary, BDatPackArchiveOpen);
-  DefExtOpr(1, BDatPackArchiveOpen, "PackArchive.Open", 1, 1, "Text",
+  DefExtOpr(1, BDatPackArchiveOpen, "PackArchive.Open", 
+  3, 3, "Text Text Text",
   "(Text engine, Text path, Text openMode)",
   I2("Open a packed archive for reading if openMode=='r' or writing "
@@ -197 +199 @@
   if(store)
   {
+    store->Close();
     delete store;
     contens_ = true;

tol/PackArchive/StoreZipArchive.cpp

@@ -47 +47 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   _path = path; 
   _openMode = openMode; 
@@ -55 +56 @@
     {
       remove(_path); 
-      _zip.Open(_path, CZipArchive::zipCreate);
+      _zip.Open(_path.String(), CZipArchive::zipCreate);
     }
     else if(openMode=='r')
     {
-      _zip.Open(_path, CZipArchive::zipOpenReadOnly, false);
+      _zip.Open(_path.String(), CZipArchive::zipOpenReadOnly, false);
     }
   }
@@ -81 +82 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   if(_openMode == ' ') { return(true); }
   bool ok = true;
@@ -107 +109 @@
 //--------------------------------------------------------------------
 {
-  bool ok = true;
-  try
-  {
-    _zip.AddNewFile(originalFilePath);
+  _errMsg[0]='\0';
+  bool ok = true;
+  try
+  {
+    _zip.AddNewFile(originalFilePath.String());
   }
   catch(CZipException ex)
@@ -120 +123 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 }
@@ -129 +133 @@
 //--------------------------------------------------------------------
 {
-  bool ok = true;
-  try
-  {
-    int index = _zip.FindFile(originalFilePath);
+  _errMsg[0]='\0';
+  bool ok = true;
+  try
+  {
+    int index = _zip.FindFile(originalFilePath.String());
     if((index>=0) && (index!=ZIP_FILE_INDEX_NOT_FOUND))
     {
-      _zip.ExtractFile(index, destinationDirPath);
+      _zip.ExtractFile(index, destinationDirPath.String());
     }
     else
@@ -151 +156 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 }
@@ -160 +166 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   int index = -1;
   bool ok = false;
   try
   {
-    index = _zip.FindFile(originalFilePath);
+    index = _zip.FindFile(originalFilePath.String());
     ok = ((index>=0) && (index!=ZIP_FILE_INDEX_NOT_FOUND));
   }
@@ -175 +182 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 }
@@ -184 +192 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   bool ok = true;
   try
@@ -193 +202 @@
       ZipArchiveLib::CNameFileFilter::toAll);
     // This will include empty directories
-    _zip.AddNewFiles(originalDirPath, filter);
+    _zip.AddNewFiles(originalDirPath.String(), filter);
   }
   catch(CZipException ex)
@@ -203 +212 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 }
@@ -212 +222 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   bool ok = true;
   try
@@ -218 +229 @@
     // find files using wildcards
     //zip.FindMatches(_T("file?.*"), indexes);    
-    _zip.FindMatches(_T(originalDirPath+"/*"), indexes);    
-    _tprintf(_T("Matches found at positions:\r\n"));
+    BText match = originalDirPath;
+    _zip.FindMatches(match.String(), indexes);    
     ok = indexes.GetCount()>0;
+    if(!ok)
+    {
+      sprintf(_errMsg, "[ZipArchive] Cannot find files to extract from archive "
+        "%s matching pattern '%s'",
+        _path.String(),  
+        match.String());
+    }
     for (ZIP_ARRAY_SIZE_TYPE i = 0; i < indexes.GetCount(); i++)
     {
@@ -229 +247 @@
   {
     ok = false;
-    sprintf(_errMsg, "[ZipArchive] Error while extracting from archive %s file %s to %s: %s",
+    sprintf(_errMsg, "[ZipArchive] Error while extracting from archive %s file "
+      "%s to %s: %s",
       _path.String(),  
       originalDirPath.String(),
@@ -235 +254 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 };
@@ -244 +264 @@
 //--------------------------------------------------------------------
 {
+  _errMsg[0]='\0';
   bool ok = true;
   try
@@ -250 +271 @@
     // find files using wildcards
     //zip.FindMatches(_T("file?.*"), indexes);    
-    _zip.FindMatches(_T(originalDirPath+"/*"), indexes);    
-    _tprintf(_T("Matches found at positions:\r\n"));
+    BText match = originalDirPath+"/*";
+    _zip.FindMatches(match.String(), indexes);    
     ok = indexes.GetCount()>0;
   }
@@ -262 +283 @@
       (LPCTSTR)ex.GetErrorDescription());
   }
+  if(!ok) { Error(_errMsg); }
   return(ok);
 };