From: Scott C. <sco...@us...> - 2007-03-22 02:24:26
|
Update of /cvsroot/gmod/Generic-Genome-Browser/cgi-bin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8817/cgi-bin Modified Files: Tag: stable gbrowse_details.PLS Log Message: little modifications in several places to allow gbrowse_details to find the appropriate page when two features in chado have the same name (which is allowed but used to choke gbrowse_details). Now Browser.pm builds the AUTO link with the chado feature_id (when available) and that is used to build the page for the correct feature. Index: gbrowse_details.PLS =================================================================== RCS file: /cvsroot/gmod/Generic-Genome-Browser/cgi-bin/gbrowse_details.PLS,v retrieving revision 1.28.4.2.2.12 retrieving revision 1.28.4.2.2.12.2.1 diff -C2 -d -r1.28.4.2.2.12 -r1.28.4.2.2.12.2.1 *** gbrowse_details.PLS 10 Oct 2006 21:14:46 -0000 1.28.4.2.2.12 --- gbrowse_details.PLS 22 Mar 2007 02:24:24 -0000 1.28.4.2.2.12.2.1 *************** *** 75,78 **** --- 75,79 ---- my $start = param('start'); my $end = param('end'); + my $f_id = param('feature_id'); # Migrate from 1.56 way of specifying source to 1.57 way *************** *** 91,97 **** my $db = open_database(); ! my @features = sort {$b->length<=>$a->length} $CONFIG->_feature_get($db,$name,$class); ! @features = sort {$b->length<=>$a->length} $CONFIG->_feature_get($db,$ref,$class,$start,$end,1) ! unless @features; warn "features = @features" if DEBUG; --- 92,104 ---- my $db = open_database(); ! my @features; ! if ($f_id) { ! @features = $CONFIG->_feature_get($db,$name,$class,$start,$end,1,0,$f_id); ! } ! else { ! @features = sort {$b->length<=>$a->length} $CONFIG->_feature_get($db,$name,$class); ! @features = sort {$b->length<=>$a->length} $CONFIG->_feature_get($db,$ref,$class,$start,$end,1) ! unless @features; ! } warn "features = @features" if DEBUG; |