[Phpgroupware-cvs] phpgwapi/inc class.sql.inc.php, 1.1.2.5, 1.1.2.6 class.sql_builder.inc.php, 1.1.2.5, 1.1.2.6

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6896

Modified Files:
      Tag: Version-0_9_16-branch
        class.sql.inc.php class.sql_builder.inc.php 
Log Message:
various fixes from eald

Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_builder.inc.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** class.sql_builder.inc.php   26 Sep 2003 05:32:45 -0000      1.1.2.5
--- class.sql_builder.inc.php   30 Sep 2003 02:42:38 -0000      1.1.2.6
***************
*** 51,54 ****
--- 51,55 ----
                var $external_from_value;
                var $external_criteria_value;
+               var $_criteria_built = False;
                /*************************************************************\
                * Entity, class and general section                           *
***************
*** 329,333 ****
                                }
                                $fields = '';
!                               if ($lcriteria && empty($this->all_criteria))
                                {
                                        $this->all_criteria = 
sql_criteria::append_and(array($lcriteria, $this->all_criteria));
--- 330,334 ----
                                }
                                $fields = '';
!                               if ($lcriteria && !$this->_criteria_built)
                                {
                                        $this->all_criteria = 
sql_criteria::append_and(array($lcriteria, $this->all_criteria));
***************
*** 682,685 ****
--- 683,687 ----
                {
                        $num_elements = count($token_criteria);
+                       $this->_criteria_built = True;
                        switch($num_elements)
                        {
***************
*** 754,758 ****
                function criteria($data)
                {
!                       $this->ldebug('criteria', array('Query' => $data), 
'dump');
                        if(empty($data))
                        {
--- 756,760 ----
                function criteria($data)
                {
!                       // $this->ldebug('criteria', array('Query' => $data), 
'dump');
                        if(empty($data))
                        {
***************
*** 762,766 ****
                        if(is_array($data))
                        {
!                               $this->ldebug('criteria', "Query is an array 
$data", 'msg');
                                foreach ($data as $field => $filter)
                                {
--- 764,768 ----
                        if(is_array($data))
                        {
!                               $this->ldebug('criteria', "Query is an arrr 
".var_export($data, True), 'msg');
                                foreach ($data as $field => $filter)
                                {

Index: class.sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql.inc.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** class.sql.inc.php   29 Sep 2003 23:04:37 -0000      1.1.2.5
--- class.sql.inc.php   30 Sep 2003 02:42:38 -0000      1.1.2.6
***************
*** 256,267 ****
                function append_and($clause)
                {
!                       $value = array_shift($clause);
!                       $return_value = $value;
!                       if (current($clause) != NULL && !empty($clause))
                        {
!                               $return_value .= ' AND '.
!                                       sql_criteria::append_and($clause);
                        }
-                       return $return_value;
                }
                
--- 256,269 ----
                function append_and($clause)
                {
!                       if(is_array($clause))
                        {
!                               $value = array_shift($clause);
!                               $return_value = $value;
!                               foreach($clause as $element)
!                               {
!                                       $return_value .= empty($element)?'':' 
AND '.$element;
!                               }
!                               return '('. $return_value .')';
                        }
                }
                
***************
*** 275,290 ****
                function append_or($clause)
                {
!                       if(!is_array($clause))
!                       {
!                               return;
!                       }
!                       $value = array_shift($clause);
!                       $return_value = $value;
!                       if (current($clause) != NULL && !empty($clause))
                        {
!                               $return_value .= ' OR '.
!                                       sql_criteria::append_or($clause);
                        }
-                       return $return_value;
                }
                /*************************************************************\
--- 277,290 ----
                function append_or($clause)
                {
!                       if(is_array($clause))
                        {
!                               $value = array_shift($clause);
!                               $return_value = $value;
!                               foreach($clause as $element)
!                               {
!                                       $return_value .= empty($element)?'':' 
OR '.$element;
!                               }
!                               return '('. $return_value.')';
                        }
                }
                /*************************************************************\