[Fmsystem-commits] [12106] property: abort notification on error

[Sigurd Nes]

Revision: 12106
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12106
Author:   sigurdne
Date:     2014-10-01 12:35:49 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
property: abort notification on error

Modified Paths:
--------------
    
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php

Modified: 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
--- 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
        2014-09-26 11:03:22 UTC (rev 12105)
+++ 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
        2014-10-01 12:35:49 UTC (rev 12106)
@@ -39,6 +39,7 @@
                var     $function_name = 
'import_oppdatering_av_bestilling_fra_agresso_bkb';
                var $debug = true;
                protected $updated_tickects = array();
+               protected $updated_tickects_per_file = array();
                protected $receipt = array();
 
                function __construct()
@@ -96,6 +97,7 @@
                                                _debug_array("Start import 
file: $file");
                                        }
 
+                                       $this->updated_tickects_per_file = 
array();
                                        $ok = $this->import($file);
 
                                        if ($ok)
@@ -119,6 +121,7 @@
                                                else
                                                {
                                                        
$this->db->transaction_commit();
+                                                       $this->updated_tickects 
= array_merge($this->updated_tickects,$this->updated_tickects_per_file);
                                                }
                                        }
                                        else
@@ -310,7 +313,7 @@
 
                        if($ok)
                        {
-                               $this->updated_tickects[$id] = true;
+                               $this->updated_tickects_per_file[$id] = true;
                                $this->update_status($data);
                        }
 
@@ -350,7 +353,7 @@
 
                                if( $this->sotts->update_status($ticket,$id))
                                {
-                                       $this->updated_tickects[$id] = true;
+                                       $this->updated_tickects_per_file[$id] = 
true;
                                }
                        }