[Gmod-schema-cmts] schema/chado/load/bin bulk_load_gff3.PLS,1.20,1.21

[Scott C. <sco...@us...>]

Update of /cvsroot/gmod/schema/chado/load/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5918/load/bin

Modified Files:
	bulk_load_gff3.PLS 
Log Message:
supporting both 'Gene Ontology' and 'GO' for database names


Index: bulk_load_gff3.PLS
===================================================================
RCS file: /cvsroot/gmod/schema/chado/load/bin/bulk_load_gff3.PLS,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bulk_load_gff3.PLS	28 Apr 2005 21:17:37 -0000	1.20
--- bulk_load_gff3.PLS	28 Apr 2005 21:44:22 -0000	1.21
***************
*** 404,408 ****
     = $db->prepare("SELECT dbxref_id FROM dbxref WHERE accession=? AND db_id=?");
  my $search_dbxref
!    = $db->prepare("SELECT dbxref_id FROM dbxref WHERE accession=? AND db_id in (SELECT db_id FROM db WHERE name like ?)");
  my $search_cvterm_id_w_dbxref
     = $db->prepare("SELECT cvterm_id FROM cvterm WHERE dbxref_id=?");
--- 404,408 ----
     = $db->prepare("SELECT dbxref_id FROM dbxref WHERE accession=? AND db_id=?");
  my $search_dbxref
!    = $db->prepare("SELECT dbxref_id FROM dbxref WHERE accession=? AND db_id in (SELECT db_id FROM db WHERE name like ? OR name like ?)");
  my $search_cvterm_id_w_dbxref
     = $db->prepare("SELECT cvterm_id FROM cvterm WHERE dbxref_id=?");
***************
*** 674,680 ****
          my $db_name;
          if ($d eq 'GO') {
!           $db_name = '%Gene Ontology%';
          } elsif ($d eq 'SO') {
!           $db_name = 'Sequence Ontology';
          } else {
              warn "currently, only GO and SO Ontology_terms are supported;\n"
--- 674,680 ----
          my $db_name;
          if ($d eq 'GO') {
!           $search_dbxref->execute($a,'%Gene Ontology%','GO');
          } elsif ($d eq 'SO') {
!           $search_dbxref->execute($a,'Sequence Ontology','SO');
          } else {
              warn "currently, only GO and SO Ontology_terms are supported;\n"
***************
*** 683,687 ****
          }
  
-         $search_dbxref->execute($a,$db_name);
          my ($dbxref) = $search_dbxref->fetchrow_array;
          warn "couldn't find $term in dbxref\n" and next unless $dbxref;
--- 683,686 ----