commit ad4cb0167ecc0861f74282aa9902e1b68ecea999
author Akron <nils@diewald-online.de> Mon Oct 24 19:15:09 2016 +0200
committer Akron <nils@diewald-online.de> Mon Oct 24 19:15:09 2016 +0200
tree 866a5c928b96dd2c6203df991b8dbcef5d7b419c
parent 087d5dbaaad7f6a975ce6c1e8df8988e202fd7c6
parent b3e9ccd8f24c3a7a5c8dbefc3fa2e1d0460da62d

Fixed conflict

Change-Id: Ifdcfb816f5c842dcaa5d1c29c177d25196353b4c

lib/KorAP/XML/Krill.pm

diff --git a/lib/KorAP/XML/Krill.pm b/lib/KorAP/XML/Krill.pm
index f94c07b..6f3731d 100644
--- a/lib/KorAP/XML/Krill.pm
+++ b/lib/KorAP/XML/Krill.pm
@@ -13,7 +13,7 @@
 use Cache::FastMmap;
 use Mojo::DOM;
 use Data::Dumper;
-use File::Spec::Functions qw/catdir catfile catpath splitdir splitpath rel2abs/;
+use File::Spec::Functions qw/catdir catfile catpath splitdir splitpath rel2abs rootdir/;
 
 our $VERSION = '0.21';
 
@@ -108,7 +108,7 @@
     $self->log->warn($unable . ': No primary data found');
     return;
   };
-  
+
   # Associate primary data
   $self->{pd} = KorAP::XML::Document::Primary->new($pd);
 
@@ -119,7 +119,8 @@
   # and the text file for meta information
   foreach (0..2) {
     # Removed starting '/'
-    unshift @header, catfile(@path, 'header.xml');
+
+    unshift @header, catfile(rootdir(), @path, 'header.xml');
     pop @path;
   };
 

script/korapxml2krill

diff --git a/script/korapxml2krill b/script/korapxml2krill
index 42292ad..72ba265 100644
--- a/script/korapxml2krill
+++ b/script/korapxml2krill
@@ -470,6 +470,9 @@
       # Create temporary file
       $temp = File::Temp->newdir;
 
+      # TODO: Check if $filename exist at the beginning,
+      # because extraction can be horrible slow!
+
       # Extract from archive
       if ($archive->extract($dirs[$i], $temp)) {