phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.1


From: Dave Hall <address@hidden>
Subject: [Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.10, 1.17.2.2.2.11 class.sql.inc.php, 1.1.2.4, 1.1.2.5 class.sql_mssql.inc.php, 1.1.2.2, 1.1.2.3 class.sql_mysql.inc.php, 1.1.2.3, 1.1.2.4 class.sql_pgsql.inc.php, 1.1.2.3, 1.1.2.4
Date: Mon, 29 Sep 2003 23:04:40 +0000

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php class.sql.inc.php 
        class.sql_mssql.inc.php class.sql_mysql.inc.php 
        class.sql_pgsql.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.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.sql.inc.php   26 Sep 2003 05:28:37 -0000      1.1.2.4
--- class.sql.inc.php   29 Sep 2003 23:04:37 -0000      1.1.2.5
***************
*** 415,425 ****
                function safe_null($value)
                {
!                       if(empty($value))
                        {
!                               return ;
                        }
                        foreach($value as $data)
                        {
!                               $return_value[] = 'CASE '.$data.' WHEN NULL 
THEN \'\' ELSE '.$data;
                        }
                        return $return_value;
--- 415,425 ----
                function safe_null($value)
                {
!                       if(empty($value) || !is_array($value))
                        {
!                               return array();
                        }
                        foreach($value as $data)
                        {
!                               $return_value[] = '(CASE '.$data.' WHEN NULL 
THEN \'\' ELSE '.$data.')';
                        }
                        return $return_value;

Index: class.sql_mysql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_mysql.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.sql_mysql.inc.php     26 Sep 2003 05:28:37 -0000      1.1.2.3
--- class.sql_mysql.inc.php     29 Sep 2003 23:04:37 -0000      1.1.2.4
***************
*** 42,47 ****
                function concat_null($elements)
                {
!                       $str =  implode(', ', $elements);
!                       return ($str) ? 'concat('.sql::safe_null($str).')' : '';
                }
        }
--- 42,47 ----
                function concat_null($elements)
                {
!                       $str =  implode(', ', sql::safe_null($elements));
!                       return ($str) ? 'concat('.$str.')' : '';
                }
        }

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.10
retrieving revision 1.17.2.2.2.11
diff -C2 -d -r1.17.2.2.2.10 -r1.17.2.2.2.11
*** class.contacts_sql.inc.php  27 Sep 2003 02:42:20 -0000      1.17.2.2.2.10
--- class.contacts_sql.inc.php  29 Sep 2003 23:04:37 -0000      1.17.2.2.2.11
***************
*** 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_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_pgsql.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.sql_pgsql.inc.php     26 Sep 2003 05:28:37 -0000      1.1.2.3
--- class.sql_pgsql.inc.php     29 Sep 2003 23:04:37 -0000      1.1.2.4
***************
*** 41,46 ****
                function concat_null($elements)
                {
!                       $str = implode(' || ', $elements);
!                       return ($str)? '('.sql::safe_null($str).')' : '';
                }
                function has($field, $value)
--- 41,46 ----
                function concat_null($elements)
                {
!                       $str = implode(' || ', sql::safe_null($elements));
!                       return ($str)? '('.$str.')' : '';
                }
                function has($field, $value)

Index: class.sql_mssql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_mssql.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** class.sql_mssql.inc.php     26 Sep 2003 05:28:37 -0000      1.1.2.2
--- class.sql_mssql.inc.php     29 Sep 2003 23:04:37 -0000      1.1.2.3
***************
*** 41,46 ****
                function concat_null($elements)
                {
!                       $str = implode(' + ', $elements);
!                       return ($str)? '('.sql::safe_null($str).')' : '';
                }
        }
--- 41,46 ----
                function concat_null($elements)
                {
!                       $str = implode(' + ', sql::safe_null($elements));
!                       return ($str)? '('.$str.')' : '';
                }
        }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]