[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.12, 1.17.2.2.2.13 class.sql.inc.php, 1.1.2.6, 1.1.2.7 class.sql_builder.inc.php, 1.1.2.7, 1.1.2.8 class.sql_entity.inc.php, 1.1.2.7, 1.1.2.8

[Dave Hall <address@hidden>]

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

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


Index: class.sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** class.sql.inc.php   30 Sep 2003 02:42:38 -0000      1.1.2.6
--- class.sql.inc.php   2 Oct 2003 22:23:53 -0000       1.1.2.7
***************
*** 421,425 ****
                        foreach($value as $data)
                        {
!                               $return_value[] = '(CASE '.$data.' WHEN NULL 
THEN \'\' ELSE '.$data.')';
                        }
                        return $return_value;
--- 421,425 ----
                        foreach($value as $data)
                        {
!                               $return_value[] = '(CASE '.$data.' WHEN NULL 
THEN \'\' ELSE '.$data.' END)';
                        }
                        return $return_value;

Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.12
retrieving revision 1.17.2.2.2.13
diff -C2 -d -r1.17.2.2.2.12 -r1.17.2.2.2.13
*** class.contacts_sql.inc.php  30 Sep 2003 05:20:00 -0000      1.17.2.2.2.12
--- class.contacts_sql.inc.php  2 Oct 2003 22:23:53 -0000       1.17.2.2.2.13
***************
*** 20,25 ****
  /* $Id$ */
        include(PHPGW_API_INC . '/class.sql_builder.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
  
        define(PHPGW_CONTACTS_CATEGORIES_ALL, -3);
--- 20,25 ----
  /* $Id$ */
        include(PHPGW_API_INC . '/class.sql_builder.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_criteria.inc.php');
!       include_once(PHPGW_API_INC . '/class.sql_entity.inc.php');
  
        define(PHPGW_CONTACTS_CATEGORIES_ALL, -3);
***************
*** 2453,2456 ****
--- 2453,2464 ----
                                }
                        }
+                       $location = CreateObject('phpgwapi.contact_addr');
+                       $search_fields = (empty($search_fields) || 
!is_array($search_fields)) ? array() : $search_fields;
+                       if(count(array_intersect($location->get_false_fields(), 
$search_fields)) > 0)
+                       {
+                               $addr_preferred_criteria = 
sql_criteria::token_or(sql_criteria::_equal('addr_pref_val', 'Y'),
+                                                                               
sql_criteria::_is_null('key_addr_id'));
+                               $criteria = sql_criteria::token_and($criteria, 
$addr_preferred_criteria);
+                       }
                        if(count($search_fields) > 0 && $pattern)
                        {
***************
*** 2459,2471 ****
                                        $search_array[] = 
sql_criteria::token_has($field, $pattern);
                                }
!                               $search_criteria = 
sql_criteria::_append_or($search_array);
!                               $location = 
CreateObject('phpgwapi.contact_addr');
!                               
if(count(array_intersect($location->get_false_fields(), $search_fields)) > 0)
!                               {
!                                       $addr_preferred_criteria = 
sql_criteria::token_or(sql_criteria::_equal('addr_pref_val', 'Y'),
!                                                                               
        sql_criteria::_is_null('key_addr_id'));
!                                       $search_criteria = 
sql_criteria::token_and($search_criteria, $addr_preferred_criteria);
!                               }
!                               $criteria = sql_criteria::token_and($criteria, 
$search_criteria);
                        }
                        return $criteria;
--- 2467,2471 ----
                                        $search_array[] = 
sql_criteria::token_has($field, $pattern);
                                }
!                               $criteria = sql_criteria::token_and($criteria, 
sql_criteria::_append_or($search_array));
                        }
                        return $criteria;

Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_builder.inc.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** class.sql_builder.inc.php   30 Sep 2003 20:26:29 -0000      1.1.2.7
--- class.sql_builder.inc.php   2 Oct 2003 22:23:54 -0000       1.1.2.8
***************
*** 349,352 ****
--- 349,353 ----
                        $this->distance = NULL;
                        $this->false_path = NULL;
+                       $this->_criteria_built = False;
                        $this->ldebug('get_sql', array('Entities' => 
$this->entities,
                                                'Path' => $this->path,
***************
*** 1143,1149 ****
                {
                        $local_entity  = $this->get_entity($local_field);
!                       $this->entities[$local_entity]->set_elink($local_field, 
$external_entity, $external_field);
                        $external_entity  = $this->get_entity($external_field);
!                       
$this->entities[$external_entity]->set_ilink($external_field, $local_entity, 
$local_field, $key_type);
                }
  
--- 1144,1150 ----
                {
                        $local_entity  = $this->get_entity($local_field);
!                       
$this->entities[$local_entity]->set_elinks($local_field, $external_entity, 
$external_field);
                        $external_entity  = $this->get_entity($external_field);
!                       
$this->entities[$external_entity]->set_ilinks($external_field, $local_entity, 
$local_field, $key_type);
                }
  
***************
*** 1168,1172 ****
  //                          ($myfoo == '')) xor
  //                        ($myfoo == ''))
! //                    if ($myfoo != 'SQL')
  //                    {
                        return;
--- 1169,1173 ----
  //                          ($myfoo == '')) xor
  //                        ($myfoo == ''))
! //                    if ($myfoo != 'SQL')
  //                    {
                        return;

Index: class.sql_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_entity.inc.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** class.sql_entity.inc.php    30 Sep 2003 20:26:29 -0000      1.1.2.7
--- class.sql_entity.inc.php    2 Oct 2003 22:23:54 -0000       1.1.2.8
***************
*** 431,435 ****
                {
                        
$this->add_insert_element($element['field'],$element['real_field'],$element['value']);
-                       
                }
  
--- 431,434 ----
***************
*** 443,448 ****
                function add_insert_element($false_field,$field,$value)
                {
!                       $value_insert = ($value) ? $value : sql::null();
!                       
$this->inserts[$this->insert_index]['data'][$false_field] = array('field' => 
$field, 'value' => $value_insert);
                        $this->ldebug('add_insert_element',
                                      array('False Field' => $false_field,
--- 442,446 ----
                function add_insert_element($false_field,$field,$value)
                {
!                       
$this->inserts[$this->insert_index]['data'][$false_field] = array('field' => 
$field, 'value' => $value);
                        $this->ldebug('add_insert_element',
                                      array('False Field' => $false_field,