[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Thu Nov 29 12:54:58 EST 2007
Update of /home/repository/moby/moby-live/Perl/MOBY/RDF/Ontologies/Cache
In directory dev.open-bio.org:/tmp/cvs-serv31543/RDF/Ontologies/Cache

Modified Files:
	ServiceCache.pm 
Log Message:
removed all instances where uri was passed in to the RDF generators
moby-live/Perl/MOBY/RDF/Ontologies/Cache ServiceCache.pm,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/RDF/Ontologies/Cache/ServiceCache.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/MOBY/RDF/Ontologies/Cache/ServiceCache.pm	2007/11/28 19:58:46	1.1
+++ /home/repository/moby/moby-live/Perl/MOBY/RDF/Ontologies/Cache/ServiceCache.pm	2007/11/29 17:54:58	1.2
@@ -35,16 +35,17 @@
 
 =head1 SYNOPSIS
 
+	# required
 	my $cachedir = "/tmp/";
+	
+	# optional - gets default values from MOBY::Client::Central
 	my $url = "http://moby.ucalgary.ca/moby/MOBY-Central.pl";
 	my $uri = "http://moby.ucalgary.ca/MOBY/Central";
-	my $service_uri = "http://biomoby.org/RESOURCES/MOBY-S/ServiceInstances#";
 	
 	my $x = MOBY::RDF::Ontologies::Cache::ServiceCache->new(
 		endpoint	=> $url, 
 		namespace 	=> $uri,
 		cache		=> $cachedir,
-		uri			=> $service_uri
 	);
 
 	# create the service cache
@@ -82,14 +83,9 @@
 
 Parameters: 
 	* A Hash with keys:
-		-> endpoint		=> the BioMOBY registry endpoint to use
-		-> namespace	=> the BioMOBY registry namespace to use
-		-> cache		=> the directory to store the cache
-		-> uri			=> the service instance uri, 
-		   i.e. http://biomoby.org/RESOURCES/MOBY-S/ServiceInstances# 
-		   This parameter is necessary if you are trying to generate
-		   RDF for a non-default (neither your own local one or 
-		   the default mobycentral) registry!
+		-> endpoint		=> the BioMOBY registry endpoint to use <optional>
+		-> namespace	=> the BioMOBY registry namespace to use <optional>
+		-> cache		=> the directory to store the cache <REQUIRED>
 
 This subroutine attempts to create the cache directories right away 
 and if any problems occur then an Exception is thrown.
@@ -106,7 +102,7 @@
 	$self->{endpoint}  = $args{endpoint}  if $args{endpoint};
 	$self->{namespace} = $args{namespace} if $args{namespace};
 	$self->{cachedir}  = $args{cache}     if $args{cache};
-	$self->{uri}       = $args{uri}       if $args{uri};
+	
 	
 	eval {
 		$self->{endpoint} = MOBY::Client::Central->new()->{default_MOBY_server};
@@ -167,7 +163,6 @@
 		$authorities_completed{$name} = 1;
 
 		$xml = MOBY::RDF::Ontologies::Services->new(
-										   uri      => $self->{uri},
 										   endpoint => $self->{utils}->_endpoint );
 		$xml = $xml->findService( { authURI => $name } );
 		my $file = File::Spec->catfile(
@@ -315,8 +310,7 @@
 		foreach my $authURI ( keys %changed_services ) {
 			$wasOld++;
 			$xml = MOBY::RDF::Ontologies::Services->new(
-										  endpoint => $self->{utils}->_endpoint,
-										  uri      => $self->{uri} );
+										  endpoint => $self->{utils}->_endpoint, );
 
 			$xml = $xml->findService( { authURI => $authURI } );
 			$file = File::Spec->catfile(