Changeset 22827

Timestamp:

09/09/10 10:41:25 (17 months ago)

Author:

alex

Message:

Can now apply roles to templates, and uses a content implementation of ResultIterator? rather than the socket based one

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Service.pm (modified) (4 diffs)

branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Service.pm

@@ -41 +41 @@
 use InterMine::TypeLibrary qw(Uri Model TemplateFactory SavedQueryFactory ListFactory);
 
+use IO::String;
+
 =head2 new( $url, [$user, $pass] )
 
@@ -125 +127 @@
 
 
-=head2 template( $name )
+=head2 template( $name [$roles] )
 
 This checks to see if there is a template of this name in the
@@ -146 +148 @@
     },
     handles => {
-    template => 'get_template_by_name',
-    },
-);
+    get_template => 'get_template_by_name',
+    },
+);
+
+sub template {
+    my ($self, $name, $roles) = @_;
+    my $t = $self->get_template($name) or return;
+    return apply_roles($t, $roles);
+}
 
 has _saved_queries => (
@@ -237 +245 @@
     my $view_list    = shift;
     my $roles        = shift;
-    my $connection = Net::HTTP->new(Host => $self->host) or
-      confess "Could not connect to host $@";
-    $connection->write_request(
-    GET => $url,
-    'User-Agent' => USER_AGENT
+    # my $connection = Net::HTTP->new(Host => $self->host) or
+    #   confess "Could not connect to host $@";
+    # $connection->write_request(
+    #   GET => $url,
+    #   'User-Agent' => USER_AGENT
+    # );
+    my $resp = $self->agent->get($url);
+    my $content = $resp->content;
+    open(my $io, '<', \$content) or confess "$!";
+    my $response = InterMine::ResultIterator->new(
+#   connection => $connection,
+    view_list  => $view_list,
+    error_code => $resp->code,
+    error_message => $resp->message,
+    content => $io,
     );
-    my $response = InterMine::ResultIterator->new(
-                  connection    => $connection,
-                  view_list     => $view_list,
-                 );
-    confess $response->status_line if $response->is_error;
+    confess $response->status_line, $resp->content
+    if $response->is_error;
     return apply_roles($response, $roles);
 }