[basedb-cvs] basedb/www acquisition.inc.php,1.13,1.14 array.inc.php,1.34,1.35 bio.inc.php,1.21,1.22 bioassay.inc.php,1.32,1.33 experiment.inc.php,1.45,1.46 genelist.inc.php,1.20,1.21 image.inc.php,1.11,1.12 job.inc.php,1.35,1.36 molecule.inc.php,1.29,1.30 mysql.inc.php,1.9,1.10 news.inc.php,1.7,1.8 pgsql.inc.php,1.5,1.6 plate.inc.php,1.30,1.31 program.inc.php,1.21,1.22 raw.inc.php,1.33,1.34 user.inc.php,1.7,1.8 ware.inc.php,1.10,1.11

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

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

Modified Files:
	acquisition.inc.php array.inc.php bio.inc.php bioassay.inc.php 
	experiment.inc.php genelist.inc.php image.inc.php job.inc.php 
	molecule.inc.php mysql.inc.php news.inc.php pgsql.inc.php 
	plate.inc.php program.inc.php raw.inc.php user.inc.php 
	ware.inc.php 
Log Message:
Replaced TRUE with db_true because of missing TRUE/FALSE in mysql

Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/acquisition.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** acquisition.inc.php	9 Sep 2002 06:21:19 -0000	1.13
--- acquisition.inc.php	9 Sep 2002 06:29:33 -0000	1.14
***************
*** 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);
--- 159,163 ----
  		$query = "SELECT COUNT(*) FROM ImageAcquisition ia ".
  			"LEFT JOIN Image im ON im.imageAcquisition = ia.id ".
! 			"WHERE ".db_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.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** array.inc.php	9 Sep 2002 06:21:19 -0000	1.34
--- array.inc.php	9 Sep 2002 06:29:34 -0000	1.35
***************
*** 863,867 ****
  
  		$query = "SELECT COUNT(*) FROM ArrayBatch ab ".
! 			"WHERE TRUE ".$search->getWhere()." ".
  			$search->getExtraWhere();
  
--- 863,867 ----
  
  		$query = "SELECT COUNT(*) FROM ArrayBatch ab ".
! 			"WHERE ".db_true()." ".$search->getWhere()." ".
  			$search->getExtraWhere();
  

Index: bio.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/bio.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** bio.inc.php	9 Sep 2002 06:21:19 -0000	1.21
--- bio.inc.php	9 Sep 2002 06:29:34 -0000	1.22
***************
*** 161,165 ****
  	{
  		$owner = (int)$owner;
! 		$query = "SELECT * FROM Sample WHERE TRUE";
  		if($owner >= 0)
  			$query .= " AND owner = $owner";
--- 161,165 ----
  	{
  		$owner = (int)$owner;
! 		$query = "SELECT * FROM Sample WHERE ".db_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.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** bioassay.inc.php	9 Sep 2002 06:21:19 -0000	1.32
--- bioassay.inc.php	9 Sep 2002 06:29:34 -0000	1.33
***************
*** 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))
--- 384,389 ----
  				"FROM $config[dbDynamic].BioAssayData$expid bad ".
  				$search->getExtraTables()." ".
! 				"WHERE ".db_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 TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  		$arr = array();
--- 435,440 ----
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE ".db_true()." ".
! 			$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  		$arr = array();
***************
*** 475,480 ****
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
! 			" $ob";
  		return $genelist->populateFromQuery($query);
  	}
--- 477,482 ----
  			"FROM $config[dbDynamic].BioAssayData$this->experiment bad ".
  			$search->getExtraTables()." $ljoin ".
! 			"WHERE ".db_true()." ".$search->getWhere()." ".
! 			$search->getExtraWhere()." $ob";
  		return $genelist->populateFromQuery($query);
  	}
***************
*** 499,503 ****
  			"FROM $config[dbDynamic].BioAssayData$expid bad ".
  			$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere();
  		return (bool)query($query);
  	}
--- 501,506 ----
  			"FROM $config[dbDynamic].BioAssayData$expid bad ".
  			$search->getExtraTables()." ".
! 			"WHERE ".db_true()." ".$search->getWhere()." ".
! 			$search->getExtraWhere();
  		return (bool)query($query);
  	}

