[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Sep 14 12:26:50 EDT 2007
Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi
In directory dev.open-bio.org:/tmp/cvs-serv22520/MOBY/Adaptor/moby/queryapi

Modified Files:
	mysql.pm 
Log Message:
proper naming of columns
moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.85,1.86
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm	2007/09/14 16:04:20	1.85
+++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm	2007/09/14 16:26:50	1.86
@@ -818,7 +818,7 @@
 # pass service_type, as term or LSID
 sub query_service{
 	my ($self, %args) = @_;
-	my $type = $args{type};
+	my $type = $args{type}||"";
 	my $condition = "";
 	if ($type =~ /^urn\:lsid/){
 	    $condition = "where service_lsid = ?";
@@ -851,7 +851,7 @@
 
 sub new_query_service{
 	my ($self, %args) = @_;
-	my $type = $args{type};
+	my $type = $args{type}||"";
 	my $condition = "";
 	if ($type =~ /^urn\:lsid/){
 	    $condition = "where s1.service_lsid = ?";
@@ -864,14 +864,14 @@
 	my $dbh = _getDBHandle("mobyservice");
 
 	my $statement = "select
-	  s1.service_id, 
-          s1.service_lsid,
-          s1.service_type,
-          s1.description,
-          s1.authority,
-          s1.contact_email,
-	  s2.service_type,
-	  s2.service_lsid 
+	  s1.service_id as service_id, 
+          s1.service_lsid as service_lsid,
+          s1.service_type as service_type,
+          s1.description as description,
+          s1.authority as authority,
+          s1.contact_email as contact_email,
+	  s2.service_type as parent_type,
+	  s2.service_lsid as parent_lsid  
           from
 	  service as s1
 	  left join service_term2term as t