Changeset 4787a45 in tol

Timestamp:

Oct 21, 2009, 2:30:51 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

6576368

Parents:

40de24b

Message:

Now CZipArchive::FindFile returns ZIP_FILE_INDEX_NOT_FOUND instead of -1 when the files is not found

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

Location:

tol/OIS

Files:

• oisstream_zip.cpp (modified) (6 diffs)
• tol_oisstream_zip.h (modified) (1 diff)

tol/OIS/oisstream_zip.cpp

@@ -131 +131 @@
   entries_ = 0;
   isOk_ = true;
-  BText action = I2("'INVALID ACTION'", "'ACCIÓN INVÁLIDA'");
+  BText action = I2("'INVALID ACTION'", "'ACCIN INVLIDA'");
   try
   {
@@ -137 +137 @@
     {
       action = I2("reading","lectura");
-      if(index<0)
+      if((index<0) || (index==ZIP_FILE_INDEX_NOT_FOUND))
       {
         index = sh_.zip_.FindFile(name_);
       }
-      isOk_ = index>=0;
+      isOk_ = ((index>=0) && (index!=ZIP_FILE_INDEX_NOT_FOUND));
       if(isOk_)
       {
@@ -153 +153 @@
     {
       action = I2("writing","escritura");
-    //int index = sh_.zip_.FindFile(name_);
-    //if(index>=0) { sh_.zip_.DeleteFile(index); }
-    //isOk_ = index<0;
     }
   }
@@ -230 +227 @@
     {
       sh_.zip_.AddNewFile(mf_, name_.String(), cmprsLvl_);
-                        //VBR: No sé porqué en linux no se cumple esta condición pero
+                        //VBR: No s porqu en linux no se cumple esta condicin pero
                         //luego todo parece funcionar bien.
       //assert(index_>=0);
@@ -424 +421 @@
 //Std(BText("\nOpening ZIP ")+connection_);
   openMode_ = openMode;
-  BText action = I2("'INVALID ACTION'", "'ACCIÓN INVÁLIDA'");
+  BText action = I2("'INVALID ACTION'", "'ACCIN INVLIDA'");
   try
   {
@@ -532 +529 @@
     index = -1;
   }
-  return(index>=0);
+  return((index>=0) && (index!=ZIP_FILE_INDEX_NOT_FOUND));
 }
 

tol/OIS/tol_oisstream_zip.h

@@ -41 +41 @@
   void Disconnect();
   BMedia Media() { return(BSHM_zip); }
-  BStream* Open(const char* title, const char* name, int index=-1);
+  BStream* Open(const char* title, const char* name, int index=ZIP_FILE_INDEX_NOT_FOUND);
   bool HasFile(const char* fileName) const;
   bool RemoveFiles(const BArray<BText>& files);