[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Jun 26 23:16:09 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv21560/Perl/MOBY

Modified Files:
	Central.pm 
Log Message:
added some additional debugging info because the deregistration of namespaces is still not following the rules

moby-live/Perl/MOBY Central.pm,1.86,1.87
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/06/27 02:57:50	1.86
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/06/27 03:16:09	1.87
@@ -764,6 +764,7 @@
 	return &_error("Namespace Type $term does not exist","") unless ($existingURI);
 
 	my $dbh = MOBY::central_db_connection->new->dbh;
+
 	my $sth = $dbh->prepare("select service_instance.service_instance_id, namespace_type_uris from service_instance natural join simple_input where namespace_type_uris like '%$existingURI%'");
 	$sth->execute;
 	while (my ($id, $ns) = $sth->fetchrow_array()){
@@ -783,7 +784,8 @@
 				return &_error("Namespace Type $term ($_) is used by a service (service ID number $id) and may not be deregistered","") if ($_ eq $existingURI);
 		}
 	}
-	$sth = $dbh->prepare("select service_instance.service_instance_id, namespace_type_uris from service_instance natural join collection_input where namespace_type_uris like '%$existingURI%'");
+
+	$sth = $dbh->prepare("select service_instance.service_instance_id, namespace_type_uris from service_instance natural join collection_input natural join simple_input where namespace_type_uris like '%$existingURI%'");
 	$sth->execute;
 	while (my ($id, $ns) = $sth->fetchrow_array()){
 		my @nss = split ",", $ns;
@@ -792,7 +794,8 @@
 				return &_error("Namespace Type $term ($_) is used by a service (service ID number $id) and may not be deregistered","") if ($_ eq $existingURI);
 		}
 	}
-	$sth = $dbh->prepare("select service_instance.service_instance_id, namespace_type_uris from service_instance natural join collection_output where namespace_type_uris like '%$existingURI%'");
+
+	$sth = $dbh->prepare("select service_instance.service_instance_id, namespace_type_uris from service_instance natural join collection_output natural join simple_output where namespace_type_uris like '%$existingURI%'");
 	$sth->execute;
 	while (my ($id, $ns) = $sth->fetchrow_array()){
 		my @nss = split ",", $ns;