From: Philipp Schüle <p.schuele@metaways.de>
Date: Fri, 26 Aug 2016 13:38:56 +0000 (+0200)
Subject: improves import record update/duplicate count
X-Git-Tag: 2016.09.1~2^2^2~2^2~9
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=0eb230b91ffccd33e3cdf87e639dfe288aaf43c7

improves import record update/duplicate count

Change-Id: Ib528e72a30ef39351670fddbfbd6d77aca67eb09
Reviewed-on: http://gerrit.tine20.com/customers/3489
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
---

diff --git a/tine20/Tinebase/Import/Abstract.php b/tine20/Tinebase/Import/Abstract.php
index 3c792b4..80c0cd9 100644
--- a/tine20/Tinebase/Import/Abstract.php
+++ b/tine20/Tinebase/Import/Abstract.php
@@ -1040,6 +1040,9 @@ abstract class Tinebase_Import_Abstract implements Tinebase_Import_Interface
                         . ' Merged record: ' . print_r($record->toArray(), TRUE));
                     
                     $record = call_user_func(array($this->_controller, $this->_options['updateMethod']), $recordToUpdate, FALSE);
+                    $this->_importResult['updatecount']++;
+                } else {
+                    $this->_importResult['duplicatecount']++;
                 }
                 
                 break;
@@ -1165,9 +1168,7 @@ abstract class Tinebase_Import_Abstract implements Tinebase_Import_Interface
                             . " Records are already the same. Nothing to do here.");
                     } else {
                         $updatedRecord = $this->_importAndResolveConflict($firstDuplicateRecord, $resolveStrategy, $ted->getClientRecord());
-                        $this->_importResult['updatecount']++;
                         $this->_importResult['results']->addRecord($updatedRecord);
-
                     }
                 }