[basedb-cvs] basedb/www bioassay.inc.php,1.37,1.38

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

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

Modified Files:
	bioassay.inc.php 
Log Message:
Magic to get all 4 kinds of basefiles to work

Index: bioassay.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/bioassay.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** bioassay.inc.php	11 Sep 2002 09:02:04 -0000	1.37
--- bioassay.inc.php	11 Sep 2002 10:35:12 -0000	1.38
***************
*** 593,597 ****
  				"EXP(AVG(".db_func_log("bad.ratio").")) AS ratio, ".
  				"COUNT(*) AS position";
! 			$group = "GROUP BY id";
  		}
  		else
--- 593,597 ----
  				"EXP(AVG(".db_func_log("bad.ratio").")) AS ratio, ".
  				"COUNT(*) AS position";
! 			$group = "GROUP BY id $xf";
  		}
[...271 lines suppressed...]
  			return;
  		}
--- 914,918 ----
  				}
  			}
! 			$buffer[-1] =& $tempFields;
  			return;
  		}
***************
*** 865,869 ****
--- 922,930 ----
  		$res = query($query);
  		while($row =& db_fetch_assoc($res))
+ 		{
+ 			for(reset($tempFields); list(, $f) = each($tempFields); )
+ 				unset($row[$f]);
  			$callback($row);
+ 		}
  	}