[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jul 27 10:06:15 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv28503/MOBY

Modified Files:
	authority.pm service_instance.pm 
Log Message:
interesting architectural SNAFU. The adaptor is designed to know about one data-source at a time (mobycentral, mobyobject, mobynamespace, mobyservice).  However, certain functions need to cross-reference these different data sources.  Thus I need to create a new instance of the adaptor in the adaptor itself to support this.  Ugly... not illegal... but ugly.  I'll fix this one day.

moby-live/Perl/MOBY authority.pm,1.6,1.7 service_instance.pm,1.30,1.31
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/authority.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Perl/MOBY/authority.pm	2005/07/25 23:45:29	1.6
+++ /home/repository/moby/moby-live/Perl/MOBY/authority.pm	2005/07/27 14:06:15	1.7
@@ -92,7 +92,7 @@
 	$CONFIG ||= MOBY::Config->new;    # exported by Config.pm
 	my $adaptor = $CONFIG->getDataAdaptor( datasource => 'mobycentral' );
 
-	my $result = $adaptor->query_authority({authority_uri => $self->authority_uri});
+	my $result = $adaptor->query_authority(authority_uri => $self->authority_uri);
 	my $row = shift(@$result);
 	unless ($row) {
 		my $insertid = $adaptor->insert_authority(

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/25 23:45:29	1.30
+++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/27 14:06:15	1.31
@@ -272,7 +272,7 @@
 	$adaptor->delete_simple_input(service_instance_lsid => $self->lsid);
 	$adaptor->delete_simple_output(service_instance_lsid => $self->lsid);
 	
-	my $result = $adaptor->query_collection_input({service_instance_lsid => $self->lsid});
+	my $result = $adaptor->query_collection_input(service_instance_lsid => $self->lsid);
 	
 	foreach my $row (@$result) {
 		my $id = $row->{collection_input_id};