[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Jul 29 10:27:45 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv8844/MOBY

Modified Files:
	service_instance.pm 
Log Message:
deregistration of services was not cleaning up the inputs and outputs from the database because the service was deleted prior to the parameters, leaving them unable to look up the database id of their parent service LSID

moby-live/Perl/MOBY service_instance.pm,1.32,1.33
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/27 15:29:38	1.32
+++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/29 14:27:45	1.33
@@ -268,7 +268,6 @@
 # the routines below know too much about the database (e.g. that
 # the delete_simple_input routines are broken into two parts - by LSID and
 # by collecion ID...  BAD BAD BAD
-	$adaptor->delete_service_instance(service_instance_lsid => $self->lsid);
 	$adaptor->delete_simple_input(service_instance_lsid => $self->lsid);
 	$adaptor->delete_simple_output(service_instance_lsid => $self->lsid);
 	
@@ -288,6 +287,7 @@
 	$adaptor->delete_collection_input(service_instance_lsid => $self->lsid);
 	$adaptor->delete_collection_output(service_instance_lsid => $self->lsid);
 	$adaptor->delete_secondary_input(service_instance_lsid => $self->lsid);
+	$adaptor->delete_service_instance(service_instance_lsid => $self->lsid);
 			
 	return 1;
 }