commit 3bdc0a36820036911421e4d12e7a12955b6f75d5
author Akron <nils@diewald-online.de> Mon Aug 03 12:12:56 2020 +0200
committer Peter Harders <harders@ids-mannheim.de> Wed Sep 23 11:41:07 2020 +0200
tree 230b4e7a7b957bffd94e204d34881b9a598b7c21
parent 52dc21b3b735d8f69e6e843c9a4b257e412aa9ee

Improve Zipper to support root directory and fix bug in root directory normalization

Change-Id: I7f00a347fb4616cb8ae7df63374633c21d7ab0ce

lib/KorAP/XML/TEI/Zipper.pm

diff --git a/lib/KorAP/XML/TEI/Zipper.pm b/lib/KorAP/XML/TEI/Zipper.pm
index c6d5143..c479239 100644
--- a/lib/KorAP/XML/TEI/Zipper.pm
+++ b/lib/KorAP/XML/TEI/Zipper.pm
@@ -19,8 +19,20 @@
 # Output parameter, that may be a file or a file handle.
 # Defaults to stdout.
 sub new {
-  my ($class, $out) = @_;
-  bless [$out // '-'], $class;
+  my ($class, $root_dir, $out) = @_;
+
+  if ($root_dir) {
+
+    # base dir must always end with a slash
+    $root_dir .= '/';
+
+    # remove leading /
+    # (only relative paths allowed in IO::Compress::Zip)
+    # and redundant ./
+    $root_dir =~ s/^\.?\/+//;
+  };
+
+  bless [$out // '-', undef, $root_dir // ''], $class;
 };
 
 
@@ -36,7 +48,7 @@
       TextFlag => 1,
       Method => $_COMPRESSION_METHOD,
       Append => 0,
-      Name => "$file"
+      Name => $self->[2] . $file
     ) or die $log->fatal("Zipping $file failed: $ZipError");
   }
 
@@ -47,7 +59,7 @@
       TextFlag => 1,
       Method => $_COMPRESSION_METHOD,
       Append => 1,
-      Name => "$file"
+      Name => $self->[2] . $file
     ) or die $log->fatal("Zipping $file failed: $ZipError");
   };