Index: experiment.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/experiment.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** experiment.inc.php	9 Sep 2002 06:20:40 -0000	1.45
--- experiment.inc.php	9 Sep 2002 06:29:34 -0000	1.46
***************
*** 285,289 ****
  
  		$query = "SELECT COUNT(*) FROM Experiment e ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
--- 285,290 ----
  
  		$query = "SELECT COUNT(*) FROM Experiment e ".
! 			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
! 			$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res)) $cnt = $row[0];
***************
*** 318,322 ****
  			"LEFT JOIN BioAssaySet bas ON bas.experiment = e.id ".
  			"LEFT JOIN BioAssay ba ON ba.`bioAssaySet` = bas.id ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".$search->getWhere()." ".
  			"GROUP BY e.id $ss2 $ob ".$search->makeLimit();
  
--- 319,324 ----
  			"LEFT JOIN BioAssaySet bas ON bas.experiment = e.id ".
  			"LEFT JOIN BioAssay ba ON ba.`bioAssaySet` = bas.id ".
! 			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
! 			$search->getWhere()." ".
  			"GROUP BY e.id $ss2 $ob ".$search->makeLimit();
  

Index: genelist.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/genelist.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** genelist.inc.php	9 Sep 2002 06:21:19 -0000	1.20
--- genelist.inc.php	9 Sep 2002 06:29:34 -0000	1.21
***************
*** 115,119 ****
  
  		$query = "SELECT COUNT(*) FROM GeneList gl ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
--- 115,119 ----
  
  		$query = "SELECT COUNT(*) FROM GeneList gl ".
! 			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
***************
*** 135,139 ****
  		$query = "SELECT gl.* ".
  			"FROM GeneList gl ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere()." ".
  			"GROUP BY id $ob ".$search->makeLimit();
--- 135,139 ----
  		$query = "SELECT gl.* ".
  			"FROM GeneList gl ".
! 			"WHERE ".db_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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** image.inc.php	9 Sep 2002 06:21:19 -0000	1.11
--- image.inc.php	9 Sep 2002 06:29:34 -0000	1.12
***************
*** 134,138 ****
  
  		$query = "SELECT COUNT(*) FROM Image im ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 134,138 ----
  
  		$query = "SELECT COUNT(*) FROM Image im ".
! 			"WHERE ".db_true()." ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
***************
*** 152,156 ****
  
  		$query = "SELECT im.* ".
! 			"FROM Image im WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"$ob ".$search->makeLimit();
--- 152,156 ----
  
  		$query = "SELECT im.* ".
! 			"FROM Image im WHERE ".db_true()." ".
  			$search->getWhere()." ".$search->getExtraWhere()." ".
  			"$ob ".$search->makeLimit();

Index: job.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/job.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** job.inc.php	9 Sep 2002 06:21:20 -0000	1.35
--- job.inc.php	9 Sep 2002 06:29:34 -0000	1.36
***************
*** 273,277 ****
  
  		$query = "SELECT COUNT(*) FROM Job j ".
! 			"WHERE TRUE ".
  			$search->getWhere()." ".$search->getExtraWhere();
  		$res = query($query);
--- 273,277 ----
  
  		$query = "SELECT COUNT(*) FROM Job j ".
! 			"WHERE ".db_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.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** molecule.inc.php	9 Sep 2002 06:21:20 -0000	1.29
--- molecule.inc.php	9 Sep 2002 06:29:34 -0000	1.30
***************
*** 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];
--- 628,633 ----
  		$query = "SELECT COUNT(*) FROM Molecule m ".
  			$search->getExtraTables()." ".
! 			"WHERE ".db_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 TRUE ".$search->getWhere()." ".$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  
--- 653,658 ----
  			"l.name AS `libraryName` ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE ".db_true()." ".$search->getWhere()." ".
! 			$search->getExtraWhere().
  			" $ob ".$search->makeLimit();
  
***************
*** 691,696 ****
  		$query = "SELECT m.id ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getWhere()." ".$search->getExtraWhere().
! 			" $ob";
  
  		return $genelist->populateFromQuery($query);
--- 693,698 ----
  		$query = "SELECT m.id ".
  			"FROM Molecule m ".$search->getExtraTables()." ".
! 			"WHERE ".db_true()." ".$search->getWhere()." ".
! 			$search->getExtraWhere()." $ob";
  
  		return $genelist->populateFromQuery($query);

