Ark: Fix expected columns orderfix/ark/115

This resolves #115.

Signed-off-by: Philippe Mavridis <philippe.mavridis@yandex.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/ark/arch.cpp b/ark/arch.cpp
index 1b2d08e..a909084 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -353,7 +353,9 @@ bool Arch::processLine( const TQCString &line )
         continue; // More?
       else
       {
-        kdDebug(1601) << "processLine failed to match critical column" << endl;
+        kdDebug(1601) << "processLine failed to match critical column "
+                      << "(failing pattern: " << curCol->pattern.pattern() << ")"
+                      << endl;
         return false;
       }
     }
diff --git a/ark/zip.cpp b/ark/zip.cpp
index 598f5fd..5ba5d7e 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -63,9 +63,9 @@ ZipArch::ZipArch( ArkWidget *_gui, const TQString & _fileName )
   m_archCols.append( new ArchColumns( 2, TQRegExp( "[^\\s]+" ) ) );
   m_archCols.append( new ArchColumns( 3, TQRegExp( "[0-9]+" ) ) );
   m_archCols.append( new ArchColumns( 4, TQRegExp( "[0-9.]+%" ) ) );
-  m_archCols.append( new ArchColumns( 7, TQRegExp( "[0-9]{4}" ), 4 ) );
   m_archCols.append( new ArchColumns( 8, TQRegExp( "[01][0-9]" ), 2 ) );
   m_archCols.append( new ArchColumns( 9, TQRegExp( "[0-3][0-9]" ), 2 ) );
+  m_archCols.append( new ArchColumns( 7, TQRegExp( "[0-9]{4}" ), 4 ) );
   m_archCols.append( new ArchColumns( 10, TQRegExp( "[0-9:]+" ), 6 ) );
   m_archCols.append( new ArchColumns( 6, TQRegExp( "[a-fA-F0-9]+ {2}" ) ) );
   m_archCols.append( new ArchColumns( 0, TQRegExp( "[^\\n]+" ), 4096 ) );