new amigo

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@3128 ee4ac58c-ac51-4696-9907-e4b3aa274f04

etc/go_associations.pl

@@ -5,7 +5,8 @@ use strict;
 BEGIN 
 {
 
-  my $configFile = "/nfs/pathdb/dev/go-cgi/config.pl";
+#  my $configFile = "/nfs/pathdb/dev/go-cgi/config.pl";
+  my $configFile = "/nfs/pathdb/amigo/conf/config.pl";
 
   if (-f $configFile) 
   {
@@ -31,14 +32,15 @@ if(@ARGV == 0)
 
 my $acc_num = $ARGV[0];
 
+
 my $dbname = $ENV{GO_DBNAME};
 my $dbport = $ENV{GO_DBPORT};
 my $dbhost = $ENV{GO_DBHOST};
 my $dbuser = $ENV{GO_DBUSER};
+my $dbauth = $ENV{GO_DBAUTH};
 
-if (not $dbname =~ /go\d/) 
-{
-  print STDERR "GO database name uncorrect, must be go1 or go2 !!";
+if (not $dbname =~ /^go/) {
+  print STDERR "GO database name uncorrect, must start 'go...' !!";
   exit 1;
 }
 
@@ -47,9 +49,11 @@ my $apph = GO::AppHandle->connect (
                                    -dbport => $dbport,
                                    -dbhost => $dbhost,
                                    -dbuser => $dbuser,
+                                   -dbauth => $dbauth,
                                   ) 
     or die "can't connect to GO database, $dbname!!!\n";
 
+
 #my @accs = qw(O00221);
 my @accs;
 push(@accs, $acc_num);