* Reorder file names of documentation

* Create upgrade-xxv-db.sql only with user data tables

2 files changed, 36 insertions, 15 deletions

diff --git a/lib/XXV/OUTPUT/Console.pm b/lib/XXV/OUTPUT/Console.pm
index dca6ee5..4358b88 100644
--- a/lib/XXV/OUTPUT/Console.pm
+++ b/lib/XXV/OUTPUT/Console.pm
@@ -628,7 +628,7 @@ sub pod {
     $modname = ucfirst($modname) if($modname eq 'GENERAL');
 
     my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname);
-    return $obj->err(gettext('Module %s not found!'), $modname)
+    return $obj->err(sprintf(gettext('Module %s not found!'), $modname))
         unless(-r $podfile);
     my $tmpdir = main::getModule('USER')->userTmp;
     my $outfile = sprintf('%s/%s_%d.pod', $tmpdir, $modname, time);
@@ -654,14 +654,24 @@ sub txtfile {
     my $filename = shift || return error('No file defined!');
     my $param = shift || {};
 
-    my $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename);
-    my $gzfile  = sprintf('%s/%s.txt.gz', $obj->{paths}->{DOCPATH}, $filename);
-
-    $txtfile = main::getModule('HTTPD')->unzip($gzfile)
-        if(! -r $txtfile and -e $gzfile and -r $gzfile);
-
+    my $txtfile = sprintf('%s/%s', $obj->{paths}->{DOCPATH}, $filename);
+    if(! -r $txtfile) {
+      $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename);
+      if(! -r $txtfile) {
+        my $gzfile  = sprintf('%s/%s.gz', $obj->{paths}->{DOCPATH}, $filename);
+        if(! -r $gzfile) {
+          $gzfile  = sprintf('%s/%s.txt.gz', $obj->{paths}->{DOCPATH}, $filename);
+          if(! -r $gzfile) {
+            my $e = $!;
+            error sprintf("Could not open file '%s/%s[.txt .gz txt.gz]! : %s", $obj->{paths}->{DOCPATH}, $filename, $e);
+            return $obj->err(sprintf(gettext("Could not open file '%s'! : %s"), $filename, $e));
+          }
+        }
+        $txtfile = main::getModule('HTTPD')->unzip($gzfile);
+      }
+    }
     my $txt = load_file($txtfile);
-    return $obj->message($txt, {tags => {first => "File: $filename.txt"}});
+    return $obj->message($txt, {tags => {first => "File: $filename"}});
 }
 
 # ------------------
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm
index 32b946c..e2bce79 100644
--- a/lib/XXV/OUTPUT/Html.pm
+++ b/lib/XXV/OUTPUT/Html.pm
@@ -752,17 +752,28 @@ sub txtfile {
     my $filename = shift || return error ('No file defined!');
     my $param = shift || {};
 
-    my $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename);
-    my $gzfile  = sprintf('%s/%s.txt.gz', $obj->{paths}->{DOCPATH}, $filename);
-
-    $txtfile = main::getModule('HTTPD')->unzip($gzfile)
-        if(! -r $txtfile and -r $gzfile);
+    my $txtfile = sprintf('%s/%s', $obj->{paths}->{DOCPATH}, $filename);
+    if(! -r $txtfile) {
+      $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename);
+      if(! -r $txtfile) {
+        my $gzfile  = sprintf('%s/%s.gz', $obj->{paths}->{DOCPATH}, $filename);
+        if(! -r $gzfile) {
+          $gzfile  = sprintf('%s/%s.txt.gz', $obj->{paths}->{DOCPATH}, $filename);
+          if(! -r $gzfile) {
+            my $e = $!;
+            error sprintf("Could not open file '%s/%s[.txt .gz txt.gz]! : %s", $obj->{paths}->{DOCPATH}, $filename, $e);
+            return $obj->err(sprintf(gettext("Could not open file '%s'! : %s"), $filename, $e));
+          }
+        }
+        $txtfile = main::getModule('HTTPD')->unzip($gzfile);
+      }
+    }
 
     my $topic = gettext("File");
 
     if($param->{'format'} eq 'txt') {
         my $txt = load_file($txtfile);
-        return $obj->message($txt, {tags => {first => "$topic: $filename.txt"}});
+        return $obj->message($txt, {tags => {first => "$topic: $filename"}});
     }
 
     my $u = main::getModule('USER');
@@ -776,7 +787,7 @@ sub txtfile {
     );
     my $html = load_file($htmlfile);
     $html = $1 if($html =~ /\<body.*?\>(.+?)\<\/body\>/si);
-    $obj->message($html, {tags => {first => "<h1>$topic: $filename.txt</h1>"}});
+    $obj->message($html, {tags => {first => "<h1>$topic: $filename</h1>"}});
 }
 
 # ------------------