X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=819b4757f5c7e3381b749f9bc3d7073b8ea187ec;hb=6cd42b4b7e4e5a199949a33fcf7fbd1f5d0ad3cb;hp=328a424f76e0c6a442c903228ea8115735aecae1;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git diff --git a/includes/db_pager.inc b/includes/db_pager.inc index 328a424f..819b4757 100644 --- a/includes/db_pager.inc +++ b/includes/db_pager.inc @@ -1,4 +1,14 @@ . +***********************************************************************/ // // Controler part of database table pager with column sort. // To display actual html object call display_db_pager($name) inside @@ -16,6 +26,7 @@ class db_pager { var $marker_txt; var $marker_class; var $notice_class; + var $width; // table width (default '95%') var $header_fun; // additional row between title and body var $header_class; var $footer_fun; @@ -35,17 +46,20 @@ class db_pager { var $select, $where, $from, - $group; + $group, + $order; var $extra_where; var $ready = false; // this var is false after change in sql before first // and before first query. // db_pager constructor - // accepts $sql like 'SELECT .... FROM .... [WHERE ...] [GROUP ...]' + // accepts $sql like 'SELECT ...[FROM ...][WHERE ...][GROUP ...][ORDER ...]' // $name is base name for pager controls function db_pager($sql, $name, $page_len=0) { + global $table_style; + $this->width = "95%"; if ($page_len == 0) $page_len = user_query_size(); $this->name = $name; $this->page_len = $page_len; @@ -59,49 +73,44 @@ class db_pager { if ($sql != $this->sql) { $this->sql = $sql; $this->ready = false; - $select = $sql; - $from = $where = $group = ''; + $parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2); + if(count($parts) == 2) { + $sql = $parts[0]; + $this->order = $parts[1]; + } + $parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2); + if(count($parts) == 2) { + $sql = $parts[0]; + $this->group = $parts[1]; + } + $parts = preg_split('/\sWHERE\s/si', $sql, 2); + if(count($parts) == 2) { + $sql = $parts[0]; + $this->where = $parts[1]; + } $parts = preg_split('/\sFROM\s/si', $sql, 2); if(count($parts) == 2) { - $select = $parts[0]; - $from = $parts[1]; - $parts = preg_split('/\sWHERE\s/si', $from, 2); - if(count($parts) == 2) { - $from = $parts[0]; - $where = $parts[1]; - $parts = preg_split('/\sGROUP\s*BY\s/si', $where, 2); - if(count($parts) == 2) { - $where = $parts[0]; - $group = $parts[1]; - } - } + $sql = $parts[0]; + $this->from = $parts[1]; } - $this->select = $select; - $this->from = $from; - $this->where = $where; - $this->group = $group; -/* - display_error("sql: $sql"); - display_error($select); - display_error("FROM $from"); - display_error("WHERE $where"); - display_error("GROUP BY $group"); -*/ + $this->select = $sql; } } // // Set additional constraint on record set // - function set_where($where) + function set_where($where = null) { - if (!is_array($where)) - $where = array($where); + if ($where) { + if (!is_array($where)) + $where = array($where); - if (count($where) != count($this->extra_where) || - count(array_diff($this->extra_where, $where))) { - $this->extra_where = $where; - $this->ready = false; - } + if (count($where) == count($this->extra_where) && + !count(array_diff($this->extra_where, $where))) + return; + } + $this->extra_where = $where; + $this->ready = false; } // // Set query result page @@ -239,12 +248,13 @@ class db_pager { $from = $this->from; $where = $this->where; $group = $this->group; + $order = $this->order; if(count($this->extra_where)) { $where .= ($where=='' ? '' : ' AND ') .implode( $this->extra_where, ' AND '); } - if ($where) $where = " WHERE($where)"; + if ($where) $where = " WHERE ($where)"; if ($count) { $group = $group == '' ? "*" : "DISTINCT $group"; @@ -253,10 +263,10 @@ class db_pager { } $sql = "$select FROM $from $where"; - if($group) $sql.= " GROUP BY $group"; + if ($group) $sql.= " GROUP BY $group"; $ord = array(); - foreach( $this->columns as $col) { + foreach ($this->columns as $col) { if (isset($col['ord'])) { if ( $col['ord'] != '' && isset($col['name'])) { $ord[] = $col['name'] .' '. $col['ord']; @@ -264,8 +274,12 @@ class db_pager { } } - if (count($ord)) + if (count($ord)) { $sql .= " ORDER BY " . implode($ord, ','); + } else { + if($order) + $sql .= " ORDER BY $order"; // original base query order + } $page_len = $this->page_len; $offset = ($this->curr_page - 1) * $page_len; @@ -280,6 +294,8 @@ class db_pager { // function _init() { + global $go_debug; + if ($this->ready == false ) { $sql = $this->_sql_gen(true); $result = db_query($sql, 'Error reading record set'); @@ -287,7 +303,20 @@ class db_pager { return false; $row = db_fetch_row($result); $this->rec_count = $row[0]; - $this->max_page = ceil($this->rec_count/$this->page_len); + $this->max_page = $this->page_len ? + ceil($this->rec_count/$this->page_len) : 0; + + if ($go_debug) { // FIX - need column name parsing, but for now: + // check if field names are set explicite in col def + // for all initially ordered columns + foreach ($this->columns as $col) { + if (isset($col['ord']) && $col['ord'] != '' + && !isset($col['name'])) { + display_warning("Result field names must be set + for all intially ordered db_pager columns."); + } + } + } $this->set_page(1); $this->ready = true; } @@ -385,5 +414,12 @@ function &new_db_pager($name, $sql, $coldef, $page_len = 0) { return $ret; } - +// +// Force pager initialization. +// +function refresh_pager($name) +{ + if (isset($_SESSION[$name])) + $_SESSION[$name]->ready = false; +} ?> \ No newline at end of file