[Nelsonlab-cmts] libnelson/Pg/celsius/bin celsius-extract,1.5,1.6

[<all...@su...>]

Update of /cvsroot/libnelson/Pg/celsius/bin
In directory sumo.genetics.ucla.edu:/tmp/cvs-serv8582/bin

Modified Files:
	celsius-extract 
Log Message:
updates for marc


Index: celsius-extract
===================================================================
RCS file: /cvsroot/libnelson/Pg/celsius/bin/celsius-extract,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** celsius-extract	16 Feb 2006 02:49:35 -0000	1.5
--- celsius-extract	14 Mar 2006 18:18:39 -0000	1.6
***************
*** 35,39 ****
  $sn =~ s/^SN://;
  
! my $dbh1 = DBI->connect('dbi:Pg:dbname=chado-celsius;host=soleus.ctrl.ucla.edu','','');
  
  if ( $method eq 'cel' ) {
--- 35,39 ----
  $sn =~ s/^SN://;
  
! my $dbh1 = DBI->connect('dbi:Pg:dbname=chado-celsius;host=torso.genomics.ctrl.ucla.edu');
  
  if ( $method eq 'cel' ) {
***************
*** 56,67 ****
  elsif ( $valid_method{ $method } ) {
    #Brian may want the mas5.call and mas5.p
    my $sth = $dbh1->prepare(qq(
    SET search_path TO cel, part_elementresult, public;
  
!   SELECT d1.name || x1.accession AS accession, x2.accession AS probeset, $method.signal
!   FROM part_elementresult.$method, cel, cel_dbxref AS cx, element, dbxref AS x1, dbxref AS x2, db AS d1, quantification AS q
!   WHERE $method.quantification_id = q.quantification_id
      AND q.acquisition_id = cel.cel_id
!     AND $method.element_id = element.element_id
      AND element.dbxref_id = x2.dbxref_id
      AND cel.cel_id = cx.cel_id
--- 56,68 ----
  elsif ( $valid_method{ $method } ) {
    #Brian may want the mas5.call and mas5.p
+ 
    my $sth = $dbh1->prepare(qq(
    SET search_path TO cel, part_elementresult, public;
  
!   SELECT d1.name || x1.accession AS accession, x2.accession AS probeset, r.signal
!   FROM part_elementresult.${method}_byq AS r, cel, cel_dbxref AS cx, element, dbxref AS x1, dbxref AS x2, db AS d1, quantification AS q
!   WHERE r.quantification_id = q.quantification_id
      AND q.acquisition_id = cel.cel_id
!     AND r.element_id = element.element_id
      AND element.dbxref_id = x2.dbxref_id
      AND cel.cel_id = cx.cel_id