X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;fp=includes%2Fdb_pager.inc;h=f06d650139c5ce8f4840227dfa798c8235c60e08;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=64a79eda8e633cd4316147599bc1be0062fa0346;hpb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 64a79eda..f06d6501 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -39,15 +39,12 @@ class db_pager {
 	    $prev_page, 
 	    $next_page,
 	    $first_page;
-	    
+
 	var $page_len,
 	    $rec_count;
-	
-	var $select,
-		$where,
-	    $from,
-		$group,
-		$order;
+
+	var $order = array();
+
 	var	$extra_where;
 	
 	var $ready = false; // this var is false after change in sql before first
@@ -75,27 +72,6 @@ class db_pager {
 		if ($sql != $this->sql) {
 		    $this->sql = $sql;
 		    $this->ready = false;
-    		$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) {
-				$sql = $parts[0];
-				$this->from = $parts[1];
-			}
-			$this->select = $sql;
 		}
 	}
 	//
@@ -132,8 +108,14 @@ class db_pager {
 	    $ord = $this->columns[$col]['ord'];
 	    $ord = ($ord == '') ? 'asc' : (($ord == 'asc') ? 'desc' : '');
 	    $this->columns[$col]['ord'] = $ord;
+	    $n = array_search($col, $this->order);
+	    if ($n !== false)
+			unset($this->order[$n]);
+		if ($ord != '')
+			array_unshift($this->order, $col); // store column number as first
 	    $this->set_page(1);
 	    $this->query();
+
 	    return true;
 	}
 	//
@@ -174,7 +156,7 @@ class db_pager {
 		} else 
 		  return false;
 		return true;
-	}	    
+	}
 	//
 	//	Calculates page numbers for html controls.
 	//
@@ -210,7 +192,7 @@ class db_pager {
 	//  $flds: array( fldname1, fldname2=>type,...)
 	function set_columns($flds)
 	{
-		$this->columns = array();
+		$this->columns = $this->order = array();
 		if (!is_array($flds)) {
 			$flds = array($flds);
 		}
@@ -242,7 +224,9 @@ class db_pager {
 				case 'skip':		// skip the column (no header)
 					unset($c['head']); break;
 	  		}
-			$this->columns[] = $c;	
+			if (@$c['ord'])
+				array_push($this->order, count($this->columns));
+			$this->columns[] = $c;
 		}
 	}
 	//
@@ -252,50 +236,40 @@ class db_pager {
 	//
 	function _sql_gen($count=false) 
 	{
-		$select = $this->select;
-		$from = $this->from;
-		$where = $this->where;
-		$group = $this->group;
-		$order = $this->order;
-
-		if(count($this->extra_where)) {
-		    $where .= ($where=='' ? '' : ' AND ')
-				.implode(' AND ', $this->extra_where);
-		}
-		if ($where) $where = " WHERE ($where)";
 
-		if ($count) {
-			$group = $group == '' ? "*" : "DISTINCT $group";
+		if (count($this->extra_where)) {
+		    $where = ' WHERE ('.implode(' AND ', $this->extra_where).')';
+		} else
+			$where = '';
+
+		if ($count)
+			return "SELECT COUNT(*) FROM ($this->sql) $where AS _dummyname";
 
-			return "SELECT COUNT($group) FROM $from $where";
-		}
 
-		$sql = "$select FROM $from $where";
-		if ($group) $sql.= " GROUP BY $group";
 	    $ord = array();
 
-	    foreach ($this->columns as $col) {
+		$sql = "SELECT * FROM ($this->sql) $where AS _dummyname";
+
+	    foreach ($this->order as $n) {
+	    	$col = $this->columns[$n];
 	       	if (isset($col['ord'])) {
 	        	if ( $col['ord'] != '' && isset($col['name'])) {
 		    	    $ord[] = $col['name'] .' '. $col['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;
 
+
 	    $sql .= " LIMIT $offset, $page_len";
 
 		return $sql;
-		
+
 	}
 	//
 	//	Initialization after changing record set
@@ -303,7 +277,7 @@ 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');
@@ -313,7 +287,7 @@ class db_pager {
 			$this->rec_count = $row[0];
 	  		$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
@@ -321,7 +295,7 @@ class db_pager {
 		    	   	if (isset($col['ord']) && $col['ord'] != '' 
 						&&  !isset($col['name'])) {
 							display_warning("Result field names must be set
-								for all intially ordered db_pager columns.");
+								for all initially ordered db_pager columns.");
 			    	}
 				}
 	    	}
@@ -395,7 +369,7 @@ class db_pager {
 //			return inactive_control_cell($row[$this->inactive_ctrl['key']],
 //				 $row['inactive'], $this->inactive_ctrl['table'], 
 //				 $this->inactive_ctrl['key']);
-				 
+
 			global	$Ajax;
 
 			$key = $this->key ?