[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jun 25 16:23:12 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv16595/MOBY

Modified Files:
	Central.pm 
Log Message:
Fixed bug in MOBY Central SQL query where discovery was not properly paying attention to namespaces.

moby-live/Perl/MOBY Central.pm,1.82,1.83
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/06/25 20:17:44	1.82
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/06/25 20:23:12	1.83
@@ -1818,7 +1818,7 @@
 	$ancestor_string =~ s/\,$//;
 	my $nsquery;
 	foreach my $ns(@{$namespaceURIs}){ # namespaces are already URI's
-			$nsquery .=" OR namespace_type_uri like '%$ns%' ";
+			$nsquery .=" OR namespace_type_uris like '%$ns%' ";
 	}
 	if ($nsquery){$nsquery =~ s/OR//;} # just the first
 	my $query = "select distinct service_instance_id from simple_$inout where object_type_uri in ($ancestor_string) and service_instance_id IS NOT NULL ";# if service_instance_id is null then it must be a collection input.
@@ -1840,7 +1840,7 @@
 		my ($objectURI, $namespaceURIs) = &_extractObjectTypesAndNamespaces($node);
 		my $nsquery;
 		foreach my $ns(@{$namespaceURIs}){ # namespaces are already URI's
-			$nsquery .=" OR namespace_type_uri like '%$ns%' ";
+			$nsquery .=" OR namespace_type_uris like '%$ns%' ";
 		}
 		if ($nsquery){$nsquery =~ s/OR//;} # just the first
 		$query .= " OR (object_type_uri = '$objectURI' AND ($nsquery)) ";