[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Mon Jul 18 18:46:00 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv17267/MOBY

Modified Files:
	Central.pm secondary_input.pm service_instance.pm 
Log Message:
fixing brackets and semicolons

moby-live/Perl/MOBY Central.pm,1.159,1.160 secondary_input.pm,1.3,1.4 service_instance.pm,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/13 21:53:11	1.159
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/18 22:46:00	1.160
@@ -22,14 +22,16 @@
 use MOBY::secondary_input;
 use MOBY::central_db_connection;
 use MOBY::Config;
-use MOBY::RDF::ServiceInstanceRDF;
-use RDF::Core;
-use RDF::Core::Model;
-use RDF::Core::Literal;
-use RDF::Core::Statement;
-use RDF::Core::Model::Serializer;
-use RDF::Core::Storage::Memory;
-use RDF::Core::Constants qw(:xml :rdf :rdfs);
+use MOBY::Client::Central;
+
+#use MOBY::RDF::ServiceInstanceRDF;
+#use RDF::Core;
+#use RDF::Core::Model;
+#use RDF::Core::Literal;
+#use RDF::Core::Statement;
+#use RDF::Core::Model::Serializer;
+#use RDF::Core::Storage::Memory;
+#use RDF::Core::Constants qw(:xml :rdf :rdfs);
 use MOBY::MobyXMLConstants;
 my $debug = 0;
 
@@ -1329,8 +1331,6 @@
 			""
 		);
 	}
-
-	use MOBY::Client::Central;
 	my $services         = MOBY::Client::Central::_parseServices( '', '', $si );
 	my $service_instance = shift @{$services};
 
@@ -3423,7 +3423,7 @@
 			$output .= "\t\t</Simple>\n";
 		}
 		$result = $adaptor->query_collection_input({service_instance => $_});
-		$sth_collection_ins->execute($_);
+#		$sth_collection_ins->execute($_);
 
 		foreach my $row (@$result)
 		{
@@ -3485,7 +3485,7 @@
 		    my $articlename = $row->{article_name};
 		    $output .= "\t\t<Collection articleName='$articlename'>\n";
 
-		    my $result2 = $adaptor->query_simple_output({service_instance_id => undef}, {collection_output_id = $collid});
+		    my $result2 = $adaptor->query_simple_output({service_instance_id => undef}, {collection_output_id => $collid});
 		    foreach my $row2 (@$result2 )
 		    {
 			my $objURI = $row2->{object_type_uri};

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/secondary_input.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Perl/MOBY/secondary_input.pm	2005/07/18 16:53:03	1.3
+++ /home/repository/moby/moby-live/Perl/MOBY/secondary_input.pm	2005/07/18 22:46:00	1.4
@@ -113,6 +113,7 @@
 	my ($self) = @_;
 	$CONFIG ||= MOBY::Config->new;    # exported by Config.pm
 	my $adaptor = $CONFIG->getDataAdaptor( datasource => 'mobycentral' );
+	my $dbh = $self->dbh;
 	my $insertid = $adaptor->insert_secondary_input({default_value => $self->default_value},
 													{maximum_value => $self->maximum_value},
 													{minimum_value => $self->minimum_value},

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/18 16:53:03	1.12
+++ /home/repository/moby/moby-live/Perl/MOBY/service_instance.pm	2005/07/18 22:46:00	1.13
@@ -354,6 +354,8 @@
 	my ($self) = @_;
 	my $dbh = $self->dbh;
 	my $authority;
+	$CONFIG ||= MOBY::Config->new;
+	my $adaptor = $CONFIG->getDataAdaptor( datasource => 'mobycentral' );
 	
 	my $result = $adaptor->query_authority({authority_uri => $self->authority_uri});
 	my $row = shift(@$result);