[geeklog-cvs] Geeklog-2/system/DataAccess PropelDAO.php,1.3,1.4

[tony at iowaoutdoors.org]

Update of /var/cvs/Geeklog-2/system/DataAccess
In directory www:/tmp/cvs-serv32101

Modified Files:
	PropelDAO.php 
Log Message:
Worked out some bugs when using Propel's query object (read: when you 
actually use the propelOperator in the NamedQueries.xml)


Index: PropelDAO.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/DataAccess/PropelDAO.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropelDAO.php	21 Dec 2004 03:21:53 -0000	1.3
--- PropelDAO.php	22 Dec 2004 00:05:45 -0000	1.4
***************
*** 229,232 ****
--- 229,236 ----
          			throw new Exception('You can not use more than one peer object in a single query');
          		}
+         		if (!class_exists($propelPeer)) {
+         			// Class not defined, try loading it
+         			require_once $glConf['path_propel_classes'] . "Geeklog-2/$propelPeer.php";
+         		}
          		$columnName = $curCriteria->getAttribute('column');
          		$propelOperator = $curCriteria->getAttribute('propelOperator');
***************
*** 237,241 ****
          			$c->add($actualColumnName, current($args));
          		} else {
!         			$c->add($actualColumnName, current($args), $propelOperator);
          		}
          		next($args);
--- 241,248 ----
          			$c->add($actualColumnName, current($args));
          		} else {
!         			$cClass = new ReflectionClass('Criteria');
!         			$opValue = $cClass->getConstant($propelOperator);
!         			//$c->add($actualColumnName, current($args), $propelOperator);
!         			$c->add($actualColumnName, $args, $opValue);
          		}
          		next($args);