[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.2,1.3 class.sogab.inc.php,1.3,1.4 class.sorequest.inc.php,1.3,1.4 class.uigab.inc.php,1.2,1.3

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv10461/inc

Modified Files:
        class.bogab.inc.php class.sogab.inc.php 
        class.sorequest.inc.php class.uigab.inc.php 
Log Message:
no message

Index: class.bogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bogab.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bogab.inc.php 7 May 2003 09:02:10 -0000       1.2
--- class.bogab.inc.php 7 May 2003 11:18:25 -0000       1.3
***************
*** 82,90 ****
                                                                                
        'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' => 
$feste_nr,'seksjons_nr' => $seksjons_nr,));
                        $this->total_records = $this->so->total_records;
!                       for ($i=0;$i<count($gab);$i++)
                        {
                                
$location_data=$this->socommon->read_location_data($gab[$i]['location_code']);
                                $gab[$i]=$gab[$i] + $location_data;
                        }
                        return $gab;
                }
--- 82,91 ----
                                                                                
        'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' => 
$feste_nr,'seksjons_nr' => $seksjons_nr,));
                        $this->total_records = $this->so->total_records;
! /*                    for ($i=0;$i<count($gab);$i++)
                        {
                                
$location_data=$this->socommon->read_location_data($gab[$i]['location_code']);
                                $gab[$i]=$gab[$i] + $location_data;
                        }
+ */
                        return $gab;
                }

Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sogab.inc.php 7 May 2003 09:02:10 -0000       1.3
--- class.sogab.inc.php 7 May 2003 11:18:25 -0000       1.4
***************
*** 103,107 ****
                        }
  
!                       $sql = "select fm_gab_location.location_code, gab_id 
,count(gab_id) as hits FROM fm_gab_location $filtermethod GROUP BY gab_id";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
--- 103,108 ----
                        }
  
! //                    $sql = "SELECT fm_gab_location.location_code, gab_id 
,count(gab_id) as hits FROM fm_gab_location $filtermethod GROUP BY gab_id";
!                       $sql = "SELECT fm_gab_location.location_code, gab_id 
,count(gab_id) as hits,descr as address  FROM fm_gab_location $this->join 
fm_entrance on fm_gab_location.location_code=fm_entrance.location_code 
$filtermethod GROUP BY gab_id";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
***************
*** 123,126 ****
--- 124,128 ----
                                        'gab_id'                => 
$this->db->f('gab_id'),
                                        'location_code' => 
$this->db->f('location_code'),
+                                       'address'               => 
$this->db->f('address'),
                                        'hits'                  => 
$this->db->f('hits')
                                        );

Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sorequest.inc.php     20 Apr 2003 22:24:30 -0000      1.3
--- class.sorequest.inc.php     7 May 2003 11:18:25 -0000       1.4
***************
*** 231,235 ****
                                $query = ereg_replace('"','',$query);
  
!                               $querymethod = " AND fm_wo_request.name LIKE 
'%$query%' or fm_wo_request.descr LIKE '%$query%' or fm_wo_request.address LIKE 
'%$query%' or fm_wo_request.location_code LIKE '%$query%'";
                        }
  
--- 231,235 ----
                                $query = ereg_replace('"','',$query);
  
!                               $querymethod = " AND fm_wo_request.title LIKE 
'%$query%' or fm_wo_request.address LIKE '%$query%' or 
fm_wo_request.location_code LIKE '%$query%'";
                        }
  

Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uigab.inc.php 7 May 2003 09:02:10 -0000       1.2
--- class.uigab.inc.php 7 May 2003 11:18:25 -0000       1.3
***************
*** 101,105 ****
                                (
                                        'hits'                                  
        => $gab['hits'],
!                                       'address'                               
        => $gab['street_name'],
                                        'gaards_nr'                             
        => substr($gab['gab_id'],4,5),
                                        'bruks_nr'                              
        => substr($gab['gab_id'],9,4),
--- 101,106 ----
                                (
                                        'hits'                                  
        => $gab['hits'],
!       //                              'address'                               
        => $gab['street_name'],
!                                       'address'                               
        => $gab['address'],
                                        'gaards_nr'                             
        => substr($gab['gab_id'],4,5),
                                        'bruks_nr'                              
        => substr($gab['gab_id'],9,4),