[basedb-cvs] basedb/www bioassay.inc.php,1.36,1.37 genelist.inc.php,1.22,1.23

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

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

Modified Files:
	bioassay.inc.php genelist.inc.php 
Log Message:
Fixed adding of genelists for pgsql

Index: bioassay.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/bioassay.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** bioassay.inc.php	10 Sep 2002 23:04:52 -0000	1.36
--- bioassay.inc.php	11 Sep 2002 09:02:04 -0000	1.37
***************
*** 480,484 ****
  		$ob = $search->makeOrderBy($sortfields);
  
! 		$query = "SELECT DISTINCT bad.molecule ".
  			"FROM $config[dbDynamic]BioAssayData$this->experiment bad $ljoin ".
  			$search->getExtraTables()." ".
--- 480,489 ----
  		$ob = $search->makeOrderBy($sortfields);
  
! 		if($GLOBALS["config"]["RDBMS"] == "mysql")
! 			$distinct = "DISTINCT";
! 		else
! 			$distinct = "";
! 
! 		$query = "SELECT $distinct bad.molecule ".
  			"FROM $config[dbDynamic]BioAssayData$this->experiment bad $ljoin ".
  			$search->getExtraTables()." ".

Index: genelist.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/genelist.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** genelist.inc.php	10 Sep 2002 23:05:02 -0000	1.22
--- genelist.inc.php	11 Sep 2002 09:02:04 -0000	1.23
***************
*** 143,147 ****
  			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
  			$search->getWhere()." ".
! 			"GROUP BY id $ob ".$search->makeLimit();
  
  		$arr = array();
--- 143,147 ----
  			"WHERE ".db_true()." ".$search->getExtraWhere()." ".
  			$search->getWhere()." ".
! 			"$ob ".$search->makeLimit();
  
[...105 lines suppressed...]
! 					for(reset($mols); (list($m) = each($mols)) && !$err; )
! 					{
! 						$added++;
! 						$data = array($this->id, $m, $added);
! 						if(!db_multiinsert_row($multi, $data))
! 							$err = true;
! 					}
! 					if(!$err)
! 						$added = db_multiinsert_finish($multi);
! 					else
! 						$added = -1;
! 				}
! 			}
  		}
! 
  		ignore_user_abort($iua);
  		$this->updateGeneCount();
! 		return $added;
  	}