Changeset d74c90b in tol

Timestamp:

May 28, 2010, 11:44:33 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

bcf71ac

Parents:

3bb2203

Message:

Fixes #912

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

File:

• tol/OIS/oisstream_zip.cpp (modified) (6 diffs)

tol/OIS/oisstream_zip.cpp

@@ -186 +186 @@
     header->SetTime(time);
     sh_.zip_.FlushBuffers();
+    sh_.zip_.OverwriteLocalHeader(index_);
+    sh_.zip_.RemoveCentralDirectoryFromArchive();
+    sh_.zip_.CommitChanges();
   }
   catch(CZipException ex)
@@ -213 +216 @@
   return(size);
 }
-
 
 //--------------------------------------------------------------------
@@ -231 +233 @@
       //assert(index_>=0);
     }
+    sh_.zip_.CommitChanges();
                 sh_.zip_.FlushBuffers();
         }
@@ -422 +425 @@
   openMode_ = openMode;
   BText action = I2("'INVALID ACTION'", "'ACCIN INVLIDA'");
+  if(write)
+  {
+    BDir path = connection;
+    if(path.Exist()) 
+    { 
+      if(path.IsDir())
+      {
+        BText msg = I2("Cannot ","No se puede ")+action+" ZIP "+
+          connection_+" due it is an existant directory";
+        if(errorWarning) { Error(msg); }
+        else             { Warning(msg); }
+        return(false);
+      }
+      else
+      {
+        remove(connection); 
+      }
+    }
+  }
   try
   {
@@ -498 +520 @@
   try
   {
+    if(openMode_==BSHOM_WRITE)
+    {
+      BArray<BText> arr;
+      arr.AllocBuffer(1);
+      arr[0] = name;
+      RemoveFiles(arr);
+    }
     fs = new BZipStream(*this);
     if(!fs->Open(title,name,openMode_,index))
@@ -548 +577 @@
     //Std(BText("TRACE BZipStreamHandler::RemoveFiles() 3.")+n+".1\n");
       files_.Add(str);
+      k++;
     //Std(BText("TRACE BZipStreamHandler::RemoveFiles() 3.")+n+".1\n");
     }