Changeset 388

Timestamp:

10/02/11 14:02:46 (13 years ago)

Author:

nanardon

Message:

• return an error on unknown options

File:

• server/trunk/web/lib/Sophie/Controller/Chat/Cmd.pm (modified) (11 diffs)

server/trunk/web/lib/Sophie/Controller/Chat/Cmd.pm

@@ -77 +77 @@
     local @ARGV = @args;
 
-    GetOptions(%{ $options || {} });
-
-    return \@ARGV;
+    eval {
+        # Getopt::Long don't return the error but use warn
+        local $SIG{__WARN__} = sub { 
+            my ($message) = @_;
+            chomp($message);
+            $c->stash->{xmlrpc} = {
+                message => [ $message ]
+            };
+        };
+
+        GetOptions(%{ $options || {} }) or do {
+            $c->stash->{getopt_error} = 1;
+        };
+    };
+    if ($@) {
+        $c->stash->{getopt_error} = 1;
+    }
+
+    return [ @ARGV ];
 }
 
@@ -354 +370 @@
         }, @args ]) };
 
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
+
     my $res = $c->forward('/search/tags/name_regexp', $reqspec, $args[0]);
-    warn join(' ', @{ $res });
     if (!@{ $res }) {
         return $c->stash->{xmlrpc} = {
@@ -398 +417 @@
             's'   => sub { $reqspec->{src} = 1 },
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
+
     my $res = $c->forward('/search/rpm/description', [ $reqspec, @args ]);
 
@@ -455 +478 @@
             's'   => sub { $reqspec->{src} = 1 },
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
 
     if (!$c->forward('/distrib/exists', [ $reqspec ])) {
@@ -830 +856 @@
             's'   => sub { $reqspec->{src} = 1 },
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
 
     @args == 2 or do {
@@ -890 +919 @@
             's'   => sub { $reqspec->{src} = 1 },
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
 
     if (!$c->forward('/distrib/exists', [ $reqspec ])) {
@@ -942 +974 @@
             'a=s' => \$reqspec->{arch},
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
+
     if (!$c->forward('/distrib/exists', [ $reqspec ])) {
         return $c->stash->{xmlrpc} = {
@@ -1000 +1036 @@
             's'   => \$reqspec->{src},
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
 
     if (!$c->forward('/distrib/exists', [ $reqspec ])) {
@@ -1058 +1097 @@
             's'   => \$reqspec->{src},
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
 
     my ($type, $depname, $sense, $evr) = @args;
@@ -1107 +1149 @@
             's'   => \$reqspec->{src},
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
+
     if (!$c->forward('/distrib/exists', [ $reqspec ])) {
         return $c->stash->{xmlrpc} = {
@@ -1158 +1204 @@
             'd=s' => \$dist->{distribution},
         }, @args ]) };
+    if ($c->stash->{getopt_error}) {
+        return $c->stash->{xmlrpc};
+    }
+
     if (!$c->forward('/distrib/exists', [ $dist ])) {
         return $c->stash->{xmlrpc} = {