Changeset 29667 for main/trunk/package-kits/linux/files/servlet.pl

Timestamp:

2015-01-07T11:06:08+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Added ability to write to stdout (set output file to '-')

File:

• main/trunk/package-kits/linux/files/servlet.pl (modified) (4 diffs)

main/trunk/package-kits/linux/files/servlet.pl

@@ -99 +99 @@
 sub write_servlets {
     my ($hash, $file) = @_;
-    open OUT, '>', $file;
+    my $OUT;
+    if ($file ne '-') {
+        open $OUT, '>', $file;
+        select $OUT;
+    }
     sub open_tag {
         my ($indent, $tag, $attr) = @_;
-        print OUT $indent, "<", $tag;
+        print $indent, "<", $tag;
         if (defined $attr) {
             for my $key (sort keys %$attr) {
-                print OUT " ", $key, '="', $attr->{$key}, '"';
-            }
-        }
-        print OUT ">";
+                print " ", $key, '="', $attr->{$key}, '"';
+            }
+        }
+        print ">";
     }
     sub write_xml {
@@ -116 +120 @@
             my $val = $hash->{$key};
             $key eq '.value' && do {
-                print OUT $val, "\n";
+                print $val, "\n";
                 next;
             };
@@ -125 +129 @@
                         for (ref $element) {
                             /^HASH$/ && do {
-                                print OUT "\n";
+                                print "\n";
                                 write_xml ("  $indent", $element);
-                                print OUT $indent, "</", $key, ">\n";
+                                print $indent, "</", $key, ">\n";
                                 last;
                             };
-                            print OUT $element, "</", $key, ">\n";
+                            print $element, "</", $key, ">\n";
                         }
                     }
@@ -140 +144 @@
                     # it can be formatted on one line
                     if (scalar keys %$val == 2 and defined $val->{'.value'}) {
-                        print OUT $val->{'.value'}, "</", $key, ">\n";
+                        print $val->{'.value'}, "</", $key, ">\n";
                     } else {
-                        print OUT "\n";
+                        print "\n";
                         write_xml ("  $indent", $val);
-                        print OUT $indent, "</", $key, ">\n";
+                        print $indent, "</", $key, ">\n";
                     }
                     last;
                 };
                 open_tag ($indent, $key);
-                print OUT $val;
-                print OUT "</", $key, ">\n";
+                print $val;
+                print "</", $key, ">\n";
             }
         }
     }
     write_xml ("", $hash);
-    close OUT;
-}
+    if (defined $OUT) {
+        close $OUT;
+    }
+    select STDOUT;
+}
+# The code above is for generic XML read/writing
+# The code below is specific to Greenstone's servlets.xml
 
 my $hash;