[basedb-cvs] basedb/include/classes bioassay.inc.php,1.32,1.33 search.inc.php,1.30,1.31 program.inc.php,1.12,1.13

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

Update of /cvsroot/basedb/basedb/include/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv19298/include/classes

Modified Files:
	bioassay.inc.php search.inc.php program.inc.php 
Log Message:
fixed problem with averaged serial basefile by adding group by stuff

Index: bioassay.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/bioassay.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** bioassay.inc.php	11 Feb 2003 14:43:06 -0000	1.32
--- bioassay.inc.php	12 Feb 2003 16:16:45 -0000	1.33
***************
*** 537,541 ****
  	// The %% will be replaced correspondingly.
  	function valueSearchExpressions($channels, $average, $forExport = false,
! 		$setid = 0)
  	{
  		static $a = false, $ca = -1;
--- 537,541 ----
  	// The %% will be replaced correspondingly.
  	function valueSearchExpressions($channels, $average, $forExport = false,
! 		$setid = 0, $forExportDisplay = false)
  	{
[...190 lines suppressed...]
! 		}
! 		else if($groupby)
  		{
  			$buffer[2] .= "GROUP BY ".implode(", ", $groupby);
  		}
  
  		$buffer[8] =& $unwantedCols;
***************
*** 1036,1040 ****
  			// and over. Reporters that do not appear in the assays will be
  			// skipped. This is MUCH better than trying to get all the data
! 			// in a single query, at least for MYSQL.
  			$marr = array_keys($genes);
  			for(reset($marr); list(, $m) = each($marr); )
--- 1050,1054 ----
  			// and over. Reporters that do not appear in the assays will be
  			// skipped. This is MUCH better than trying to get all the data
! 			// in a single query, at least for MySQL.
  			$marr = array_keys($genes);
  			for(reset($marr); list(, $m) = each($marr); )

Index: search.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/search.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** search.inc.php	2 Feb 2003 18:03:03 -0000	1.30
--- search.inc.php	12 Feb 2003 16:16:47 -0000	1.31
***************
*** 655,659 ****
--- 655,663 ----
  	{
  		if(!$this->extraColumns)
+ 		{
+ 			if($isFirst)
+ 				return "NULL";
  			return "";
+ 		}
  		$a = "";
  		for(reset($this->extraColumns);

Index: program.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/program.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** program.inc.php	22 Jan 2003 08:01:00 -0000	1.12
--- program.inc.php	12 Feb 2003 16:16:47 -0000	1.13
***************
*** 114,121 ****
--- 114,125 ----
  	function getUsedColumns()
  	{
+ 		if($this->usedColumns == "")
+ 			return array();
  		return array_flip(explode("\t", $this->usedColumns));
  	}
  	function getUsedFields()
  	{
+ 		if($this->usedFields == "")
+ 			return array();
  		return array_flip(explode("\t", $this->usedFields));
  	}
***************
*** 254,258 ****
  			$chans = $this->minChannels;
  			$avg = $this->geneAverages;
! 			$expr = BioAssay::valueSearchExpressions($chans, $avg, true);
  			for($i = 0; $i < count($expr); $i++)
  			{
--- 258,263 ----
  			$chans = $this->minChannels;
  			$avg = $this->geneAverages;
! 			$expr = BioAssay::valueSearchExpressions($chans, $avg,
! 				true, 0, true);
  			for($i = 0; $i < count($expr); $i++)
  			{