Changeset 29666

Timestamp:

2015-01-06T16:42:44+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Fixed bug in CLI commands (was assuming there to be multiple servlets)

File:

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

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

@@ -53 +53 @@
     my $file = shift;
     # The xml needs a root element, so we wrap it in one
-    my $xml='
-<!DOCTYPE doc [<!ENTITY real_doc SYSTEM "' . $file . '">] >
+    my $xml='<!DOCTYPE doc [<!ENTITY real_doc SYSTEM "' . $file . '">] >
     <__root__>
         &real_doc;
@@ -176 +175 @@
         };
         /^count$/i && do {
-            print "Found ", scalar @{$hash->{servlet}}, " servlets\n";
+            my $servlets = $hash->{servlet};
+            my $count = 1;
+            if (ref $servlets eq 'ARRAY') {
+                $count = scalar @{$hash->{servlet}};
+            }
+            print "Found ", $count, " servlets\n";
             last;
         };
         /^list$/i && do {
             print "Servlets:\n";
-            for my $servlet (@{$hash->{servlet}}) {
-                print "  ", $servlet->{'servlet-name'}, "\n";
+            my $servlets = $hash->{servlet};
+            if (ref $servlets eq 'ARRAY') {
+                for my $servlet (@{$hash->{servlet}}) {
+                    print "  ", $servlet->{'servlet-name'}, "\n";
+                }
+            } else {
+                print "  ", $servlets->{'servlet-name'}, "\n";
             }
             last;