logicampus-cvs

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/menu
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27610

Modified Files:
	menuObj.php 
Log Message:
Cleanup after single queries in menu object.


Index: menuObj.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/menu/menuObj.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** menuObj.php	2 Oct 2007 20:43:51 -0000	1.12
--- menuObj.php	5 Oct 2007 19:27:59 -0000	1.13
***************
*** 98,102 ****
  		while ($db->nextRecord() ) {
  			$menuItems[] = MenuItem::create($db->record);
! 			$lastrec = $db->Record;
  		}
  		$tree->loadObjects($menuItems);
--- 98,102 ----
  		while ($db->nextRecord() ) {
  			$menuItems[] = MenuItem::create($db->record);
! 			$lastrec = $db->record;
  		}
  		$tree->loadObjects($menuItems);
***************
*** 128,133 ****
  		$sql = "select menuObj from menuCache where pkey = $key";
  		$db->query($sql,false);
! 		$db->next_record();
! 		$menu = unserialize($db->Record[0]);
  	return $menu;
  	}
--- 128,133 ----
  		$sql = "select menuObj from menuCache where pkey = $key";
  		$db->query($sql,false);
! 		$db->nextRecord();
! 		$menu = unserialize($db->record[0]);
  	return $menu;
  	}
***************
*** 138,143 ****
          $db = DB::getHandle();
          $sql = "select menuObj from menuCache where (menuid= '$key' and (($groups) and not ($notgroups)))"; 
! 		$db->query($sql,false);
!         $db->nextRecord();
          $menu = unserialize($db->record['menuObj']);
          if (is_object($menu) )
--- 138,142 ----
          $db = DB::getHandle();
          $sql = "select menuObj from menuCache where (menuid= '$key' and (($groups) and not ($notgroups)))"; 
! 		$db->queryOne($sql,false);
          $menu = unserialize($db->record['menuObj']);
          if (is_object($menu) )
***************
*** 176,181 ****
  		$db->query($sql,false);
  		$db->RESULT_TYPE= MYSQL_BOTH;
! 		while ($db->next_record()) {
! 			$ids[] = $db->Record[0];
  		}
  		$db = null;
--- 175,180 ----
  		$db->query($sql,false);
  		$db->RESULT_TYPE= MYSQL_BOTH;
! 		while ($db->nextRecord()) {
! 			$ids[] = $db->record[0];
  		}
  		$db = null;
***************
*** 407,413 ****
  		$db->query("select * from menuItems where pkey = $id",false);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$db->next_record();
  
! 		switch ($db->Record[type]) {
  			case "htm": $name = "HTMLMenuItem";break;
  			case "app": $name = "APPMenuItem";break;
--- 406,412 ----
  		$db->query("select * from menuItems where pkey = $id",false);
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$db->nextRecord();
  
! 		switch ($db->record['type']) {
  			case "htm": $name = "HTMLMenuItem";break;
  			case "app": $name = "APPMenuItem";break;
***************
*** 416,420 ****
  		}
  
! 		$x = PersistantObject::createFromArray($name,$db->Record);
  //print_r($x);exit();
  		$x->groups = substr($x->groups,1,-1);
--- 415,419 ----
  		}
  
! 		$x = PersistantObject::createFromArray($name,$db->record);
  //print_r($x);exit();
  		$x->groups = substr($x->groups,1,-1);