Author: mcantelon
Date: Mon Jan 16 12:02:47 2012
New Revision: 10681
Log:
Refactored acquisitions import to use helper function.
Modified:
trunk/lib/task/csvAccessionImportTask.class.php
Modified: trunk/lib/task/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/csvAccessionImportTask.class.php Mon Jan 16 11:23:17
2012 (r10680)
+++ trunk/lib/task/csvAccessionImportTask.class.php Mon Jan 16 12:02:47
2012 (r10681)
@@ -219,19 +219,12 @@
'Scheduled Transfer' => 'Transfer'
);
- if (isset($cvaToQubit[$data]))
- {
- $acquisitionTypeTermName = $cvaToQubit[$data];
- if (in_array($acquisitionTypeTermName,
$self->getStatus('acquisitionTypes')))
- {
- $termId = array_search($acquisitionTypeTermName,
$self->getStatus('acquisitionTypes'));
- $self->object->acquisitionTypeId = $termId;
- } else {
- die('Could not find "'. $acquisitionTypeTermName .'" in
acquisitionTypes array.');
- }
- } else {
- die('Could not find a way to handle ACQUISITION METHOD value "'.
$data .'".');
- }
+ $self->object->resourceTypeId = $self->translateNameToTermId(
+ 'acquisition type',
+ $data,
+ $cvaToQubit,
+ $self->getStatus('acquisitionTypes')
+ );
}
});
@@ -244,19 +237,12 @@
'Public records' => 'Public transfer'
);
- if (isset($cvaToQubit[$data]))
- {
- $resourceTypeTermName = $cvaToQubit[$data];
- if (in_array($resourceTypeTermName,
$self->getStatus('resourceTypes')))
- {
- $termId = array_search($resourceTypeTermName,
$self->getStatus('resourceTypes'));
- $self->object->resourceTypeId = $termId;
- } else {
- die('Could not find "'. $resourceTypeTermName .'" in resourceTypes
array.');
- }
- } else {
- die('Could not find a way to handle TYPE value "'. $data .'".');
- }
+ $self->object->resourceTypeId = $self->translateNameToTermId(
+ 'transfer type',
+ $data,
+ $cvaToQubit,
+ $self->getStatus('resourceTypes')
+ );
}
});
--
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.
