[geeklog-cvs] Geeklog-2/system/DataAccess DAOFactory.php,1.1.1.1,1.2 NamedQueries.xml,1.1.1.1,1.2 PropelDAO.php,1.1.1.1,1.2

[tony at iowaoutdoors.org]

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

Modified Files:
	DAOFactory.php NamedQueries.xml PropelDAO.php 
Log Message:
Bug squashin.  Code working ok in limited testing.


Index: NamedQueries.xml
===================================================================
RCS file: /var/cvs/Geeklog-2/system/DataAccess/NamedQueries.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NamedQueries.xml	17 Dec 2004 23:35:47 -0000	1.1.1.1
--- NamedQueries.xml	20 Dec 2004 22:06:40 -0000	1.2
***************
*** 2,29 ****
  <named_queries>
  	<query name="getUserByUserName" type="propel">
! 		<criteria propelPeer="HlUserPeer" column="USER_NAME" propelOperator="" testValue="tony"/>
! 	</query>
! 	<query name="getAllStates" type="SQL">
! 		<sql propelPeer="HlListOfValuesPeer">SELECT * FROM hl_list_of_values WHERE group_name = 'STATE' ORDER BY sort_order</sql>
! 	</query>
! 	<query name="getLocationsByUserId" type="propel">
! 		<criteria propelPeer="HlLocationPeer" column="USER_ID" propelOperator="" testValue="1"/>
! 	</query>
! 	<query name="getAllCloudCover" type="SQL">
! 		<sql propelPeer="HlListOfValuesPeer">SELECT * FROM hl_list_of_values WHERE group_name = 'CLOUDCOVER' ORDER BY sort_order</sql>
! 	</query>
! 	<query name="getAllWindSpeed" type="SQL">
! 		<sql propelPeer="HlListOfValuesPeer">SELECT * FROM hl_list_of_values WHERE group_name = 'WINDSPEED' ORDER BY sort_order</sql>
! 	</query>
! 	<query name="getAllWindDirection" type="SQL">
! 		<sql propelPeer="HlListOfValuesPeer">SELECT * FROM hl_list_of_values WHERE group_name = 'WINDDIRECTION' ORDER BY sort_order</sql>
! 	</query>
! 	<query name="getAllMoonPhases" type="SQL">
! 		<sql propelPeer="HlListOfValuesPeer">SELECT * FROM hl_list_of_values WHERE group_name = 'MOONPHASE' ORDER BY sort_order</sql>
! 	</query>
! 	<query name="sqlTestWithArgs" type="SQL">
! 	    <sql propelPeer="HlHuntPeer">SELECT * FROM hl_hunt WHERE location_id = ? AND wind_direction_id = ?</sql>
! 	    <testValue name="location_id" value="2" />
! 	    <testValue name="wind_direction_id" value="19" />
  	</query>
  </named_queries>
\ No newline at end of file
--- 2,6 ----
  <named_queries>
  	<query name="getUserByUserName" type="propel">
! 		<criteria propelPeer="GL2UserPeer" column="USER_NAME" propelOperator="" testValue="tony"/>
  	</query>
  </named_queries>
\ No newline at end of file

Index: DAOFactory.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/DataAccess/DAOFactory.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DAOFactory.php	17 Dec 2004 23:35:47 -0000	1.1.1.1
--- DAOFactory.php	20 Dec 2004 22:06:40 -0000	1.2
***************
*** 6,14 ****
  		global $glConf;
  		
! 		$fileToInclude = $glConf['path_system'] . "DataAccess/{$hlConf['dao_object']}.php";
  		
  		require_once $fileToInclude;
  		
! 		$daoObj = new $hlConf['dao_object']();
  		
  		return $daoObj;
--- 6,15 ----
  		global $glConf;
  		
! 		$fileToInclude = $glConf['path_system'] . "DataAccess/{$glConf['dao_object']}.php";
  		
  		require_once $fileToInclude;
  		
! 		$nameOfClass = "Geeklog_{$glConf['dao_object']}";
! 		$daoObj = new $nameOfClass();
  		
  		return $daoObj;

Index: PropelDAO.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/DataAccess/PropelDAO.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PropelDAO.php	17 Dec 2004 23:35:47 -0000	1.1.1.1
--- PropelDAO.php	20 Dec 2004 22:06:40 -0000	1.2
***************
*** 4,12 ****
  
  /**
- * Base include file.. pulls in code needed for all requests.
- */
- require_once('../includes.php');
- 
- /**
  * Data Access Object
  */
--- 4,7 ----
***************
*** 215,219 ****
  		// Load set of named queries
  		$this->dom = new DomDocument();
! 		$this->dom->load($glConf['path_system'] . 'Data_Access/NamedQueries.xml');
  		$xpath = new DOMXPath($this->dom);
          $queryList = $xpath->query("/named_queries/query[@name='$queryName']");
--- 210,214 ----
  		// Load set of named queries
  		$this->dom = new DomDocument();
! 		$this->dom->load($glConf['path_system'] . 'DataAccess/NamedQueries.xml');
  		$xpath = new DOMXPath($this->dom);
          $queryList = $xpath->query("/named_queries/query[@name='$queryName']");