[basedb-cvs] basedb/www search.inc.php,1.40,1.41

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

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

Modified Files:
	search.inc.php 
Log Message:
Genelist fixes, changed , to CROSS JOIN for extraTables

Index: search.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/www/search.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** search.inc.php	11 Sep 2002 09:02:50 -0000	1.40
--- search.inc.php	11 Sep 2002 10:35:51 -0000	1.41
***************
*** 559,564 ****
  	function getExtraTables()
  	{
! 		if(!$this->extraTables) return implode(" ", $this->leftJoin);
! 		return ",".implode(",", array_keys($this->extraTables))." ".
  			implode(" ", $this->leftJoin);
  	}
--- 559,566 ----
  	function getExtraTables()
  	{
! 		if(!$this->extraTables)
! 			return implode(" ", $this->leftJoin);
! 		return " CROSS JOIN ".
! 			implode(" CROSS JOIN ", array_keys($this->extraTables))." ".
  			implode(" ", $this->leftJoin);
  	}
***************
*** 580,584 ****
  			list(, $c) = each($this->extraColumns); )
  		{
! 			$a .= ", $c[4] AS $c[2]";
  		}
  		return $a;
--- 582,586 ----
  			list(, $c) = each($this->extraColumns); )
  		{
! 			$a .= ", $c[4] AS `$c[2]`";
  		}
  		return $a;
***************
*** 711,715 ****
  				$this->addExtraTable("GeneListGene glg$pos");
  				$this->addExtraWhere("glg$pos.molecule = $fname ".
! 					"AND glg$pos.geneList = $gl");
  				$glname = $this->criteria[$i]->getViewable();
  				$this->addExtraColumn($glname[0], 1, "glValue$pos", 0,
--- 713,717 ----
  				$this->addExtraTable("GeneListGene glg$pos");
  				$this->addExtraWhere("glg$pos.molecule = $fname ".
! 					"AND glg$pos.`geneList` = $gl");
  				$glname = $this->criteria[$i]->getViewable();
  				$this->addExtraColumn($glname[0], 1, "glValue$pos", 0,
***************
*** 721,725 ****
  				$gl = (int)$this->criteria[$i]->getValue();
  				$this->addLeftJoin("LEFT JOIN GeneListGene glg$pos ".
! 					"ON glg$pos.molecule = $fname AND glg$pos.geneList = $gl");
  				$this->addExtraWhere("glg$pos.molecule $ops[$op]");
  			}
--- 723,727 ----
  				$gl = (int)$this->criteria[$i]->getValue();
  				$this->addLeftJoin("LEFT JOIN GeneListGene glg$pos ".
! 					"ON glg$pos.molecule = $fname AND glg$pos.`geneList` = $gl");
  				$this->addExtraWhere("glg$pos.molecule $ops[$op]");
  			}