[basedb-cvs] basedb/www raw.inc.php,1.34,1.35

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/www
In directory usw-pr-cvs1:/tmp/cvs-serv10482

Modified Files:
	raw.inc.php 
Log Message:
SQL fixes: stddev, types in expressions, LEFT JOIN order...

Index: raw.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** raw.inc.php	9 Sep 2002 06:29:34 -0000	1.34
--- raw.inc.php	9 Sep 2002 15:49:59 -0000	1.35
***************
*** 366,372 ****
  			"s1.id AS sample1, s1.name AS `sampleName1`, ".
  			"s2.id AS sample2, s2.name AS `sampleName2` ".
! 			"FROM RawBioAssay r, SharedRawBioAssay sr, Submitter u, ".
! 			"ImageAcquisition ia, Hybridization h ".
! 			$search->getExtraTables()." ".
  			"LEFT JOIN LabeledExtract le1 ON le1.id = r.`labeledCh1` ".
  			"LEFT JOIN Extract e1 ON e1.id = le1.extract ".
--- 366,370 ----
  			"s1.id AS sample1, s1.name AS `sampleName1`, ".
  			"s2.id AS sample2, s2.name AS `sampleName2` ".
[...149 lines suppressed...]
! 		else
! 		{
! 			$wot = "100*SUM(".db_cast_boolean_int("rbad.flags <> 0").
! 				")/COUNT(rbad.flags), 0";
  		}
  
  		$query = "SELECT r.name, $wot, r.id ".
***************
*** 730,734 ****
  			"ExperimentRawBioAssay pr ".
  			"WHERE rbad.`rawBioAssay` = r.id AND r.id = pr.`rawBioAssay` ".
! 			"AND pr.experiment = $expid GROUP BY id ORDER BY name";
  
  		$res = query($query);
--- 735,739 ----
  			"ExperimentRawBioAssay pr ".
  			"WHERE rbad.`rawBioAssay` = r.id AND r.id = pr.`rawBioAssay` ".
! 			"AND pr.experiment = $expid GROUP BY name, id ORDER BY name";
  
  		$res = query($query);