Author: mcantelon
Date: Fri Aug 31 17:40:43 2012
New Revision: 12244

Log:
Added support for processing status and priority 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      Fri Aug 31 
17:31:51 2012        (r12243)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php      Fri Aug 31 
17:40:43 2012        (r12244)
@@ -73,9 +73,10 @@
 
     // Load taxonomies into variables to avoid use of magic numbers
     $termData = QubitFlatfileImport::loadTermsFromTaxonomies(array(
-      QubitTaxonomy::ACCESSION_ACQUISITION_TYPE_ID  => 'acquisitionTypes',
-      QubitTaxonomy::ACCESSION_RESOURCE_TYPE_ID     => 'resourceTypes',
-      QubitTaxonomy::ACCESSION_PROCESSING_STATUS_ID => 'processingStatus'
+      QubitTaxonomy::ACCESSION_ACQUISITION_TYPE_ID    => 'acquisitionTypes',
+      QubitTaxonomy::ACCESSION_RESOURCE_TYPE_ID       => 'resourceTypes',
+      QubitTaxonomy::ACCESSION_PROCESSING_STATUS_ID   => 'processingStatus',
+      QubitTaxonomy::ACCESSION_PROCESSING_PRIORITY_ID => 'processingPriority'
     ));
 
     // Define import
@@ -89,10 +90,11 @@
       /* the status array is a place to put data that should be accessible
          from closure logic using the getStatus method */
       'status' => array(
-        'sourceName'       => $sourceName,
-        'acquisitionTypes' => $termData['acquisitionTypes'],
-        'resourceTypes'    => $termData['resourceTypes'],
-        'processingStatus' => $termData['processingStatus']
+        'sourceName'         => $sourceName,
+        'acquisitionTypes'   => $termData['acquisitionTypes'],
+        'resourceTypes'      => $termData['resourceTypes'],
+        'processingStatus'   => $termData['processingStatus'],
+        'processingPriority' => $termData['processingPriority']
       ),
 
       'standardColumns' => array(
@@ -279,6 +281,28 @@
       );
     });
 
+    $import->addColumnHandler('processingStatus', function(&$self, $data)
+    {
+      setObjectPropertyToTermIdLookedUpFromTermNameArray(
+        $self,
+        'processingStatusId',
+        'processing status',
+        $data,
+        $self->getStatus('processingStatus')
+      );
+    });
+
+    $import->addColumnHandler('processingPriority', function(&$self, $data)
+    {
+      setObjectPropertyToTermIdLookedUpFromTermNameArray(
+        $self,
+        'processingPriorityId',
+        'processing priority',
+        $data,
+        $self->getStatus('processingPriority')
+      );
+    });
+
     $import->csv($fh, $skipRows);
   }
 }

-- 
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.

Reply via email to