[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Aug 17 13:58:13 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv13547/MOBY

Modified Files:
	Central.pm 
Log Message:
adding restrictions to serviceName to be valid method calls.  Added tests to ensure this is obeyed

moby-live/Perl/MOBY Central.pm,1.201,1.202
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/08/04 09:05:38	1.201
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/08/17 17:58:13	1.202
@@ -1205,8 +1205,7 @@
 			my $conf = MOBY::Config->new();
 			my $path = $conf->{mobycentral}->{rdfagent};
 			my $rez  = system( $path. " " . $signatureURL );
-			return &_success(
-"The RDFagent call was successful.  Report will send to you by E-mail",
+			return &_success( "The RDFagent call was successful.  Report will send to you by E-mail",
 				""
 			  )
 			  if ( $rez == 0 );
@@ -1221,7 +1220,9 @@
 	my $error;
 	$error .= "missing serviceName \n" unless defined $serviceName;
 	$error .= "missing serviceType \n" unless defined $serviceType;
-
+	$error .= "invalid character string for serviceName.  Must start with a letter followed by [A-Za-z0-9_]\n" if ($serviceName =~ /[^A-Za-z]/);
+	$error .= "invalid character string for serviceName.  Must start with a letter followed by [A-Za-z0-9_]\n" if ($serviceName =~ /.[^A-Za-z0-9_]/);
+	
 	#	$error .="missing signatureURL \n" unless defined $signatureURL;
 	$error .= "missing authURI \n"      unless defined $AuthURI;
 	$error .= "missing contactEmail \n" unless defined $contactEmail;