CRM-14343 - Remove 250 limit for import errors

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 0c0d35161d630b323d41f4e35b497c67c495c85f..62af0b7a355bb193cd37a9fd6787cc5008a2b33e 100644 (file)
--- a/CRM/Activity/Import/Parser.php
+++ b/CRM/Activity/Import/Parser.php
@@ -171,14 +171,12 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
 
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_errors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode & self::CONFLICT) {

diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php
index 933f34bb861023338e71f41cc17bc2da02aa6ce4..0125b162565bb3c32228d3bf1e6aaf98b9258040 100644 (file)
--- a/CRM/Contact/Import/Parser.php
+++ b/CRM/Contact/Import/Parser.php
@@ -271,10 +271,8 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
 
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          array_unshift($values, $this->_rowCount);
-          $this->_errors[] = $values;
-        }
+        array_unshift($values, $this->_rowCount);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode & self::CONFLICT) {

diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php
index 46b841f259bfef785c1e7b581f1c97bcb96aa310..46472f9e1e892f0af7c2a4afe0fc0a224d14cf4f 100644 (file)
--- a/CRM/Contribute/Import/Parser.php
+++ b/CRM/Contribute/Import/Parser.php
@@ -256,38 +256,32 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
 
       if ($returnCode == self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_errors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode == self::PLEDGE_PAYMENT_ERROR) {
         $this->_invalidPledgePaymentRowCount++;
-        if ($this->_invalidPledgePaymentRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_pledgePaymentErrors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_pledgePaymentErrors[] = $values;
       }
 
       if ($returnCode == self::SOFT_CREDIT_ERROR) {
         $this->_invalidSoftCreditRowCount++;
-        if ($this->_invalidSoftCreditRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_softCreditErrors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_softCreditErrors[] = $values;
       }
 
       if ($returnCode == self::CONFLICT) {

diff --git a/CRM/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php
index 9d5d6432e4a4ef074ff9427633adec5e8b983773..3d40b6292885f71543f3644fe6c9401fdf9a2317 100644 (file)
--- a/CRM/Custom/Import/Parser.php
+++ b/CRM/Custom/Import/Parser.php
@@ -191,14 +191,12 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_Import_Parser {
 
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_errors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode & self::CONFLICT) {

diff --git a/CRM/Event/Import/Parser.php b/CRM/Event/Import/Parser.php
index 12ecfcf360c9c733af56ad5bb07bdea3dea0d5fa..d723ca7f215d9d54d4bff4eabb6fa6a27d107bd7 100644 (file)
--- a/CRM/Event/Import/Parser.php
+++ b/CRM/Event/Import/Parser.php
@@ -192,14 +192,12 @@ abstract class CRM_Event_Import_Parser extends CRM_Import_Parser {
 
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          if ($this->_haveColumnHeader) {
-            $recordNumber--;
-          }
-          array_unshift($values, $recordNumber);
-          $this->_errors[] = $values;
+        $recordNumber = $this->_lineCount;
+        if ($this->_haveColumnHeader) {
+          $recordNumber--;
         }
+        array_unshift($values, $recordNumber);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode & self::CONFLICT) {

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
index c4169c2c5d37dcaefbe24996c5c3dda1ed0535b8..738254e5c1898605fbecd18511c7b351e7923840 100644 (file)
--- a/CRM/Import/Parser.php
+++ b/CRM/Import/Parser.php
@@ -34,7 +34,7 @@ abstract class CRM_Import_Parser {
   /**
    * Settings
    */
-  const MAX_ERRORS = 250, MAX_WARNINGS = 25, DEFAULT_TIMEOUT = 30;
+  const MAX_WARNINGS = 25, DEFAULT_TIMEOUT = 30;
 
   /**
    * Return codes
@@ -79,11 +79,6 @@ abstract class CRM_Import_Parser {
    */
   protected $_maxLinesToProcess;
 
-  /**
-   * Maximum number of invalid rows to store
-   */
-  protected $_maxErrorCount;
-
   /**
    * Array of error lines, bounded by MAX_ERROR
    */
@@ -192,7 +187,6 @@ abstract class CRM_Import_Parser {
    */
   public function __construct() {
     $this->_maxLinesToProcess = 0;
-    $this->_maxErrorCount = self::MAX_ERRORS;
   }
 
   /**

diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php
index fe2ae708ada4e7fd3c9b5d025c97e71e78c43381..fdf5014a5c750e251fac21d4eff1bf66bbce084c 100644 (file)
--- a/CRM/Member/Import/Parser.php
+++ b/CRM/Member/Import/Parser.php
@@ -191,11 +191,9 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser {
 
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
-        if ($this->_invalidRowCount < $this->_maxErrorCount) {
-          $recordNumber = $this->_lineCount;
-          array_unshift($values, $recordNumber);
-          $this->_errors[] = $values;
-        }
+        $recordNumber = $this->_lineCount;
+        array_unshift($values, $recordNumber);
+        $this->_errors[] = $values;
       }
 
       if ($returnCode & self::CONFLICT) {