Author: mcantelon
Date: Thu Feb 2 11:59:06 2012
New Revision: 10797
Log:
Changed so loading first row of CSV import into the columnNames object
attribute happens be default.
Modified:
trunk/lib/QubitFlatfileImport.class.php
trunk/lib/task/import/csvAccessionImportTask.class.php
trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
trunk/lib/task/import/csvImportTask.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Thu Feb 2 11:36:48 2012
(r10796)
+++ trunk/lib/QubitFlatfileImport.class.php Thu Feb 2 11:59:06 2012
(r10797)
@@ -319,6 +319,7 @@
public function csv($fh, $skipRows = 0)
{
$this->status['skippedRows'] = $skipRows;
+ $this->columnNames = fgetcsv($fh, 60000);
// inform user of any columns not included in import
print $this->renderUnhandledColumns();
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Thu Feb 2
11:36:48 2012 (r10796)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Thu Feb 2
11:59:06 2012 (r10797)
@@ -78,13 +78,6 @@
'resourceTypes' => $termData['resourceTypes'],
'processingStatus' => $termData['processingStatus']
),
- 'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
- 'ignoreColumns' => array(
- ),
-
- /* import columns that map directory to QubitInformationObject
properties */
- 'standardColumns' => array(
- ),
/* import columns that should be redirected to QubitInformationObject
properties (and optionally transformed)
@@ -202,7 +195,6 @@
if(isset($self->object) && is_object($self->object))
{
$self->object->save();
-//print 'Saved ID '. $self->object->id ."\n"; exit();
}
},
Modified: trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Thu Feb
2 11:36:48 2012 (r10796)
+++ trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Thu Feb
2 11:59:06 2012 (r10797)
@@ -73,7 +73,6 @@
// import name aliases, if specified
$import = new QubitFlatfileImport(array(
- 'columnNames' => fgetcsv($fh, 60000),
'status' => array(
'aliases' => array()
),
@@ -134,9 +133,6 @@
'actorTypes' => $termData['actorTypes'],
'aliases' => $aliases
),
- 'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
- 'ignoreColumns' => array(
- ),
/* import columns that map directory to QubitInformationObject
properties */
'standardColumns' => array(
Modified: trunk/lib/task/import/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportTask.class.php Thu Feb 2 11:36:48
2012 (r10796)
+++ trunk/lib/task/import/csvImportTask.class.php Thu Feb 2 11:59:06
2012 (r10797)
@@ -98,7 +98,6 @@
'materialTypes' => $termData['materialTypes'],
'copyrightStatusTypes' => $termData['copyrightStatusTypes']
),
- 'columnNames' => fgetcsv($fh, 60000), // 1st row supplies column
names/order
'ignoreColumns' => array(
'RECORD_ID',
'PRI_REC_NO',
--
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.
