From: Scott C. <sco...@us...> - 2004-03-25 21:20:57
|
Update of /cvsroot/gmod/schema/chado/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2062/bin Modified Files: AutoDBI.PL Log Message: updated AutoDBI.PL, also added new gbrowse release to the manifest Index: AutoDBI.PL =================================================================== RCS file: /cvsroot/gmod/schema/chado/bin/AutoDBI.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AutoDBI.PL 15 Mar 2004 18:58:33 -0000 1.1 --- AutoDBI.PL 25 Mar 2004 21:10:06 -0000 1.2 *************** *** 92,103 **** ); - sub arrays { - return shift->array_manufacturer_id - } - - Chado::Contact->has_many( - 'array_manufacturer_id', 'Chado::Array' => 'manufacturer_id' - ); - sub assays { return shift->assay_operator_id --- 92,95 ---- *************** *** 116,119 **** --- 108,119 ---- ); + sub arraydesigns { + return shift->arraydesign_manufacturer_id + } + + Chado::Contact->has_many( + 'arraydesign_manufacturer_id', 'Chado::Arraydesign' => 'manufacturer_id' + ); + sub authors { return shift->author_contact_id *************** *** 218,229 **** ); - sub arrays { - return shift->array_dbxref_id - } - - Chado::Dbxref->has_many( - 'array_dbxref_id', 'Chado::Array' => 'dbxref_id' - ); - sub features { return shift->feature_dbxref_id --- 218,221 ---- *************** *** 242,245 **** --- 234,245 ---- ); + sub arraydesigns { + return shift->arraydesign_dbxref_id + } + + Chado::Dbxref->has_many( + 'arraydesign_dbxref_id', 'Chado::Arraydesign' => 'dbxref_id' + ); + sub studys { return shift->study_dbxref_id *************** *** 471,474 **** --- 471,486 ---- ); + sub arraydesigns { + return shift->arraydesign_platformtype_id + } + + Chado::Cvterm->has_many( + 'arraydesign_platformtype_id', 'Chado::Arraydesign' => 'platformtype_id' + ); + + Chado::Cvterm->has_many( + 'arraydesign_substratetype_id', 'Chado::Arraydesign' => 'substratetype_id' + ); + sub biomaterial_relationships { return shift->biomaterial_relationship_type_id *************** *** 635,650 **** sub dbxrefs { my $self = shift; return map $_->dbxref_id, $self->cvterm_dbxref_cvterm_id } - sub arrays { - return shift->array_platformtype_id - } - - Chado::Cvterm->has_many( - 'array_platformtype_id', 'Chado::Array' => 'platformtype_id' - ); - - Chado::Cvterm->has_many( - 'array_substratetype_id', 'Chado::Array' => 'substratetype_id' - ); - sub assayprops { return shift->assayprop_type_id --- 647,650 ---- *************** *** 2642,2653 **** } - sub arrays { - return shift->array_protocol_id - } - - Chado::Protocol->has_many( - 'array_protocol_id', 'Chado::Array' => 'protocol_id' - ); - sub treatments { return shift->treatment_protocol_id --- 2642,2645 ---- *************** *** 2674,2677 **** --- 2666,2677 ---- ); + sub arraydesigns { + return shift->arraydesign_protocol_id + } + + Chado::Protocol->has_many( + 'arraydesign_protocol_id', 'Chado::Arraydesign' => 'protocol_id' + ); + sub protocolparams { return shift->protocolparam_protocol_id *************** *** 2765,2773 **** # ------------------------------------------------------------------- ! package Chado::Array; use base 'Chado::DBI'; use Class::DBI::Pager; ! Chado::Array->set_up_table('array'); --- 2765,2773 ---- # ------------------------------------------------------------------- ! package Chado::Arraydesign; use base 'Chado::DBI'; use Class::DBI::Pager; ! Chado::Arraydesign->set_up_table('arraydesign'); *************** *** 2776,2783 **** # sub id { ! shift->array_id } ! Chado::Array->has_a( manufacturer_id => 'Chado::Contact' ); --- 2776,2783 ---- # sub id { ! shift->arraydesign_id } ! Chado::Arraydesign->has_a( manufacturer_id => 'Chado::Contact' ); *************** *** 2787,2791 **** } ! Chado::Array->has_a( platformtype_id => 'Chado::Cvterm' ); --- 2787,2791 ---- } ! Chado::Arraydesign->has_a( platformtype_id => 'Chado::Cvterm' ); *************** *** 2795,2799 **** } ! Chado::Array->has_a( substratetype_id => 'Chado::Cvterm' ); --- 2795,2799 ---- } ! Chado::Arraydesign->has_a( substratetype_id => 'Chado::Cvterm' ); *************** *** 2803,2807 **** } ! Chado::Array->has_a( protocol_id => 'Chado::Protocol' ); --- 2803,2807 ---- } ! Chado::Arraydesign->has_a( protocol_id => 'Chado::Protocol' ); *************** *** 2811,2815 **** } ! Chado::Array->has_a( dbxref_id => 'Chado::Dbxref' ); --- 2811,2815 ---- } ! Chado::Arraydesign->has_a( dbxref_id => 'Chado::Dbxref' ); *************** *** 2820,2844 **** sub arrayprops { ! return shift->arrayprop_array_id } ! Chado::Array->has_many( ! 'arrayprop_array_id', 'Chado::Arrayprop' => 'array_id' ); sub assays { ! return shift->assay_array_id } ! Chado::Array->has_many( ! 'assay_array_id', 'Chado::Assay' => 'array_id' ); sub elements { ! return shift->element_array_id } ! Chado::Array->has_many( ! 'element_array_id', 'Chado::Element' => 'array_id' ); --- 2820,2844 ---- sub arrayprops { ! return shift->arrayprop_arraydesign_id } ! Chado::Arraydesign->has_many( ! 'arrayprop_arraydesign_id', 'Chado::Arrayprop' => 'arraydesign_id' ); sub assays { ! return shift->assay_arraydesign_id } ! Chado::Arraydesign->has_many( ! 'assay_arraydesign_id', 'Chado::Assay' => 'arraydesign_id' ); sub elements { ! return shift->element_arraydesign_id } ! Chado::Arraydesign->has_many( ! 'element_arraydesign_id', 'Chado::Element' => 'arraydesign_id' ); *************** *** 2859,2867 **** Chado::Arrayprop->has_a( ! array_id => 'Chado::Array' ); ! sub array { ! return shift->array_id } --- 2859,2867 ---- Chado::Arrayprop->has_a( ! arraydesign_id => 'Chado::Arraydesign' ); ! sub arraydesign { ! return shift->arraydesign_id } *************** *** 2890,2898 **** Chado::Assay->has_a( ! array_id => 'Chado::Array' ); ! sub array { ! return shift->array_id } --- 2890,2898 ---- Chado::Assay->has_a( ! arraydesign_id => 'Chado::Arraydesign' ); ! sub arraydesign { ! return shift->arraydesign_id } *************** *** 3686,3694 **** Chado::Element->has_a( ! array_id => 'Chado::Array' ); ! sub array { ! return shift->array_id } --- 3686,3694 ---- Chado::Element->has_a( ! arraydesign_id => 'Chado::Arraydesign' ); ! sub arraydesign { ! return shift->arraydesign_id } |