holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch assoc, to minimise memory usage

Browse Source
This commit is contained in:
Ralf Becker 2008-03-10 21:03:15 +00:00
parent 5ea6f9dc1f
commit c51ea2a0f8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/inc/class.soinfolog.inc.php
View File

@ -650,11 +650,9 @@ class soinfolog // DB-Layer
); );
$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action']; $action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
$action_id = ( strpos($query['action_id'],',')!==false) ? explode(',',$query['action_id']) : $query['action_id']; $action_id = ( strpos($query['action_id'],',')!==false) ? explode(',',$query['action_id']) : $query['action_id'];
if ($action != '') if ($action != '')
{ {
$links = egw_link::get_links($action=='sp'?'infolog':$action,$action_id,'infolog'); $links = egw_link::get_links($action=='sp'?'infolog':$action,$action_id,'infolog');
if (count($links)) if (count($links))
{ {
$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')'; $link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')';
@ -777,8 +775,7 @@ class soinfolog // DB-Layer
} }
else else
{ {
$this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__); $query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
$query['total'] = $this->db->num_rows();
} }
if ($this->db->capabilities['sub_queries']) if ($this->db->capabilities['sub_queries'])
{ {
@ -797,7 +794,7 @@ class soinfolog // DB-Layer
$query['start'] = 0; $query['start'] = 0;
} }
$rs = $this->db->query($sql="SELECT $mysql_calc_rows $distinct main.* $count_subs $info_customfield $sql_query $ordermethod",__LINE__,__FILE__, $rs = $this->db->query($sql="SELECT $mysql_calc_rows $distinct main.* $count_subs $info_customfield $sql_query $ordermethod",__LINE__,__FILE__,
(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1); (int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,egw_db::FETCH_ASSOC);
//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n"; //echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
if ($mysql_calc_rows) if ($mysql_calc_rows)