From e3bbd64375b71176a7926e68917296099c24391a Mon Sep 17 00:00:00 2001
From: Robert Buels <rmb32@cornell.edu>
Date: Tue, 12 Oct 2010 11:58:09 -0700
Subject: [PATCH] unigene detail page can take CGN-U idents in its unigene_id
 param now

---
 cgi-bin/search/unigene.pl | 12 ++++++++++++
 t/validate/other.t        |  1 +
 2 files changed, 13 insertions(+)

diff --git a/cgi-bin/search/unigene.pl b/cgi-bin/search/unigene.pl
index c47837869..166bd52bf 100755
--- a/cgi-bin/search/unigene.pl
+++ b/cgi-bin/search/unigene.pl
@@ -51,8 +51,20 @@ my $dbh = CXGN::DB::Connection->new();
 if (defined $args{'unigene_id'}) {
     $args{'id'} = $args{'unigene_id'} ;
     $args{'id'} =~ s/^SGN-U//;
+
+    # convert CGN-U to SGN-U
+    if( $args{unigene_id} =~ s/^CGN-?U//i ) {
+        my ($sgnid) = $dbh->selectrow_array(<<EOS,undef, $args{unigene_id}, 'CGN');
+SELECT unigene_id FROM unigene WHERE sequence_name = ? AND database_name=?
+EOS
+        if( $sgnid ) {
+            $args{'id'} = $sgnid;
+        }
+    }
 }
 
+
+
 ## Random function will get at random unigene from the latest unigene build
 
 if (defined $args{'random'}) {
diff --git a/t/validate/other.t b/t/validate/other.t
index 25e92f482..ffb8d701a 100644
--- a/t/validate/other.t
+++ b/t/validate/other.t
@@ -17,6 +17,7 @@ my %urls = (
         "unigene search 2"                           => "/search/ug-ad2.pl?w9e3_page=0&w9e3_sequence_name=SGN-U231977&w9e3_clone_name=&w9e3_membersrange=gt&w9e3_members1=&w9e3_members2=&w9e3_annotation=&w9e3_annot_type=blast&w9e3_lenrange=gt&w9e3_len1=&w9e3_len2=&w9e3_unigene_build_id=any",
         "unigene detail"                           => "/search/unigene.pl?unigene_id=SGN-U231977&w9e3_page=0&w9e3_annot_type=blast&w9e3_unigene_build_id=any",
         "unigene detail 2"                         => "/search/unigene.pl?unigene_id=345356&force_image=1",
+        "unigene detail 3"                         => "/search/unigene.pl?unigene_id=CGN-U124510",
         "unigene build"                            => "/search/unigene_build.pl?id=46",
         'unigene standalone six-frame translation' => '/tools/sixframe_translate.pl?unigene_id=573435',
         'unigene list by annot'                    => '/search/all_unig_for_annot.pl?match_id=308546&search_type=blast_search',
-- 
2.11.4.GIT