Changeset 29678 for main/trunk/package-kits/scripts/gs-servlet.pl

Timestamp:

2015-01-09T14:24:10+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Moved xml i/o handling to the module for simplicity of use

File:

• main/trunk/package-kits/scripts/gs-servlet.pl (modified) (3 diffs)

main/trunk/package-kits/scripts/gs-servlet.pl

@@ -9 +9 @@
 
 use lib 'perllib';
-use XML::Tidy;
+use Greenstone::XML::Tidy;
 
 my $hash;
@@ -39 +39 @@
         "Parses XML from a file into the internal state\n  input_file (- for STDIN)",
         sub {
-            my $file = shift @ARGV;
-            my $new;
-            if ($file eq '-') {
-                if (isatty *STDIN) {
-                    print STDERR "Reading XML from STDIN. Press ^D to end\n";
-                }
-                $new = read_xml *STDIN;
-            } else {
-                open FH, '<', $file;
-                $new = read_xml *FH;
-                close FH;
-            }
+            my $new = read_xml shift @ARGV;
             # Append the new data to the current data
             for my $key (keys %$new) {
@@ -73 +62 @@
         "Writes the current internal state as XML to a file\n  output_file (- for STDOUT)",
         sub {
-            my $file = shift @ARGV;
-            if ($file eq '-') {
-                write_xml $hash, *STDOUT;
-            } else {
-                open FH, '>', $file;
-                write_xml $hash, *FH;
-                close FH;
-            }
+            write_xml $hash, shift @ARGV;
         },
         1,