[Phpgroupware-cvs] property/inc/class.sopricebook.inc.php, 1.6.2.6

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.sopricebook.inc.php

date: 2004/12/07 09:04:28;  author: sigurdne;  state: Exp;  lines: +8 -7

Log Message:
Using ilike if pgsql
=====================================================================
Index: property/inc/class.sopricebook.inc.php
diff -u property/inc/class.sopricebook.inc.php:1.6.2.5 
property/inc/class.sopricebook.inc.php:1.6.2.6
--- property/inc/class.sopricebook.inc.php:1.6.2.5      Thu Nov 18 22:12:08 2004
+++ property/inc/class.sopricebook.inc.php      Tue Dec  7 09:04:28 2004
@@ -37,6 +37,7 @@
                        $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
 
                        $this->join                     = $this->socommon->join;
+                       $this->like                     = $this->socommon->like;
                }
 
                function 
add_activity_first_prize($m_cost,$w_cost,$total_cost,$activity_id,$vendor_id,$date)
@@ -224,7 +225,7 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " AND (fm_activities.descr LIKE 
'%$query%' or fm_activities.num LIKE '%$query%')";
+                               $querymethod = " AND (fm_activities.descr 
$this->like '%$query%' or fm_activities.num $this->like '%$query%')";
                        }
 
 
@@ -322,7 +323,7 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " $where (descr LIKE '%$query%' 
or num LIKE '%$query%')";
+                               $querymethod = " $where (descr $this->like 
'%$query%' or num $this->like '%$query%')";
                        }
 
                        $sql = "SELECT * FROM  fm_agreement_group $filtermethod 
$querymethod";
@@ -409,7 +410,7 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " AND (fm_activities.descr LIKE 
'%$query%' or fm_activities.num LIKE '%$query%')";
+                               $querymethod = " AND (fm_activities.descr 
$this->like '%$query%' or fm_activities.num $this->like '%$query%')";
                        }
 
                        $sql = "SELECT 
index_count,this_index,current_index,m_cost,w_cost,total_cost,index_date"
@@ -488,8 +489,8 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-//                             $querymethod = " AND (fm_activities.descr LIKE 
'%$query%' or fm_activities.num LIKE '%$query%')";
-                               $querymethod = " and (fm_activities.descr like 
'%$query%' or fm_activities.base_descr like '%$query%' or fm_activities.num 
like '%$query%') ";
+//                             $querymethod = " AND (fm_activities.descr 
$this->like '%$query%' or fm_activities.num $this->like '%$query%')";
+                               $querymethod = " and (fm_activities.descr 
$this->like '%$query%' or fm_activities.base_descr $this->like '%$query%' or 
fm_activities.num $this->like '%$query%') ";
                        }
 
                        $sql = "SELECT fm_activities.id AS activity_id, 
fm_activities.num, fm_activities.base_descr, fm_activities.unit, 
fm_activities.dim_d, fm_branch.descr as branch, fm_activities.descr, ns3420 "
@@ -570,7 +571,7 @@
                                $query = ereg_replace("'",'',$query);
                                $query = ereg_replace('"','',$query);
 
-                               $querymethod = " AND (fm_vendor.org_name LIKE 
'%$query%' or vendor_id LIKE '%$query%')";
+                               $querymethod = " AND (fm_vendor.org_name 
$this->like '%$query%' or vendor_id $this->like '%$query%')";
                        }
 
                        $sql = "SELECT fm_activities.id as 
activity_id,fm_activities.num, fm_vendor.org_name,fm_branch.descr as branch 
,vendor_id "