Author: mcantelon
Date: Wed May 30 14:55:26 2012
New Revision: 11713
Log:
Changing handling of creators and department columns in accession import.
Modified:
trunk/lib/task/import/csvAccessionImportTask.class.php
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Wed May 30
14:43:53 2012 (r11712)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Wed May 30
14:55:26 2012 (r11713)
@@ -179,6 +179,32 @@
);
}
+ if (
+ isset($self->rowStatusVars['CREATOR or COLLECTOR'])
+ && $self->rowStatusVars['CREATOR or COLLECTOR']
+ )
+ {
+ $creators = explode('|', $self->rowStatusVars['CREATOR or
COLLECTOR']);
+ foreach($creators as $creator)
+ {
+ $self->object->scopeAndContent =
$self->appendWithLineBreakIfNeeded(
+ $self->object->scopeAndContent,
+ 'Creator: '. trim($creator)
+ );
+ }
+ }
+
+ if (
+ isset($self->rowStatusVars['DEPARTMENT'])
+ && trim($self->rowStatusVars['DEPARTMENT'])
+ )
+ {
+ $self->object->scopeAndContent =
$self->appendWithLineBreakIfNeeded(
+ $self->object->scopeAndContent,
+ 'Creator: '. trim($self->rowStatusVars['DEPARTMENT'])
+ );
+ }
+
if (isset($self->rowStatusVars['receivedExtentUnits']))
{
$self->object->receivedExtentUnits =
$self->rowStatusVars['receivedExtentUnits'];
@@ -236,34 +262,6 @@
}
if (
- isset($self->rowStatusVars['DEPARTMENT'])
- && $self->rowStatusVars['DEPARTMENT']
- )
- {
- $actor =
$self->createOrFetchActor($self->rowStatusVars['DEPARTMENT']);
- $self->createRelation($actor->id, $self->object->id,
QubitTerm::CREATION_ID);
- }
-
- if (
- isset($self->rowStatusVars['CREATOR or COLLECTOR'])
- && $self->rowStatusVars['CREATOR or COLLECTOR']
- )
- {
- $creators = explode('|', $self->rowStatusVars['CREATOR or
COLLECTOR']);
- foreach($creators as $creator)
- {
- // parse out name
- $name = trim($creator);
- preg_match('/(.*)\((.*)\)/', $name, $matches);
- if (isset($matches[1]) && $matches[1])
- {
- $actor = $self->createOrFetchActor($matches[1]);
- $self->createRelation($actor->id, $self->object->id,
QubitTerm::CREATION_ID);
- }
- }
- }
-
- if (
isset($self->rowStatusVars['DONOR'])
&& $self->rowStatusVars['DONOR']
)
@@ -339,30 +337,6 @@
}
});
- $import->addColumnHandler('ACCESSION STATUS', function(&$self, $data)
- {
- if ($data)
- {
- // Are there any in CVA that should get set to 'Incomplete'?
- $cvaToQubit = array(
- 'Accession completed' => 'Complete',
- 'Appraisal/selection completed' => 'Complete',
- 'Accession and Description/arrangement completed' => 'Complete',
- 'In Process' => 'In-Progress'
- );
-
- if (isset($self->object) && is_object($self->object))
- {
- $self->object->processingStatusId = $self->translateNameToTermId(
- 'processing status',
- $data,
- $cvaToQubit,
- $self->getStatus('processingStatus')
- );
- }
- }
- });
-
$import->addColumnHandler('ACQUISITION METHOD', function(&$self, $data)
{
if ($data)
--
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.
