Changeset 36

Timestamp:

11/25/10 03:34:05 (14 years ago)

Author:

nanardon

Message:

• propery call fetchdata

command line parsing is done by the Model

Location:

server/trunk/web/lib/Sophie

Files:

• Controller/Chat.pm (modified) (3 diffs)
• Controller/User.pm (modified) (1 diff)
• Model/Chat.pm (modified) (2 diffs)

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

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
-use Getopt::Long;
-use Text::ParseWords;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -27 +25 @@
     my ( $self, $c ) = @_;
 
-    $c->response->body('Matched Sophie::Controller::Chat in Chat.');
+
 }
 
@@ -37 +35 @@
 
     foreach my $co (ref $contexts ? @$contexts : $contexts) {
-        warn $co;
-        if (ref $co) {
+        if (ref($co) eq 'HASH') {
             foreach (keys %$co) {
                 $reqspec->{$_} = $co->{$_};
             }
         } else {
-            if (my $coo = $c->forward('/user/fetchdata', $co)) {
+            if (my $coo = $c->forward('/user/fetchdata', [ $co ])) {
                 foreach (keys %$coo) { 
                     $reqspec->{$_} = $coo->{$_};

server/trunk/web/lib/Sophie/Controller/User.pm

@@ -50 +50 @@
     my ( $self, $c, $dataname ) = @_;
 
-    return $c->forward('fetch_user_data', [ $c->user, $dataname ]);
+    return $c->forward('fetch_user_data', [ $c->user || '', $dataname ]);
 }
 

server/trunk/web/lib/Sophie/Model/Chat.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+use Getopt::Long;
+use Text::ParseWords;
 
 extends 'Catalyst::Model';
@@ -31 +33 @@
     },
     t => {
-        code => sub { $_[0]->forward('/distrib/list') },
+        code => sub { 
+            my ($c, $context, @args) = @_;
+            local @ARGV = @args;
+            join(', ', @{ $_[0]->forward('/distrib/list', [ { 
+                distribution => $args[0],
+                release => $args[1],
+                arch => $args[2],
+                }, ]
+            ) });;
+        },
     },
 };
 
 sub process {
-    my ( $self, $c, $context, $cmd, @args) = @_;
+    my ( $self, $c, $context, $message) = @_;
 
-    warn keys %$context;
+    my ($cmd, @args) = Text::ParseWords::shellwords($message);
 
     my $msg;