[basedb-cvs] basedb/include/classes acquisition.inc.php,1.12,1.13 search.inc.php,1.31,1.32

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

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

Modified Files:
	acquisition.inc.php search.inc.php 
Log Message:
Added image set list and fixed ware links

Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/acquisition.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** acquisition.inc.php	3 Feb 2003 08:51:13 -0000	1.12
--- acquisition.inc.php	13 Feb 2003 08:47:45 -0000	1.13
***************
*** 86,100 ****
  	{
  		// Add more fields and operators here
! 		$fields = array();
  
  		$search->makeWhere($fields);
  		$search->addExtraWhere(Item::whereRemoved("ia", $removed));
  		$search->addExtraWhere(Item::whereShared("ia", $user));
! 		$search->addExtraWhere("ia.hybridization = ".(int)$hybid);
  
  		$query = "SELECT COUNT(*) ".
[...69 lines suppressed...]
  			"WHERE hw.id = ia.scanner AND ug.id = ia.owner ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"GROUP BY ia.id $ss2 $ob ".$search->makeLimit();
--- 132,147 ----
  
  		$query = "SELECT ia.*, $ss1 COUNT(DISTINCT im.id) AS images, ".
! 			db_string_concat(array("hw.name", "' '", "hw.version")).
! 			" AS hardware, hw.removed AS `hardwareRemoved`, ".
! 			Item::whereShared("hw", $user)." AS `hardwareRead`, ".
! 			"h.name AS `hybName`, h.removed AS `hybRemoved`, ".
! 			Item::whereShared("h", $user)." AS `hybRead`, ".
  			"COUNT(DISTINCT r.id) AS raws, ug.name AS `userName` ".
! 			"FROM Hardware hw, UserGroup ug, Hybridization h, ".
! 			"ImageAcquisition ia ".
  			"LEFT JOIN Image im ON im.`imageAcquisition` = ia.id ".
  			"LEFT JOIN RawBioAssay r ON r.`imageAcquisition` = ia.id ".
  			"WHERE hw.id = ia.scanner AND ug.id = ia.owner ".
+ 			"AND h.id = ia.hybridization ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"GROUP BY ia.id $ss2 $ob ".$search->makeLimit();

Index: search.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/search.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** search.inc.php	12 Feb 2003 16:16:47 -0000	1.31
--- search.inc.php	13 Feb 2003 08:47:45 -0000	1.32
***************
*** 111,120 ****
  //   sample, arraytype, extract, hybridization, plate, user, value, labeled,
  //   raw, exp, gene, array, reporter, upload, annottype, ware, protocol,
! //   label, program, rawdata
  //  For UserSearch:
  //   plate, sample, extract, labeled, hybridization, value, arraytype, well,
  //   wizzzard, raw, exp, user, gene, reporterlist, program, news, acq, acq_img,
  //   ware, acq_rba, platetype, print, array, reporter, upload, annottype,
! //   protocol, label, rawdata
  //  For BioAssaySearch:
  //   ge_gene, ge_onegene, bioassay
--- 111,120 ----
  //   sample, arraytype, extract, hybridization, plate, user, value, labeled,
  //   raw, exp, gene, array, reporter, upload, annottype, ware, protocol,
! //   label, program, rawdata, acquisition
  //  For UserSearch:
  //   plate, sample, extract, labeled, hybridization, value, arraytype, well,
  //   wizzzard, raw, exp, user, gene, reporterlist, program, news, acq, acq_img,
  //   ware, acq_rba, platetype, print, array, reporter, upload, annottype,
! //   protocol, label, rawdata, acquisition
  //  For BioAssaySearch:
  //   ge_gene, ge_onegene, bioassay