Author: mcantelon
Date: Mon Jan 16 12:08:18 2012
New Revision: 10682
Log:
Got rid of needless QubitFlatfile class properties.
Modified:
trunk/lib/QubitFlatfileImport.class.php
trunk/lib/task/csvAccessionImportTask.class.php
trunk/lib/task/csvImportTask.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Mon Jan 16 12:02:47 2012
(r10681)
+++ trunk/lib/QubitFlatfileImport.class.php Mon Jan 16 12:08:18 2012
(r10682)
@@ -46,8 +46,6 @@
'status',
'ignoreColumns',
'columnNames',
- 'defaultStatusId',
- 'defaultStatusTypeId',
'testing',
'preSaveLogic',
'postSaveLogic',
Modified: trunk/lib/task/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/csvAccessionImportTask.class.php Mon Jan 16 12:02:47
2012 (r10681)
+++ trunk/lib/task/csvAccessionImportTask.class.php Mon Jan 16 12:08:18
2012 (r10682)
@@ -124,8 +124,6 @@
'resourceTypes' => $termData['resourceTypes']
),
'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
-// 'defaultStatusId' => $defaultStatusId,
-// 'defaultStatusTypeId' => $defaultStatusTypeId,
'ignoreColumns' => array(
),
Modified: trunk/lib/task/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/csvImportTask.class.php Mon Jan 16 12:02:47 2012
(r10681)
+++ trunk/lib/task/csvImportTask.class.php Mon Jan 16 12:08:18 2012
(r10682)
@@ -139,12 +139,12 @@
'status' => array(
'options' => $options,
'sourceName' => $sourceName,
+ 'defaultStatusId' => $defaultStatusId,
+ 'defaultStatusTypeId' => $defaultStatusTypeId,
'materialTypes' => $termData['materialTypes'],
'copyrightStatusTypes' => $termData['copyrightStatusTypes']
),
'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
- 'defaultStatusId' => $defaultStatusId,
- 'defaultStatusTypeId' => $defaultStatusTypeId,
'ignoreColumns' => array(
'RECORD_ID',
'PRI_REC_NO',
@@ -260,8 +260,8 @@
{
// set to default status
$self->object->setStatus(array(
- 'statusId' => $self->defaultStatusId,
- 'typeId' => $self->defaultStatusTypeId
+ 'statusId' => $self->getStatus('defaultStatusId'),
+ 'typeId' => $self->getStatus('defaultStatusTypeId')
));
if (!$self->rowStatusVars['PARENT_ID'])
--
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.
