[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service, 1.14, 1.15 Import_fra_Kemner, 1.14, 1.15 Import_fra_BKK, 1.13, 1.14

[Sigurd Nes <address@hidden>]

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

Modified Files:
        Import_fra_Service Import_fra_Kemner Import_fra_BKK 
Log Message:
no message

Index: Import_fra_Service
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Import_fra_Service  6 Aug 2003 17:07:58 -0000       1.14
--- Import_fra_Service  7 Aug 2003 16:08:58 -0000       1.15
***************
*** 1,26 ****
  <?php
- // This file defines a set of functions and an associative array.
- // The key of the array corresponds to a header in the source
- // import file and the value of the array item will be used in
- // the creation of the output file.
- //
- // An exported Outlook file looks like this:
- //
- // Title<tab>First Name<tab>Middle Name<tab>Last Name<tab>...
- // <tab>Patrick<tab><tab>Walsh<tab>...
- //
- // Where the first line explains each optional field.  This is what
- // will be looked up in the key.
- //
- // The array need not be in any order and any fields not defined will
- // not be transferred.  If the val='+', the value will be appended to
- // the previous field and any text after the '+' will be appended 
- // before the value.  For example, the following would add a comma and
- // a space between LastName and FirstName and store it in FullName:
- //
- //    array('LastName' => 'FullName','FirstName' => '+, ');
- //
- // Also start with a '#' symbol and a comma separated list will be
- // turned into a number of the same entries.
  
        class import_conv
--- 1,3 ----
***************
*** 103,107 ****
                        {
                                $buffer = 
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
-                               $this->invoice->increment_bilagsnr();
                        }
  
--- 80,83 ----
***************
*** 206,218 ****
                function import_end_file($buffer,$bilagsnr)
                {
!                       $num=0;
!                       foreach ($buffer as $entry)
!                       {
!                               $this->soXport->add($entry);
!                               $num++;
!                       }
! 
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
- 
                        return $receipt;
                }
--- 182,187 ----
                function import_end_file($buffer,$bilagsnr)
                {
!                       $num    = $this->soXport->add($buffer);
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
                        return $receipt;
                }

Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Import_fra_Kemner   6 Aug 2003 17:07:58 -0000       1.14
--- Import_fra_Kemner   7 Aug 2003 16:08:59 -0000       1.15
***************
*** 1,27 ****
  <?php
- // This file defines a set of functions and an associative array.
- // The key of the array corresponds to a header in the source
- // import file and the value of the array item will be used in
- // the creation of the output file.
- //
- // An exported Outlook file looks like this:
- //
- // Title<tab>First Name<tab>Middle Name<tab>Last Name<tab>...
- // <tab>Patrick<tab><tab>Walsh<tab>...
- //
- // Where the first line explains each optional field.  This is what
- // will be looked up in the key.
- //
- // The array need not be in any order and any fields not defined will
- // not be transferred.  If the val='+', the value will be appended to
- // the previous field and any text after the '+' will be appended 
- // before the value.  For example, the following would add a comma and
- // a space between LastName and FirstName and store it in FullName:
- //
- //    array('LastName' => 'FullName','FirstName' => '+, ');
- //
- // Also start with a '#' symbol and a comma separated list will be
- // turned into a number of the same entries.
- 
        class import_conv
        {
--- 1,3 ----
***************
*** 355,368 ****
                function import_end_file($buffer,$bilagsnr)
                {
!                       $num=0;
!                       foreach ($buffer as $entry)
!                       {
!                               $this->soXport->add($entry);
!                               $bilagsnr_end = 
$this->invoice->increment_bilagsnr();
!                               $num++;
!                       }
!                       
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
- 
                        return $receipt;
                }
--- 331,336 ----
                function import_end_file($buffer,$bilagsnr)
                {
!                       $num    = $this->soXport->add($buffer);
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
                        return $receipt;
                }

Index: Import_fra_BKK
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_BKK,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Import_fra_BKK      6 Aug 2003 17:07:58 -0000       1.13
--- Import_fra_BKK      7 Aug 2003 16:08:59 -0000       1.14
***************
*** 1,27 ****
  <?php
- // This file defines a set of functions and an associative array.
- // The key of the array corresponds to a header in the source
- // import file and the value of the array item will be used in
- // the creation of the output file.
- //
- // An exported Outlook file looks like this:
- //
- // Title<tab>First Name<tab>Middle Name<tab>Last Name<tab>...
- // <tab>Patrick<tab><tab>Walsh<tab>...
- //
- // Where the first line explains each optional field.  This is what
- // will be looked up in the key.
- //
- // The array need not be in any order and any fields not defined will
- // not be transferred.  If the val='+', the value will be appended to
- // the previous field and any text after the '+' will be appended 
- // before the value.  For example, the following would add a comma and
- // a space between LastName and FirstName and store it in FullName:
- //
- //    array('LastName' => 'FullName','FirstName' => '+, ');
- //
- // Also start with a '#' symbol and a comma separated list will be
- // turned into a number of the same entries.
- 
        class import_conv
        {
--- 1,3 ----
***************
*** 167,171 ****
                        {
                                $buffer = 
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
-                               $this->invoice->increment_bilagsnr();
                        }
  
--- 143,146 ----
***************
*** 269,282 ****
                function import_end_file($buffer,$bilagsnr)
                {
! 
!                       $num=0;
!                       foreach ($buffer as $entry)
!                       {
!                               $this->soXport->add($entry);
!                               $num++;
!                       }
! 
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
- 
                        return $receipt;
                }
--- 244,249 ----
                function import_end_file($buffer,$bilagsnr)
                {
!                       $num    = $this->soXport->add($buffer);
                        $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
                        return $receipt;
                }