[REF] [Import] Parser cleanup - remove now unused

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 2fe794b2331843e66a4f439e40ca368b7fb62050..56ab74e7eb9e35cd1da60b0a80bee554f51e0462 100644 (file)
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -168,9 +168,9 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
   public function postProcess() {
 
     $importJobParams = array(
-      'doGeocodeAddress' => $this->controller->exportValue('DataSource', 'doGeocodeAddress'),
-      'invalidRowCount' => $this->get('invalidRowCount'),
-      'onDuplicate' => $this->get('onDuplicate'),
+      'doGeocodeAddress' => $this->getSubmittedValue('doGeocodeAddress'),
+      'invalidRowCount' => $this->getRowCount(CRM_Import_Parser::ERROR),
+      'onDuplicate' => $this->getSubmittedValue('onDuplicate'),
       'dedupe' => $this->getSubmittedValue('dedupe_rule_id'),
       'newGroupName' => $this->controller->exportValue($this->_name, 'newGroupName'),
       'newGroupDesc' => $this->controller->exportValue($this->_name, 'newGroupDesc'),
@@ -188,7 +188,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
       'primaryKeyName' => '_id',
       'statusFieldName' => '_status',
       'statusID' => $this->get('statusID'),
-      'totalRowCount' => $this->get('totalRowCount'),
+      'totalRowCount' => $this->getRowCount([]),
       'userJobID' => $this->getUserJobID(),
     );
 

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 262b8e283a0b59616d27bf23ca354af19080225b..f7972d1ed7c3875b63dac6f840d6c795bd4cef49 100644 (file)
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -2288,24 +2288,12 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
     $this->init();
 
     $this->_rowCount = 0;
-    $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = 0;
 
-    $this->_errors = [];
-    $this->_warnings = [];
-    $this->_unparsedAddresses = [];
-
     $this->_tableName = $tableName = $this->getUserJob()['metadata']['DataSource']['table_name'];
     $this->_primaryKeyName = '_id';
     $this->_statusFieldName = '_status';
 
-    if ($mode == self::MODE_MAPFIELD) {
-      $this->_rows = [];
-    }
-    else {
-      $this->_activeFieldCount = count($this->_activeFields);
-    }
-
     if ($statusID) {
       $this->progressImport($statusID);
       $startTimestamp = $currTimestamp = $prevTimestamp = time();
@@ -2369,30 +2357,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
         $returnCode = self::ERROR;
       }
 
-      // note that a line could be valid but still produce a warning
-      if ($returnCode & self::VALID) {
-        $this->_validCount++;
-        if ($mode == self::MODE_MAPFIELD) {
-          $this->_rows[] = $values;
-          $this->_activeFieldCount = max($this->_activeFieldCount, count($values));
-        }
-      }
-
-      if ($returnCode & self::ERROR) {
-        $this->_invalidRowCount++;
-        array_unshift($values, $this->_rowCount);
-        $this->_errors[] = $values;
-      }
-
-      if ($returnCode & self::DUPLICATE) {
-        $this->_duplicateCount++;
-        array_unshift($values, $this->_rowCount);
-        $this->_duplicates[] = $values;
-        if ($onDuplicate != self::DUPLICATE_SKIP) {
-          $this->_validCount++;
-        }
-      }
-
       if ($returnCode & self::NO_MATCH) {
         $this->setImportStatus((int) $values[count($values) - 1], 'invalid_no_match', array_shift($values));
       }
@@ -2411,7 +2375,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
    *   Mapped array of values.
    */
   public function setActiveFields($fieldKeys) {
-    $this->_activeFieldCount = count($fieldKeys);
     foreach ($fieldKeys as $key) {
       if (empty($this->_fields[$key])) {
         $this->_activeFields[] = new CRM_Contact_Import_Field('', ts('- do not import -'));