[basedb-cvs] basedb/www acquisition.inc.php,1.12,1.13 array.inc.php,1.33,1.34 bio.inc.php,1.20,1.21 bioassay.inc.php,1.31,1.32 genelist.inc.php,1.19,1.20 image.inc.php,1.10,1.11 item.inc.php,1.25,1.26 job.inc.php,1.34,1.35 molecule.inc.php,1.28,1.29 news.inc.php,1.6,1.7 plate.inc.php,1.29,1.30 program.inc.php,1.20,1.21 raw.inc.php,1.32,1.33 search.inc.php,1.37,1.38 user.inc.php,1.6,1.7 ware.inc.php,1.9,1.10

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

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

Modified Files:
	acquisition.inc.php array.inc.php bio.inc.php bioassay.inc.php 
	genelist.inc.php image.inc.php item.inc.php job.inc.php 
	molecule.inc.php news.inc.php plate.inc.php program.inc.php 
	raw.inc.php search.inc.php user.inc.php ware.inc.php 
Log Message:
Changed WHERE 1 to WHERE TRUE

Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/acquisition.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** acquisition.inc.php	7 Sep 2002 11:36:31 -0000	1.12
--- acquisition.inc.php	9 Sep 2002 06:21:19 -0000	1.13
***************
*** 159,163 ****
  		$query = "SELECT COUNT(*) FROM ImageAcquisition ia ".
  			"LEFT JOIN Image im ON im.imageAcquisition = ia.id ".
! 			"WHERE 1 ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 159,163 ----
  		$query = "SELECT COUNT(*) FROM ImageAcquisition ia ".
  			"LEFT JOIN Image im ON im.imageAcquisition = ia.id ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);

Index: array.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/array.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** array.inc.php	8 Sep 2002 22:38:08 -0000	1.33
--- array.inc.php	9 Sep 2002 06:21:19 -0000	1.34
***************
*** 863,867 ****
  
  		$query = "SELECT COUNT(*) FROM ArrayBatch ab ".
! 			"WHERE 1 ".$search->getWhere()." ".
  			$search->getExtraWhere();
  
--- 863,867 ----
  
  		$query = "SELECT COUNT(*) FROM ArrayBatch ab ".
! 			"WHERE TRUE ".$search->getWhere()." ".
  			$search->getExtraWhere();
  

Index: bio.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/bio.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bio.inc.php	8 Sep 2002 23:13:56 -0000	1.20
--- bio.inc.php	9 Sep 2002 06:21:19 -0000	1.21
***************
*** 161,165 ****
  	{
  		$owner = (int)$owner;
! 		$query = "SELECT * FROM Sample WHERE 1";
  		if($owner >= 0)
  			$query .= " AND owner = $owner";
--- 161,165 ----
  	{
  		$owner = (int)$owner;
! 		$query = "SELECT * FROM Sample WHERE TRUE";
  		if($owner >= 0)
  			$query .= " AND owner = $owner";

Index: bioassay.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/bioassay.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** bioassay.inc.php	8 Sep 2002 22:38:08 -0000	1.31
--- bioassay.inc.php	9 Sep 2002 06:21:19 -0000	1.32
***************
*** 384,388 ****
  				"FROM $config[dbDynamic].BioAssayData$expid bad ".
  				$search->getExtraTables()." ".
! 				"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere();
  			$res = query($query);
  			if($row =& db_fetch_row($res))
--- 384,388 ----
  				"FROM $config[dbDynamic].BioAssayData$expid bad ".
  				$search->getExtraTables()." ".
! 				"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere();
  			$res = query($query);
  			if($row =& db_fetch_row($res))
***************
*** 434,438 ****
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  		$arr = array();
--- 434,438 ----
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  		$arr = array();
***************
*** 475,479 ****
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob";
  		return $genelist->populateFromQuery($query);
--- 475,479 ----
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob";
  		return $genelist->populateFromQuery($query);
***************
*** 499,503 ****
  			"FROM $config[dbDynamic].BioAssayData$expid bad ".
  			$search->getExtraTables()." ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere();
  		return (bool)query($query);
  	}
--- 499,503 ----
  			"FROM $config[dbDynamic].BioAssayData$expid bad ".
  			$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere();
  		return (bool)query($query);
  	}

Index: genelist.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/genelist.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** genelist.inc.php	8 Sep 2002 22:38:08 -0000	1.19
--- genelist.inc.php	9 Sep 2002 06:21:19 -0000	1.20
***************
*** 115,119 ****
  
  		$query = "SELECT COUNT(*) FROM GeneList gl ".
