From c5e6fb7227d4d30818ca013f0d2cf9bde60fcc25 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Fri, 3 Aug 2012 16:26:34 +0200
Subject: [PATCH] Bug 5600 follow-up: Fix commandline check in order to work
 under Plack

With plackup, @ARGV can contains elements so we can't check the size of
@ARGV to tell whether we are in command line mode or not.
Instead we check environment variable GATEWAY_INTERFACE.

Also fix the use of a global variable in a subroutine

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 tools/export.pl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/export.pl b/tools/export.pl
index c075b25c69..003a9c7f36 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -31,7 +31,6 @@ use Getopt::Long;
 
 my $query = new CGI;
 
-my $commandline = 0;
 my $op;
 my $filename;
 my $dbh         = C4::Context->dbh;
@@ -45,7 +44,9 @@ my $record_type;
 my $help;
 
 # Checks if the script is called from commandline
-if ( scalar @ARGV > 0 ) {
+my $commandline = not defined $ENV{GATEWAY_INTERFACE};
+
+if ( $commandline ) {
 
     # Getting parameters
     $op = 'export';
@@ -59,8 +60,6 @@ if ( scalar @ARGV > 0 ) {
         'record-type=s' => \$record_type,
         'help|?' => \$help
     );
-    $commandline = 1;
-
 
     if ($help) {
         print <<_USAGE_;
@@ -449,7 +448,7 @@ sub getbackupfilelist {
     if ( opendir(my $dir, $directory) ) {
         while (my $file = readdir($dir)) {
             next unless ( $file =~ m/\.$extension(\.(gz|bz2|xz))?/ );
-            push @files, $file if ( -f "$backupdir/$file" && -r "$backupdir/$file" );
+            push @files, $file if ( -f "$directory/$file" && -r "$directory/$file" );
         }
         closedir($dir);
     }
-- 
2.39.5