Index: mysql.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/mysql.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mysql.inc.php	9 Sep 2002 06:21:00 -0000	1.9
--- mysql.inc.php	9 Sep 2002 06:29:34 -0000	1.10
***************
*** 265,267 ****
--- 265,272 ----
  }
  
+ function db_true()
+ {
+ 	return "1";
+ }
+ 
  ?>

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

Index: pgsql.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/pgsql.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pgsql.inc.php	9 Sep 2002 06:21:00 -0000	1.5
--- pgsql.inc.php	9 Sep 2002 06:29:34 -0000	1.6
***************
*** 329,331 ****
--- 329,336 ----
  }
  
+ function db_true()
+ {
+ 	return "TRUE";
+ }
+ 
  ?>

Index: plate.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/plate.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** plate.inc.php	9 Sep 2002 06:21:20 -0000	1.30
--- plate.inc.php	9 Sep 2002 06:29:34 -0000	1.31
***************
*** 253,257 ****
  
  		$query = "SELECT COUNT(*) FROM PlateType pt ".
! 			"WHERE TRUE ".$search->getWhere();
  
  		$res = query($query);
--- 253,257 ----
  
  		$query = "SELECT COUNT(*) FROM PlateType pt ".
! 			"WHERE ".db_true()." ".$search->getWhere();
  
  		$res = query($query);
***************
*** 272,276 ****
  		$query = "SELECT pt.* ".
  			"FROM PlateType pt ".
! 			"WHERE TRUE ".$search->getWhere()." $ob ".$search->makeLimit();
  
  		$arr = array();
--- 272,277 ----
  		$query = "SELECT pt.* ".
  			"FROM PlateType pt ".
! 			"WHERE ".db_true()." ".
! 			$search->getWhere()." $ob ".$search->makeLimit();
  
  		$arr = array();
***************
*** 652,656 ****
  		$query = "SELECT COUNT(*) FROM Plate p ".
  			$search->getExtraTables()." ".
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
--- 653,657 ----
  		$query = "SELECT COUNT(*) FROM Plate p ".
  			$search->getExtraTables()." ".
! 			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
  			$search->getWhere();
  		$res = query($query);
***************
*** 678,682 ****
  		$query = "SELECT p.* $selectfields ".
  			"FROM Plate p ".$search->getExtraTables().
! 			"WHERE TRUE ".$search->getExtraWhere()." ".
  			$search->getWhere()." $ob ".$search->makeLimit();
  
--- 679,683 ----
  		$query = "SELECT p.* $selectfields ".
  			"FROM Plate p ".$search->getExtraTables().
! 			"WHERE ".db_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.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** program.inc.php	9 Sep 2002 06:21:20 -0000	1.21
--- program.inc.php	9 Sep 2002 06:29:34 -0000	1.22
***************
*** 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];
--- 260,265 ----
  
  		$query = "SELECT COUNT(*) FROM Program p ".
! 			"WHERE ".db_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.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** raw.inc.php	9 Sep 2002 06:21:20 -0000	1.33
--- raw.inc.php	9 Sep 2002 06:29:34 -0000	1.34
***************
*** 266,270 ****
  		$query = "SELECT COUNT(*) ".
  			"FROM RawBioAssay r ".
! 			"WHERE TRUE ".
  			$search->getExtraWhere()." ".$search->getWhere();
  
--- 266,270 ----
  		$query = "SELECT COUNT(*) ".
  			"FROM RawBioAssay r ".
! 			"WHERE ".db_true()." ".
  			$search->getExtraWhere()." ".$search->getWhere();
  

Index: user.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/user.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** user.inc.php	9 Sep 2002 06:21:20 -0000	1.7
--- user.inc.php	9 Sep 2002 06:29:34 -0000	1.8
***************
*** 359,363 ****
  
  		$query = "SELECT COUNT(*) FROM Submitter u ".
! 			"WHERE TRUE ".$search->getWhere();
  		$res = query($query);
  		if($row =& db_fetch_row($res))
--- 359,363 ----
  
  		$query = "SELECT COUNT(*) FROM Submitter u ".
! 			"WHERE ".db_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 TRUE ".$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 ".db_true()." ".$search->getWhere().
  			" $ob ".$search->makeLimit();
  

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