[basedb-cvs] basedb/include/classes .cvsignore,NONE,1.1 array.inc.php,1.19,1.20

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

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

Modified Files:
	array.inc.php 
Added Files:
	.cvsignore 
Log Message:
Ignoring Makefile.in but not Makefile.am

--- NEW FILE: .cvsignore ---
Makefile.in
Makefile

Index: array.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/array.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** array.inc.php	2 Feb 2003 13:44:00 -0000	1.19
--- array.inc.php	13 Feb 2003 10:16:32 -0000	1.20
***************
*** 521,527 ****
  
  		$query = "SELECT e.block, e.x, e.y, r.`reporterId`, r.`geneName` ".
! 			"FROM Element e, Well w, Probe p, Reporter r ".
! 			"WHERE e.`arrayType` = $atid AND w.id = e.well ".
! 			"AND p.id = w.probe AND r.id = p.reporter ".
  			"ORDER BY block, x, y";
  		$res = query($query);
--- 521,528 ----
  
  		$query = "SELECT e.block, e.x, e.y, r.`reporterId`, r.`geneName` ".
! 			"FROM Element e LEFT JOIN Well w ON w.id = e.well ".
! 			"CROSS JOIN Probe p ON p.id = w.probe ".
! 			"CROSS JOIN Reporter r ON r.id = p.reporter ".
! 			"WHERE e.`arrayType` = $atid ".
  			"ORDER BY block, x, y";
  		$res = query($query);