Changeset 29671 for main/trunk/package-kits

Timestamp:

2015-01-07T14:12:12+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Added ability to concatenate XML (which provides a basic way to add a servlet: 'servlet.pl read servlets.xml read - write servlets.xml' - read from the original file, then read from STDIN (where the new servlet can be added), then write to the original file)

File:

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

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

@@ -178 +178 @@
         sub {
             undef $hash;
+            $hash = {};
         }
     ],
@@ -184 +185 @@
         sub {
             my $file = shift @ARGV;
+            my $new;
             if ($file eq '-') {
                 if (isatty *STDIN) {
                     print STDERR "Reading XML from STDIN. Press ^D to end\n";
                 }
-                $hash = read_xml *STDIN;
+                $new = read_xml *STDIN;
             } else {
                 open FH, '<', $file;
-                $hash = read_xml *FH;
+                $new = read_xml *FH;
                 close FH;
+            }
+            # Append the new data to the current data
+            for my $key (keys %$new) {
+                if ($key eq '.attr' and defined $hash->{'.attr'}) {
+                    for my $attr ($new->{'.attr'}) {
+                        $hash->{'.attr'}->{$attr} = $new->{'.attr'}->{$attr};
+                    }
+                } elsif (defined $hash->{$key}) {
+                    if (ref $hash->{$key} ne 'ARRAY') {
+                        $hash->{$key} = [ $hash->{$key} ];
+                    }
+                    if (ref $new->{$key} eq 'ARRAY') {
+                        for my $elem (@{$new->{$key}}) {
+                            push @{$hash->{$key}}, $elem;
+                        }
+                    } else {
+                        push @{$hash->{$key}}, $new->{$key};
+                    }
+                } else {
+                    $hash->{$key} = $new->{$key};
+                }
             }
         },