Changeset 29672

Timestamp:

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

Author:

Jeremy Symon

Message:

Added command to add a servlet. Config is given as commandline options. Variable numbers of arguments (such as init-params) are terminated with \; (similar to find -exec)

File:

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

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

@@ -165 +165 @@
 #      [1]: Function that is run for the command
 #      [2]: Number of arguments of the command (if any)
+#      [3]: True if the command has a variable number of args
 %commands = (
     help => [
@@ -182 +183 @@
     ],
     read => [
-        'Parses XML from a file into the internal state',
+        "Parses XML from a file into the internal state\n  input_file (- for STDIN)",
         sub {
             my $file = shift @ARGV;
@@ -206 +207 @@
                         $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};
-                    }
+                    push @{$hash->{$key}},
+                        (ref $new->{$key} eq 'ARRAY' ? @{$new->{$key}} : $new->{$key});
                 } else {
                     $hash->{$key} = $new->{$key};
@@ -221 +217 @@
     ],
     write => [
-        'Writes the current internal state as XML to a file',
+        "Writes the current internal state as XML to a file\n  output_file (- for STDOUT)",
         sub {
             my $file = shift @ARGV;
@@ -287 +283 @@
         1,
     ],
+    add => [
+        "Adds a new servlet to the current internal state\n  name description class [param=value param2=value...] ;",
+        sub {
+            my %servlet = (
+                'servlet-name' => shift @ARGV,
+                'description'  => shift @ARGV,
+                'servlet-class'=> shift @ARGV,
+                'init-param'   => [],
+            );
+            while (@ARGV) {
+                my $param = shift @ARGV;
+                $param eq ';' and last;
+                my ($key, $value) = split '=', $param, 2;
+                (defined $key and defined $value) or die "Expected params in form 'param=value'\n";
+                push @{$servlet{'init-param'}}, {
+                    'param-name'  => $key,
+                    'param-value' => $value,
+                };
+            }
+            if (defined $hash->{servlet}) {
+                unless (ref $hash->{servlet} eq 'ARRAY') {
+                    $hash->{servlet} = [ $hash->{servlet} ];
+                }
+                push @{$hash->{servlet}}, \%servlet;
+            } else {
+                $hash->{servlet} = \%servlet;
+            }
+        },
+        3,
+        1,
+    ],
 );
 
 # Check that all given commands are valid
 my $argc = 0;
+my $varargs = 0;
 for my $cmd (@ARGV) {
-    if ($argc > 0) {
+    if ($varargs and $cmd eq ';') {
+        $varargs = 0;
+    } elsif ($argc > 0) {
         # skip arguments to a previous command
         $argc --;
+    } elsif ($varargs) {
     } elsif (defined $commands{$cmd}) {
         # get the argument count of a valid command
         $argc = @{$commands{$cmd}}[2];
         defined $argc or ($argc = 0);
+        $varargs = @{$commands{$cmd}}[3];
     } else {
         # invalid command
@@ -306 +338 @@
     }
 }
-$argc > 0 and die "Expected $argc more argument" . ($argc > 1 ? "s" : "") . "\n";
+$argc != 0 and die "Expected $argc more argument" . ($argc != 1 ? "s" : "") . "\n";
+$varargs and die "Unclosed vararg command. Add an argument ';' to close the varargs\n";
 
 # Run the commands