[Phpgroupware-cvs] CVS: property/inc/export GABNr,1.3,1.4

[Sigurd Nes <address@hidden>]

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

Modified Files:
        GABNr 
Log Message:
no message

Index: GABNr
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/export/GABNr,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** GABNr       21 Jun 2003 19:27:35 -0000      1.3
--- GABNr       3 Jul 2003 11:50:39 -0000       1.4
***************
*** 10,13 ****
--- 10,14 ----
                        $this->$config          = 
CreateObject('phpgwapi.config','property');
                        $this->socommon         = 
CreateObject($this->currentapp.'.socommon');
+                       $this->solocation       = 
CreateObject($this->currentapp.'.solocation');
                        
                        $this->$config->read_repository();
***************
*** 84,88 ****
                        //Velg ut alle GABNr som skal overføres
                
!                       $sql = "SELECT gab_id,location_code FROM 
fm_gab_location GROUP BY gab_id order by gab_id asc";
  
                        $this->db->query($sql,__LINE__,__FILE__);
--- 85,89 ----
                        //Velg ut alle GABNr som skal overføres
                
!                       $sql = "SELECT gab_id,loc1 FROM fm_gab_location GROUP 
BY gab_id,loc1 order by gab_id asc";
  
                        $this->db->query($sql,__LINE__,__FILE__);
***************
*** 94,113 ****
                                        'gab_id' => $this->db->f('gab_id'),
                                        'address' => $this->db->f('address'),
!                                       'location_code' => 
$this->db->f('location_code')
                                        );
                        }                                                       
                
  
                        for ($i=0;$i<count($gab_list);$i++)
                        {
!                               
$location_data=$this->socommon->read_location_data($gab_list[$i]['location_code']);
!                               $gab_list[$i]=$gab_list[$i] + $location_data;
!                       }
  
  
!                       $buffer = 'GABNr'. '    ' .'Adresse'."\r\n";
  
                        for ($k=0;$k<count($gab_list);$k++)
                        {                               
!                               $buffer .=substr($gab_list[$k]['gab_id'],-20). 
'        ' .$gab_list[$k]['street_name']."\r\n";
                                
                                $antall = $antall + 1;
--- 95,118 ----
                                        'gab_id' => $this->db->f('gab_id'),
                                        'address' => $this->db->f('address'),
!                                       'location_code' => $this->db->f('loc1')
                                        );
                        }                                                       
                
  
+                       $cols_extra=array(0=>'loc1_name');
                        for ($i=0;$i<count($gab_list);$i++)
                        {
!                               
$location_data=$this->solocation->read_single($gab_list[$i]['location_code']);
!                               for ($j=0;$j<count($cols_extra);$j++)
!                               {
!                                       $gab_list[$i][$cols_extra[$j]] = 
$location_data[$cols_extra[$j]];
!                               }
  
+                       }
  
!                       $buffer = 'GABNr'. '    ' .'Objekt'."\r\n";
  
                        for ($k=0;$k<count($gab_list);$k++)
                        {                               
!                               $buffer .=substr($gab_list[$k]['gab_id'],-20). 
'        ' .$gab_list[$k]['loc1_name']."\r\n";
                                
                                $antall = $antall + 1;