! 			"WHERE 1 ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
--- 115,119 ----
  
  		$query = "SELECT COUNT(*) FROM GeneList gl ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
***************
*** 135,139 ****
  		$query = "SELECT gl.* ".
  			"FROM GeneList gl ".
! 			"WHERE 1 ".$search->getExtraWhere()." ".
  			$search->getWhere()." ".
  			"GROUP BY id $ob ".$search->makeLimit();
--- 135,139 ----
  		$query = "SELECT gl.* ".
  			"FROM GeneList gl ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere()." ".
  			"GROUP BY id $ob ".$search->makeLimit();

Index: image.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/image.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** image.inc.php	8 Sep 2002 22:38:08 -0000	1.10
--- image.inc.php	9 Sep 2002 06:21:19 -0000	1.11
***************
*** 134,138 ****
  
  		$query = "SELECT COUNT(*) FROM Image im ".
! 			"WHERE 1 ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 134,138 ----
  
  		$query = "SELECT COUNT(*) FROM Image im ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
***************
*** 152,156 ****
  
  		$query = "SELECT im.* ".
! 			"FROM Image im WHERE 1 ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"$ob ".$search->makeLimit();
--- 152,156 ----
  
  		$query = "SELECT im.* ".
! 			"FROM Image im WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"$ob ".$search->makeLimit();

