[Bioperl-guts-l] bioperl-run/Bio/Tools/Run/Analysis soap.pm, 1.9, 1.10

[Martin Senger]

Update of /home/repository/bioperl/bioperl-run/Bio/Tools/Run/Analysis
In directory pub.open-bio.org:/tmp/cvs-serv28342/Bio/Tools/Run/Analysis

Modified Files:
	soap.pm 
Log Message:
default location for SOAP analysis services at EBI has changed


Index: soap.pm
===================================================================
RCS file: /home/repository/bioperl/bioperl-run/Bio/Tools/Run/Analysis/soap.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** soap.pm	16 Nov 2004 17:59:57 -0000	1.9
--- soap.pm	27 Jul 2005 13:47:54 -0000	1.10
***************
*** 3,7 ****
  # BioPerl module Bio::Tools::Run::Analysis::soap.pm
  #
! # Cared for by Martin Senger <senger at ebi.ac.uk>
  # For copyright and disclaimer see below.
  
--- 3,7 ----
  # BioPerl module Bio::Tools::Run::Analysis::soap.pm
  #
! # Cared for by Martin Senger <martin.senger at gmail.com>
  # For copyright and disclaimer see below.
  
***************
*** 51,55 ****
  =head1 AUTHOR
  
! Martin Senger (senger at ebi.ac.uk)
  
  =head1 COPYRIGHT
--- 51,55 ----
  =head1 AUTHOR
  
! Martin Senger (martin.senger at gmail.com)
  
  =head1 COPYRIGHT
***************
*** 71,75 ****
  =item *
  
! http://industry.ebi.ac.uk/soaplab/Perl_Client.html
  
  =back
--- 71,75 ----
  =item *
  
! http://www.ebi.ac.uk/soaplab/Perl_Client.html
  
  =back
***************
*** 104,108 ****
  		'faultcode:   ' . $res->faultcode . "\n" .
  		'faultstring: ' . Bio::Tools::Run::Analysis::soap::_clean_msg ($res->faultstring)
! 	      : "--- TRANSPORT ERROR ---\n" . $soap->transport->status;
          Bio::Tools::Run::Analysis::soap->throw ($msg);
      }
--- 104,108 ----
  		'faultcode:   ' . $res->faultcode . "\n" .
  		'faultstring: ' . Bio::Tools::Run::Analysis::soap::_clean_msg ($res->faultstring)
! 	      : "--- TRANSPORT ERROR ---\n" . $soap->transport->status . "\n$res\n";
          Bio::Tools::Run::Analysis::soap->throw ($msg);
      }
***************
*** 115,119 ****
  
      # where to go
!     $DEFAULT_LOCATION = 'http://industry.ebi.ac.uk/soap/soaplab';
  }
  
--- 115,119 ----
  
      # where to go
!     $DEFAULT_LOCATION = 'http://www.ebi.ac.uk/soaplab/services';
  }
  
***************
*** 157,163 ****
  representing this analysis tool.
  
! Default is C<http://industry.ebi.ac.uk/soap/soaplab> (an experimental
! service running at European Bioinformatics Institute on top of most of
! EMBOSS analyses).
  
  For example, if you run your own Web Service using Java(TM) Apache Axis
--- 157,163 ----
  representing this analysis tool.
  
! Default is C<http://www.ebi.ac.uk/soaplab/services> (services running
! at European Bioinformatics Institute on top of most of EMBOSS
! analyses, and few others).
  
  For example, if you run your own Web Service using Java(TM) Apache Axis
***************
*** 169,173 ****
  A name of a Web Service (also called a I<urn> or a I<namespace>).
  There is no default value (which usually means that this parameter is
! mandatory unless your I<-location> parameter includes also the Web
  Service name).
  
--- 169,173 ----
  A name of a Web Service (also called a I<urn> or a I<namespace>).
  There is no default value (which usually means that this parameter is
! mandatory unless your I<-location> parameter includes also a Web
  Service name).
  
***************
*** 222,249 ****
      $self->{'_location'} = $DEFAULT_LOCATION unless $self->{'_location'};
  
-     # hack: put service name at the end of location otherwise
-     # SOAP::Lite will complain about '::' in the service name (because
-     # it is actually a URN)
-     my $location = $self->{'_location'};
-     if ($self->{'_name'}) {
- 	my $escaped_name = quotemeta $self->{'_name'};
- 	if ($location !~ /$escaped_name$/) {
- 	    $location .= '/' unless $location =~ m|/$|;
- 	    $location .= $self->{'_name'};
- 	}
-     }
- 
      # create a SOAP::Lite object, the main worker
      if (defined $self->{'_httpproxy'}) {
  	$self->{'_soap'} = SOAP::Lite
! 	    -> proxy ($location,
  		      timeout => (defined $self->{'_timeout'} ? $self->{'_timeout'} : 120),
  		      proxy => ['http' => $self->{'_httpproxy'}]);
      } else {
  	$self->{'_soap'} = SOAP::Lite
! 	    -> proxy ($location,
  		      timeout => (defined $self->{'_timeout'} ? $self->{'_timeout'} : 120),
  		      );
      }
  
      # forget cached things which should not be cloned into new
--- 222,238 ----
      $self->{'_location'} = $DEFAULT_LOCATION unless $self->{'_location'};
  
      # create a SOAP::Lite object, the main worker
      if (defined $self->{'_httpproxy'}) {
  	$self->{'_soap'} = SOAP::Lite
! 	    -> proxy ($self->{'_location'},
  		      timeout => (defined $self->{'_timeout'} ? $self->{'_timeout'} : 120),
  		      proxy => ['http' => $self->{'_httpproxy'}]);
      } else {
  	$self->{'_soap'} = SOAP::Lite
! 	    -> proxy ($self->{'_location'},
  		      timeout => (defined $self->{'_timeout'} ? $self->{'_timeout'} : 120),
  		      );
      }
+     $self->{'_soap'}->uri ($self->{'_name'}) if $self->{'_name'};
  
      # forget cached things which should not be cloned into new