[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Tue Aug 10 11:57:48 EDT 2004
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv17357/MOBY/Client

Modified Files:
	OntologyServer.pm Service.pm 
Log Message:
updated documentation and made the environment variables consistent for configuring proxy servers

moby-live/Perl/MOBY/Client OntologyServer.pm,1.5,1.6 Service.pm,1.11,1.12
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/OntologyServer.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Perl/MOBY/Client/OntologyServer.pm	2004/05/13 17:57:34	1.5
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/OntologyServer.pm	2004/08/10 15:57:48	1.6
@@ -39,8 +39,17 @@
 what is returned will be an LSID, and skip the checking step
 yourself.
 
+
+=head1 PROXY SERVERS
+
+If your site uses a proxy server, simply set the environment variable
+MOBY_PROXY=http://your.proxy.server/address
+
+=cut
+
 =head1 AUTHORS
 
+
 Mark Wilkinson (markw at illuminae.com)
 Nina Opushneva (opushneva at yahoo.ca)
 
@@ -219,7 +228,7 @@
 sub getUserAgent{
 	my ($self, @args) = @_;
   my $ua = LWP::UserAgent->new;
-    my $proxy = $ENV{PROXY} if $ENV{PROXY}; # first check the environment
+    my $proxy = $ENV{MOBY_PROXY} if $ENV{MOBY_PROXY}; # first check the environment
 	$proxy = $self->proxy if $self->proxy;  # but if the object was initialized with a proxy argument then use that instead
     if($proxy){
        $ua->proxy('http', $proxy);

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2004/05/19 14:58:36	1.11
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2004/08/10 15:57:48	1.12
@@ -31,7 +31,7 @@
  Title     :	new
  Usage     :	$Service = MOBY::Client::Service->new(@args)
  Function  :	create a service connection
- Returns   :	MOBY::Client::Service object
+ Returns   :	MOBY::Client::Service object, undef if no wsdl.
  Args      :	service : string ; required
                           a WSDL file defining a MOBY service
                 uri     : string ; optional ; default NULL
@@ -122,7 +122,7 @@
 		$self->{$attrname} = $self->_default_for($attrname) }
     }
 
-	my $dir = cwd;
+	#my $dir = cwd;
 
 	# seems to be a bug in SOAP::Lite that the WSDL document
 	# fails a parse if it is passed as a scalar rather than a file
@@ -133,6 +133,7 @@
 	# ________________________________________
 
 	my $wsdl = URI::Escape::uri_escape($self->service);  # this seems to fix the bug
+    return undef unless $wsdl;
 	my $soap = SOAP::Lite->service("data:,$wsdl");
 	if ($self->uri){$soap->uri($self->uri)}