Author: mcantelon
Date: Thu Dec 29 16:08:32 2011
New Revision: 10480
Log:
Enhanced ignored column determination, adding total of ignored columns and not
reporting deliberately ignored columns.
Modified:
trunk/lib/task/csvImportTask.class.php
Modified: trunk/lib/task/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/csvImportTask.class.php Thu Dec 29 15:55:50 2011
(r10479)
+++ trunk/lib/task/csvImportTask.class.php Thu Dec 29 16:08:32 2011
(r10480)
@@ -72,6 +72,11 @@
'columns' => fgetcsv($fh, 60000), // 1st row supplies column names/order
'defaultStatusId' => $defaultStatusId,
'defaultStatusTypeId' => $defaultStatusTypeId,
+ 'ignoreColumns' => array(
+ 'THUMBNAIL',
+ 'TIFF and JPEG Number',
+ 'TIFFIMAGE'
+ ),
'columnMap' => array(
'TITLE' => 'title',
'Accruals' => 'accruals',
@@ -188,6 +193,7 @@
public function __construct($options)
{
$allowedOptions = array(
+ 'ignoreColumns',
'columns',
'defaultStatusId',
'defaultStatusTypeId',
@@ -233,13 +239,14 @@
}
}
- public function ignored()
+ public function determineIgnored()
{
$ignored = array();
foreach($this->columns as $column)
{
if (
- !isset($this->columnMap[$column])
+ !in_array($column, $this->ignoreColumns)
+ && !isset($this->columnMap[$column])
&& !isset($this->propertyMap[$column])
&& !isset($this->noteMap[$column])
&& !isset($this->handlers[$column])
@@ -256,11 +263,11 @@
{
$output = '';
- $ignored = $this->ignored();
+ $ignored = $this->determineIgnored();
if (sizeof($ignored))
{
- print "Ignoring columns:\n";
+ print "Ignoring ". sizeof($ignored) . " columns:\n";
foreach($ignored as $ignore)
{
$output .= ' '. $ignore ."\n";
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