Index: item.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/item.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** item.inc.php	8 Sep 2002 23:13:56 -0000	1.25
--- item.inc.php	9 Sep 2002 06:21:19 -0000	1.26
***************
*** 269,273 ****
  	function getSharers()
  	{
! 		$query = "SELECT si.owner, u.`userName` FROM Shared$this->type si ".
  			"LEFT JOIN Submitter u ON u.id = si.owner ".
  			"WHERE si.item = $this->id ORDER BY u.`userName`";
--- 269,274 ----
  	function getSharers()
  	{
! 		$query = "SELECT si.owner, u.`userName` ".
! 			"FROM Shared$this->type si ".
  			"LEFT JOIN Submitter u ON u.id = si.owner ".
  			"WHERE si.item = $this->id ORDER BY u.`userName`";

Index: job.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/job.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** job.inc.php	8 Sep 2002 22:38:08 -0000	1.34
--- job.inc.php	9 Sep 2002 06:21:20 -0000	1.35
***************
*** 273,277 ****
  
  		$query = "SELECT COUNT(*) FROM Job j ".
! 			"WHERE 1 ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 273,277 ----
  
  		$query = "SELECT COUNT(*) FROM Job j ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);

Index: molecule.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/molecule.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** molecule.inc.php	8 Sep 2002 22:38:08 -0000	1.28
--- molecule.inc.php	9 Sep 2002 06:21:20 -0000	1.29
***************
*** 628,632 ****
  		$query = "SELECT COUNT(*) FROM Molecule m ".
  			$search->getExtraTables()." ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
--- 628,632 ----
  		$query = "SELECT COUNT(*) FROM Molecule m ".
  			$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
***************
*** 652,656 ****
  			"l.name AS `libraryName` ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  
--- 652,656 ----
  			"l.name AS `libraryName` ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  
***************
*** 691,695 ****
  		$query = "SELECT m.id ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob";
  
--- 691,695 ----
  		$query = "SELECT m.id ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob";
  

Index: news.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/news.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** news.inc.php	8 Sep 2002 22:38:08 -0000	1.6
--- news.inc.php	9 Sep 2002 06:21:20 -0000	1.7
***************
*** 66,70 ****
  
  		$query = "SELECT COUNT(*) FROM News n ".
! 			"WHERE 1 ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
--- 66,70 ----
  
  		$query = "SELECT COUNT(*) FROM News n ".
! 			"WHERE TRUE ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];

Index: plate.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/plate.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** plate.inc.php	8 Sep 2002 22:38:08 -0000	1.29
--- plate.inc.php	9 Sep 2002 06:21:20 -0000	1.30
***************
*** 253,257 ****
  
  		$query = "SELECT COUNT(*) FROM PlateType pt ".
! 			"WHERE 1 ".$search->getWhere();
  
  		$res = query($query);
--- 253,257 ----
  
  		$query = "SELECT COUNT(*) FROM PlateType pt ".
! 			"WHERE TRUE ".$search->getWhere();
  
  		$res = query($query);
***************
*** 272,276 ****
  		$query = "SELECT pt.* ".
  			"FROM PlateType pt ".
! 			"WHERE 1 ".$search->getWhere()." $ob ".$search->makeLimit();
  
  		$arr = array();
--- 272,276 ----
  		$query = "SELECT pt.* ".
  			"FROM PlateType pt ".
! 			"WHERE TRUE ".$search->getWhere()." $ob ".$search->makeLimit();
  
  		$arr = array();
***************
*** 652,656 ****
  		$query = "SELECT COUNT(*) FROM Plate p ".
  			$search->getExtraTables()." ".
! 			"WHERE 1 ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
--- 652,656 ----
  		$query = "SELECT COUNT(*) FROM Plate p ".
  			$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
***************
*** 678,682 ****
  		$query = "SELECT p.* $selectfields ".
  			"FROM Plate p ".$search->getExtraTables().
! 			"WHERE 1 ".$search->getExtraWhere()." ".
  			$search->getWhere()." $ob ".$search->makeLimit();
  
--- 678,682 ----
  		$query = "SELECT p.* $selectfields ".
  			"FROM Plate p ".$search->getExtraTables().
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere()." $ob ".$search->makeLimit();
  

Index: program.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/program.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** program.inc.php	8 Sep 2002 22:38:08 -0000	1.20
--- program.inc.php	9 Sep 2002 06:21:20 -0000	1.21
***************
*** 260,264 ****
  
  		$query = "SELECT COUNT(*) FROM Program p ".
! 			"WHERE 1 ".$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
--- 260,264 ----
  
  		$query = "SELECT COUNT(*) FROM Program p ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];

Index: raw.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** raw.inc.php	8 Sep 2002 22:38:08 -0000	1.32
--- raw.inc.php	9 Sep 2002 06:21:20 -0000	1.33
***************
*** 266,270 ****
  		$query = "SELECT COUNT(*) ".
  			"FROM RawBioAssay r ".
! 			"WHERE 1 ".
  			$search->getExtraWhere()." ".$search->getWhere();
  
--- 266,270 ----
  		$query = "SELECT COUNT(*) ".
  			"FROM RawBioAssay r ".
! 			"WHERE TRUE ".
  			$search->getExtraWhere()." ".$search->getWhere();
  

Index: search.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/search.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** search.inc.php	8 Sep 2002 23:13:56 -0000	1.37
--- search.inc.php	9 Sep 2002 06:21:20 -0000	1.38
***************
*** 719,725 ****
  		for(reset($textra); list($fid) = each($textra); )
  		{
! 			if(isset($tables[$fid][0])) $this->addExtraTable($tables[$fid][0]);
! 			if(isset($tables[$fid][1])) $this->addExtraWhere($tables[$fid][1]);
! 			if(isset($tables[$fid][2])) $this->addLeftJoin($tables[$fid][2]);
  		}
  		$this->where = $where;
--- 719,728 ----
  		for(reset($textra); list($fid) = each($textra); )
  		{
! 			if(isset($tables[$fid][0]))
! 				$this->addExtraTable($tables[$fid][0]);
! 			if(isset($tables[$fid][1]))
! 				$this->addExtraWhere($tables[$fid][1]);
! 			if(isset($tables[$fid][2]))
! 				$this->addLeftJoin($tables[$fid][2]);
  		}
  		$this->where = $where;

Index: user.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/user.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** user.inc.php	8 Sep 2002 22:38:08 -0000	1.6
--- user.inc.php	9 Sep 2002 06:21:20 -0000	1.7
***************
*** 359,363 ****
  
  		$query = "SELECT COUNT(*) FROM Submitter u ".
! 			"WHERE 1 ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res))
--- 359,363 ----
  
  		$query = "SELECT COUNT(*) FROM Submitter u ".
! 			"WHERE TRUE ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res))
***************
*** 381,385 ****
  			"TO_DAYS(`activeUntil`) - TO_DAYS(NOW()) AS `daysLeft`, ".
  			"(u.`accessMask` & (".BUA_SUPERUSER.")) AS `superUser` ".
! 			"FROM Submitter u WHERE 1 ".$search->getWhere().
  			" $ob ".$search->makeLimit();
  
--- 381,385 ----
  			"TO_DAYS(`activeUntil`) - TO_DAYS(NOW()) AS `daysLeft`, ".
  			"(u.`accessMask` & (".BUA_SUPERUSER.")) AS `superUser` ".
! 			"FROM Submitter u WHERE TRUE ".$search->getWhere().
  			" $ob ".$search->makeLimit();
  

Index: ware.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/ware.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ware.inc.php	8 Sep 2002 22:38:08 -0000	1.9
--- ware.inc.php	9 Sep 2002 06:21:20 -0000	1.10
***************
*** 91,95 ****
  
  		$query = "SELECT COUNT(*) FROM $type w ".
! 			"WHERE 1 ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 91,95 ----
  
  		$query = "SELECT COUNT(*) FROM $type w ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);