Changeset 22825

Timestamp:

09/09/10 10:39:11 (17 months ago)

Author:

alex

Message:

Removed dependence on IO::String, made sure the error phrase is parsed correctly from the header (set a limit on split) and added a content attribute, as the Socket implementation isn't working happily with tomcat.

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/ResultIterator.pm (modified) (7 diffs)

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

@@ -3 +3 @@
 use Moose;
 use InterMine::TypeLibrary qw(HTTPCode NetHTTP PathList TextCSVXS);
-use MooseX::Types::Moose qw(Str HashRef Bool Num);
+use MooseX::Types::Moose qw(Str HashRef Bool Num GlobRef);
 use HTTP::Status qw(status_message);
 use Text::CSV_XS;
-use IO::String;
 use List::MoreUtils qw(zip);
 use Encode;
@@ -12 +11 @@
 my $CRLF = "\015\012";
 
-has connection =>
-    (
-     is => 'ro',
-     isa => NetHTTP,
-     required => 1,
-     trigger => \&set_headers,
-    );
+sub BUILD {
+    my $self = shift;
+    confess "We need a connection or some content"
+    unless ($self->has_connection or $self->has_content);
+}
+
+has connection => (
+    is => 'ro',
+    isa => NetHTTP,
+    trigger => \&set_headers,
+    predicate => 'has_connection',
+);
+
+has content => (
+    is => 'ro',
+    isa => GlobRef,
+    predicate => 'has_content',
+);
 
 has error_code =>
@@ -25 +35 @@
      isa => HTTPCode,
      writer => '_set_error_code',
+     predicate => 'has_code',
     );
 
@@ -34 +45 @@
      writer => '_set_error_message',
     );
+
+before qr/^error_/ => sub {
+    my $self = shift;
+    unless ($self->has_code) {
+    $self->set_headers;
+    }
+};
 
 has csv =>
@@ -108 +126 @@
     my ($version, $code, $phrase, $key, $value);
     if ($line =~ /^HTTP/) {
-        chomp(($version, $code, $phrase) = split(/\s/, $line));
+        chomp(($version, $code, $phrase) = split(/\s/, $line, 3));
     } else {
         chomp(($key, $value) = split(/:\s*/, $line, 2));
@@ -141 +159 @@
 }
 
+####### FOR USE WITH SOCKETS
+
 sub read_line {
     my $self= shift;
+    if ($self->has_content) {
+    return $self->content->getline;
+    }
     return undef if $self->is_finished;
     if ($self->is_chunked and $self->chunk_bytes_left < 1) {
@@ -189 +212 @@
 sub arrayref {
     my $self = shift;
-    my $io   = IO::String->new($self->string);
+    my $line = $self->string or return;
+    open(my $io, '<', \$line) or die $!;
     return $self->csv->getline($io);
 }
 sub hashref {
     my $self = shift;
-    my $io   = IO::String->new($self->string);
+    my $line = $self->string or return;
+    open(my $io, '<', \$line) or die $!;
     return $self->csv->getline_hr($io);
 }