[Phpgroupware-cvs] property/inc/cron export_info_as_files.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/09/27 09:10:55

Modified files:
        inc/cron       : export_info_as_files.php 

Log message:
        update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/export_info_as_files.php?cvsroot=phpgroupware&r1=1.7&r2=1.8

Patches:
Index: export_info_as_files.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/export_info_as_files.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- export_info_as_files.php    24 Sep 2007 11:20:27 -0000      1.7
+++ export_info_as_files.php    27 Sep 2007 09:10:54 -0000      1.8
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage custom
-       * @version $Id: export_info_as_files.php,v 1.7 2007/09/24 11:20:27 
sigurdne Exp $
+       * @version $Id: export_info_as_files.php,v 1.8 2007/09/27 09:10:54 
sigurdne Exp $
        */
 
        /**
@@ -245,11 +245,13 @@
 
                function export_tenants()
                {
-                       $descr = array('Objekt', 
'Bygg','Inngang','Leieobjekt','Flyttenr', 'Objekt Navn', 'Etternavn', 
'Fornavn', 'Kontakt tlf','Gatenavn','GateNr','Etasje','Antall 
Rom','Boareal','Ferdigdato','klargjøringsstatus');
-                       $name = array('loc1', 'loc2', 
'loc3','loc4','flyttenr','loc1_name', 'last_name', 'first_name', 
'contact_phone','street_name','street_number','etasje','antallrom','boareal','finnish_date','klargj_st');
+                       $descr = array('Objekt', 
'Bygg','Inngang','Leieobjekt','Flyttenr','Reskontronr', 'Objekt Navn', 
'Etternavn', 'Fornavn', 'Kontakt tlf','Gatenavn','GateNr','Etasje','Antall 
Rom','Boareal','Ferdigdato','klargjøringsstatus');
+                       $name = array('loc1', 'loc2', 
'loc3','loc4','flyttenr','reskontronr','loc1_name', 'last_name', 'first_name', 
'contact_phone','street_name','street_number','etasje','antallrom','boareal','finnish_date','klargj_st');
                
                        $filename= 'LEIETAKER';
-                       $sql = "SELECT 
fm_location4.location_code,fm_location4.loc1,fm_location4.loc2,fm_location4.loc3,fm_location4.loc4,fm_location4.flyttenr,fm_location1.loc1_name,fm_tenant.id
 as 
tenant_id,fm_tenant.last_name,fm_tenant.first_name,fm_tenant.contact_phone,fm_streetaddress.descr
 as 
street_name,street_number,fm_location4.street_id,fm_location4.etasje,fm_location4.antallrom,fm_location4.boareal,fm_location4.finnish_date,fm_location4.klargj_st
 FROM ((((((( fm_location4 JOIN fm_location3 ON (fm_location4.loc3 = 
fm_location3.loc3) AND (fm_location4.loc2 = fm_location3.loc2) AND 
(fm_location4.loc1 = fm_location3.loc1)) JOIN fm_location2 ON 
(fm_location3.loc2 = fm_location2.loc2) AND (fm_location3.loc1 = 
fm_location2.loc1)) JOIN fm_location1 ON (fm_location2.loc1 = 
fm_location1.loc1)) JOIN fm_owner ON ( fm_location1.owner_id=fm_owner.id)) JOIN 
fm_part_of_town ON ( 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id)) JOIN 
fm_streetaddress ON ( fm_location4.street_id=fm_streetaddress.id)) JOIN 
fm_tenant ON ( fm_location4.tenant_id=fm_tenant.id)) WHERE 
(fm_location4.category !=99 OR fm_location4.category IS NULL) ORDER BY 
last_name ASC";
+                       $sql = "SELECT 
fm_location4.location_code,fm_location4.loc1,fm_location4.loc2,fm_location4.loc3,fm_location4.loc4,fm_location4.flyttenr,"
+                        . " (fm_location4.loc1 || '.' || fm_location4.loc4 || 
'.' || fm_location4.flyttenr)as reskontronr, 
fm_location1.loc1_name,fm_tenant.id as 
tenant_id,fm_tenant.last_name,fm_tenant.first_name,fm_tenant.contact_phone,fm_streetaddress.descr
 as 
street_name,street_number,fm_location4.street_id,fm_location4.etasje,fm_location4.antallrom,fm_location4.boareal,"
+                        . "to_char(fm_location4.finnish_date, 'DD/MM/YYYY') as 
finnish_date ,fm_location4.klargj_st FROM ((((((( fm_location4 JOIN 
fm_location3 ON (fm_location4.loc3 = fm_location3.loc3) AND (fm_location4.loc2 
= fm_location3.loc2) AND (fm_location4.loc1 = fm_location3.loc1)) JOIN 
fm_location2 ON (fm_location3.loc2 = fm_location2.loc2) AND (fm_location3.loc1 
= fm_location2.loc1)) JOIN fm_location1 ON (fm_location2.loc1 = 
fm_location1.loc1)) JOIN fm_owner ON ( fm_location1.owner_id=fm_owner.id)) JOIN 
fm_part_of_town ON ( 
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id)) JOIN 
fm_streetaddress ON ( fm_location4.street_id=fm_streetaddress.id)) JOIN 
fm_tenant ON ( fm_location4.tenant_id=fm_tenant.id)) WHERE 
(fm_location4.category !=99 OR fm_location4.category IS NULL) AND 
driftsstatus_id > 0 ORDER BY reskontronr ASC";
 
                        $this->export_to_file($name,$descr,$filename, $sql);
                }