From ec3811b11a40523882ae58e3da2c594be64989e7 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 8 Jun 2013 16:07:12 -0700 Subject: [PATCH] Create parent for parser classes CRM-11254 ---------------------------------------- * CRM-11254: Create parent class for import http://issues.civicrm.org/jira/browse/CRM-11254 --- CRM/Activity/Import/Parser.php | 14 +------- CRM/Contact/Import/Parser.php | 20 +---------- CRM/Contribute/Import/Parser.php | 19 +++------- CRM/Event/Import/Parser.php | 27 +++++--------- CRM/Import/Parser.php | 62 ++++++++++++++++++++++++++++++++ CRM/Member/Import/Parser.php | 20 +---------- 6 files changed, 77 insertions(+), 85 deletions(-) create mode 100644 CRM/Import/Parser.php diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php index 2f95df9a55..3563e973d5 100644 --- a/CRM/Activity/Import/Parser.php +++ b/CRM/Activity/Import/Parser.php @@ -34,19 +34,7 @@ */ - -abstract class CRM_Activity_Import_Parser { - CONST MAX_ERRORS = 250, MAX_WARNINGS = 25, VALID = 1, WARNING = 2, ERROR = 4, CONFLICT = 8, STOP = 16, DUPLICATE = 32, MULTIPLE_DUPE = 64, NO_MATCH = 128; - - /** - * various parser modes - */ - CONST MODE_MAPFIELD = 1, MODE_PREVIEW = 2, MODE_SUMMARY = 4, MODE_IMPORT = 8; - - /** - * codes for duplicate record handling - */ - CONST DUPLICATE_SKIP = 1, DUPLICATE_REPLACE = 2, DUPLICATE_UPDATE = 4, DUPLICATE_FILL = 8, DUPLICATE_NOCHECK = 16; +abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { protected $_fileName; diff --git a/CRM/Contact/Import/Parser.php b/CRM/Contact/Import/Parser.php index 9d071c9fb3..d35195dc71 100644 --- a/CRM/Contact/Import/Parser.php +++ b/CRM/Contact/Import/Parser.php @@ -34,25 +34,7 @@ */ - -abstract class CRM_Contact_Import_Parser { - CONST MAX_ERRORS = 250, MAX_WARNINGS = 25, VALID = 1, WARNING = 2, ERROR = 4, CONFLICT = 8, STOP = 16, DUPLICATE = 32, MULTIPLE_DUPE = 64, NO_MATCH = 128, UNPARSED_ADDRESS_WARNING = 256; - - /** - * various parser modes - */ - CONST MODE_MAPFIELD = 1, MODE_PREVIEW = 2, MODE_SUMMARY = 4, MODE_IMPORT = 8; - - /** - * codes for duplicate record handling - */ - CONST DUPLICATE_SKIP = 1, DUPLICATE_REPLACE = 2, DUPLICATE_UPDATE = 4, DUPLICATE_FILL = 8, DUPLICATE_NOCHECK = 16; - - /** - * various Contact types - */ - CONST CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4; - CONST DEFAULT_TIMEOUT = 30; +abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser { protected $_tableName; diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php index 2d7b5cc8a9..56dc7f6f16 100644 --- a/CRM/Contribute/Import/Parser.php +++ b/CRM/Contribute/Import/Parser.php @@ -34,24 +34,13 @@ */ - -abstract class CRM_Contribute_Import_Parser { - CONST MAX_ERRORS = 250, MAX_WARNINGS = 25, VALID = 1, WARNING = 2, ERROR = 3, CONFLICT = 4, STOP = 5, DUPLICATE = 6, MULTIPLE_DUPE = 7, NO_MATCH = 8, SOFT_CREDIT = 9, SOFT_CREDIT_ERROR = 10, PLEDGE_PAYMENT = 11, PLEDGE_PAYMENT_ERROR = 12; - - /** - * various parser modes - */ - CONST MODE_MAPFIELD = 1, MODE_PREVIEW = 2, MODE_SUMMARY = 4, MODE_IMPORT = 8; - - /** - * codes for duplicate record handling - */ - CONST DUPLICATE_SKIP = 1, DUPLICATE_REPLACE = 2, DUPLICATE_UPDATE = 4, DUPLICATE_FILL = 8, DUPLICATE_NOCHECK = 16; +abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser { /** - * various Contact types + * Contribution-specific result codes + * @see CRM_Import_Parser result code constants */ - CONST CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4; + CONST SOFT_CREDIT = 512, SOFT_CREDIT_ERROR = 1024, PLEDGE_PAYMENT = 2048, PLEDGE_PAYMENT_ERROR = 4096; protected $_fileName; diff --git a/CRM/Event/Import/Parser.php b/CRM/Event/Import/Parser.php index 13ba8570cb..9f49826c04 100644 --- a/CRM/Event/Import/Parser.php +++ b/CRM/Event/Import/Parser.php @@ -25,27 +25,16 @@ +--------------------------------------------------------------------+ */ +/** + * + * @package CRM + * @copyright CiviCRM LLC (c) 2004-2013 + * $Id$ + * + */ - - -abstract class CRM_Event_Import_Parser { - CONST MAX_ERRORS = 250, MAX_WARNINGS = 25, VALID = 1, WARNING = 2, ERROR = 4, CONFLICT = 8, STOP = 16, DUPLICATE = 32, MULTIPLE_DUPE = 64, NO_MATCH = 128; - - /** - * various parser modes - */ - CONST MODE_MAPFIELD = 1, MODE_PREVIEW = 2, MODE_SUMMARY = 4, MODE_IMPORT = 8; - - /** - * codes for duplicate record handling - */ - CONST DUPLICATE_SKIP = 1, DUPLICATE_REPLACE = 2, DUPLICATE_UPDATE = 4, DUPLICATE_FILL = 8, DUPLICATE_NOCHECK = 16; - - /** - * various Contact types - */ - CONST CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4; +abstract class CRM_Event_Import_Parser extends CRM_Import_Parser { protected $_fileName; diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php new file mode 100644 index 0000000000..d5ccb4c37a --- /dev/null +++ b/CRM/Import/Parser.php @@ -0,0 +1,62 @@ +