Author: mcantelon
Date: Fri Aug 31 17:31:51 2012
New Revision: 12243
Log:
Refactoring term lookup logic in accessions import.
Modified:
trunk/lib/task/import/csvAccessionImportTask.class.php
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Fri Aug 31
17:20:36 2012 (r12242)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Fri Aug 31
17:31:51 2012 (r12243)
@@ -259,36 +259,42 @@
$import->addColumnHandler('resourceType', function(&$self, $data)
{
- if ($data)
- {
- if (isset($self->object) && is_object($self->object))
- {
- $self->object->resourceTypeId = $self->translateNameToTermId(
- 'resource type',
- $data,
- array(),
- $self->getStatus('resourceTypes')
- );
- }
- }
+ setObjectPropertyToTermIdLookedUpFromTermNameArray(
+ $self,
+ 'resourceTypeId',
+ 'resource type',
+ $data,
+ $self->getStatus('resourceTypes')
+ );
});
$import->addColumnHandler('acquisitionType', function(&$self, $data)
{
- if ($data)
- {
- if (isset($self->object) && is_object($self->object))
- {
- $self->object->acquisitionTypeId = $self->translateNameToTermId(
- 'acquisition type',
- $data,
- array(),
- $self->getStatus('acquisitionTypes')
- );
- }
- }
+ setObjectPropertyToTermIdLookedUpFromTermNameArray(
+ $self,
+ 'acquisitionTypeId',
+ 'acquisition type',
+ $data,
+ $self->getStatus('acquisitionTypes')
+ );
});
$import->csv($fh, $skipRows);
}
}
+
+function setObjectPropertyToTermIdLookedUpFromTermNameArray(&$self, $property,
$propertyDescription, $termName, $termNameArray)
+{
+ if ($termName)
+ {
+ if (isset($self->object) && is_object($self->object))
+ {
+ $self->object->$property = $self->translateNameToTermId(
+ $propertyDescription,
+ $termName,
+ array(),
+ $termNameArray
+ );
+ }
+ }
+}
--
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.
