[basedb-cvs] basedb/www assay_table.phtml,1.24,1.25 gene_explore.phtml,1.71,1.72

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

Update of /cvsroot/basedb/basedb/www
In directory sc8-pr-cvs1:/tmp/cvs-serv7524

Modified Files:
	assay_table.phtml gene_explore.phtml 
Log Message:
Added import and display of extra bioassayset float columns

Index: assay_table.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/assay_table.phtml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** assay_table.phtml	3 Feb 2003 08:54:11 -0000	1.24
--- assay_table.phtml	11 Feb 2003 14:43:56 -0000	1.25
***************
*** 180,184 ****
  		// Add the columns as non-shown to speed up the reporter list adding.
  		$columns = makeValueSearchColumns($ass->getChannels(), 0, 0, 0,
! 			$rawLevel, $repLevel);
  		// Clone the search because we'll do irreversible changes to it.
  		$search2 = $search;
--- 180,184 ----
  		// Add the columns as non-shown to speed up the reporter list adding.
  		$columns = makeValueSearchColumns($ass->getChannels(), 0, 0, 0,
! 			$rawLevel, $repLevel, $ass->getBioAssaySet());
  		// Clone the search because we'll do irreversible changes to it.
  		$search2 = $search;
***************
*** 199,203 ****
  
  	$columns = makeValueSearchColumns($ass->getChannels(), 1,
! 		count($cbRaws), $lims, $rawLevel, $repLevel);
  	$ass->addValueSearchColumns($search, $columns);
  
--- 199,203 ----
  
  	$columns = makeValueSearchColumns($ass->getChannels(), 1,
! 		count($cbRaws), $lims, $rawLevel, $repLevel, $ass->getBioAssaySet());
  	$ass->addValueSearchColumns($search, $columns);
  
***************
*** 245,249 ****
  
  function makeValueSearchColumns($channels, $show, $spots,
! 	$lims, $rawLevel, $repLevel)
  {
  	$cols = array(
--- 245,249 ----
  
  function makeValueSearchColumns($channels, $show, $spots,
! 	$lims, $rawLevel, $repLevel, $setid)
  {
  	$cols = array(
***************
*** 267,270 ****
--- 267,272 ----
  			"renderExploreRatio", $show);
  	}
+ 
+ 	addExtraDataColumnsToColumns($cols, $setid, $show);
  
  	$rawcols = RawBioAssayData::getAllShownColumns();

Index: gene_explore.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/gene_explore.phtml,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** gene_explore.phtml	4 Feb 2003 21:51:13 -0000	1.71
--- gene_explore.phtml	11 Feb 2003 14:43:57 -0000	1.72
***************
*** 373,377 ****
  		$average = $gpage == -1;
  		$columns = makeExploreSearchColumns($channels, $average, $annot != 0,
! 			$showBackend, $spotSize != 0, $rawLevel);
  		BioAssay::prepareExploreSearch($onesearch, $columns, 0, $expid,
  			$channels, $average, $setid);
--- 373,377 ----
  		$average = $gpage == -1;
  		$columns = makeExploreSearchColumns($channels, $average, $annot != 0,
! 			$showBackend, $spotSize != 0, $rawLevel, $setid);
  		BioAssay::prepareExploreSearch($onesearch, $columns, 0, $expid,
  			$channels, $average, $setid);
***************
*** 925,929 ****
  
  function makeExploreSearchColumns($channels, $average, $hasannot,
! 	$showBackend, $showSpot = false, $rawLevel = 3)
  {
  	$cols = array();
--- 925,929 ----
  
  function makeExploreSearchColumns($channels, $average, $hasannot,
! 	$showBackend, $showSpot = false, $rawLevel = 3, $setid)
  {
  	$cols = array();
***************
*** 947,950 ****
--- 947,952 ----
  			"renderExploreRatio", 1);
  	}
+ 
+ 	addExtraDataColumnsToColumns($cols, $setid, 1);
  
  	$rawcols = RawBioAssayData::getAllShownColumns();