[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jul 27 10:39:02 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi
In directory pub.open-bio.org:/tmp/cvs-serv29012/MOBY/Adaptor/moby/queryapi

Modified Files:
	mysql.pm 
Log Message:
errors in method calls to extract service ids. Fixed some last things in the autogenerated SQL

moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.48,1.49
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm	2005/07/27 14:26:44	1.48
+++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm	2005/07/27 14:39:02	1.49
@@ -197,7 +197,7 @@
 sub insert_collection_input {
     my ($self, %args) = @_;
     my $article = $args{article_name};
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     
     $self->dbh->do("insert into collection_input (service_instance_id, article_name) values (?,?)", 
     undef, $siid, $article);
@@ -208,7 +208,7 @@
 # pass in service_instance_lsid
 sub delete_collection_input{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     
     my $statement = "delete from collection_input where service_instance_id = ?";
     $self->dbh->do( $statement, undef, $siid);
@@ -224,7 +224,7 @@
 # pass service_instance_lsid
 sub query_collection_output{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     
     my $statement = "select
@@ -239,7 +239,7 @@
 # pass service_instance_lsid, article_name
 sub insert_collection_output {
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     $self->dbh->do("insert into collection_output (service_instance_id, article_name) values (?,?)", 
     undef, $siid,$args{'article_name'});
@@ -250,7 +250,7 @@
 # pass argument service_instance_lsid
 sub delete_collection_output{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     my $statement = "delete from collection_output where service_instance_id = ?";
     my @bindvalues = ();
@@ -267,7 +267,7 @@
 # pass service_instance_lsid 
 sub query_simple_input{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     
     my $statement = "select
@@ -285,7 +285,7 @@
 # pass service_instance_lsid, object_type_uri, namespace_type_uris, article_name, collection_input_id
 sub insert_simple_input {
     my ($self, %args) = @_;
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;	    
     $dbh->do("insert into simple_input
 			     (object_type_uri,
@@ -308,7 +308,7 @@
 sub delete_simple_input{
     my ($self, %args) = @_;
     my $dbh = $self->dbh;
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my ($collid) = $args{collection_input_id};
     my $statement1; my $statement2;
     $siid && ($statement1 = "delete from simple_input where service_instance_lsid = ?");
@@ -327,7 +327,7 @@
 sub delete_inputs {  # this should replace all other delete_*_input
     my ($self, %args) = @_;
     my $dbh = $self->dbh;
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $result_ids = $self->query_collection_input(service_instance_lsid => $self->lsid);
 
     my $statement = "delete from simple_input where service_instance_lsid = ?";
@@ -352,7 +352,7 @@
 # send service_instance_lsid, collection_input_id
 sub query_simple_output{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $collid = $args{collection_input_id};
     my $dbh = $self->dbh;
     
@@ -371,7 +371,7 @@
 # pass args service_instance_id and collection_output_id
 sub insert_simple_output {
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
 
     $dbh->do("insert into simple_output
@@ -396,7 +396,7 @@
 sub delete_simple_output{
     my ($self, %args) = @_;
     my $dbh = $self->dbh;
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my ($collid) = $args{collection_output_id};
     my $statement1; my $statement2;
     $siid && ($statement1 = "delete from simple_output where service_instance_lsid = ?");
@@ -415,7 +415,7 @@
 # pass service_instance_lsid
 sub query_secondary_input{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     
     my $statement = "select
@@ -435,7 +435,7 @@
 # pass default_value, maximum_value minimum_value enum_value datatype article_name service_instance_lsid
 sub insert_secondary_input{
     my ($self, %args) = @_;	
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;		
     $dbh->do(q{insert into secondary_input (default_value,maximum_value,minimum_value,enum_value,datatype,article_name,service_instance_id) values (?,?,?,?,?,?,?)},
 	    undef,
@@ -450,7 +450,7 @@
 # pass service_instance_lsid
 sub delete_secondary_input{
     my ($self, %args) = @_;
-    my ($siid) = $self->getSIIDFromLSID($args{service_instance_lsid});
+    my ($siid) = $self->_getSIIDFromLSID($args{service_instance_lsid});
     my $dbh = $self->dbh;
     my $statement = "delete from secondary_input where service_instance_lsid=?";
 
@@ -652,7 +652,7 @@
 			service_type_uri, 
 			authority.authority_uri, 
 			url, 
-			contact_email, 
+			service_instance.contact_email, 
 			authoritative, 
 			description, 
 			signatureURL,