Author: mcantelon
Date: Thu Jan 5 12:57:15 2012
New Revision: 10574
Log:
Named property to clarify its role in import class.
Modified:
trunk/lib/QubitFlatfileImport.class.php
trunk/lib/task/csvImportTask.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Thu Jan 5 12:19:00 2012
(r10573)
+++ trunk/lib/QubitFlatfileImport.class.php Thu Jan 5 12:57:15 2012
(r10574)
@@ -32,7 +32,7 @@
$allowedOptions = array(
'status',
'ignoreColumns',
- 'columns',
+ 'columnNames',
'defaultStatusId',
'defaultStatusTypeId',
'testing',
@@ -106,7 +106,7 @@
public function determineUnhandledColumns()
{
$ignored = array();
- foreach($this->columns as $column)
+ foreach($this->columnNames as $column)
{
if ($this->unhandledColumn($column))
{
@@ -171,7 +171,7 @@
{
// determine what type of data should be in this column
- $columnName = $this->columns[$index];
+ $columnName = $this->columnNames[$index];
// execute row logic
$logic($this, $index, $columnName, $row[$index]);
@@ -214,8 +214,8 @@
$self->mappedColumnHandler($self->columnMap[$columnName], $value);
}
else if (
- isset($self->columns[$index])
- && isset($self->handlers[($self->columns[$index])])
+ isset($self->columnNames[$index])
+ && isset($self->handlers[($self->columnNames[$index])])
)
{
// otherwise, if column is data and a handler for it is set, use it
@@ -225,26 +225,26 @@
);
}
else if (
- isset($self->columns[$index])
- && in_array($self->columns[$index], $self->variableColumns)
+ isset($self->columnNames[$index])
+ && in_array($self->columnNames[$index], $self->variableColumns)
)
{
- $self->rowStatusVars[$self->columns[$index]] = $value;
+ $self->rowStatusVars[$self->columnNames[$index]] = $value;
}
else if (
- isset($self->columns[$index])
- && isset($self->arrayColumns[($self->columns[$index])])
+ isset($self->columnNames[$index])
+ && isset($self->arrayColumns[($self->columnNames[$index])])
)
{
$self->arrayColumnHandler($columnName,
$self->arrayColumns[$columnName], $value);
}
else if (
- isset($self->columns[$index])
- && in_array($self->columns[$index], $self->standardColumns)
+ isset($self->columnNames[$index])
+ && in_array($self->columnNames[$index], $self->standardColumns)
)
{
// otherwise, if column is data and it's a standard column, use it
- $self->informationObject->{$self->columns[$index]} = $value;
+ $self->informationObject->{$self->columnNames[$index]} = $value;
}
});
}
Modified: trunk/lib/task/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/csvImportTask.class.php Thu Jan 5 12:19:00 2012
(r10573)
+++ trunk/lib/task/csvImportTask.class.php Thu Jan 5 12:57:15 2012
(r10574)
@@ -107,7 +107,7 @@
'options' => $options,
'materialTypes' => $termData['materialTypes']
),
- 'columns' => fgetcsv($fh, 60000), // 1st row supplies column names/order
+ 'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
'defaultStatusId' => $defaultStatusId,
'defaultStatusTypeId' => $defaultStatusTypeId,
'ignoreColumns' => array(
--
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.
