Author: mcantelon
Date: Tue Sep 4 15:57:08 2012
New Revision: 12262
Log:
Cleaned up column naming for relationship importing.
Modified:
trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
Modified: trunk/lib/task/import/csvAuthorityRecordImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Tue Sep
4 14:40:01 2012 (r12261)
+++ trunk/lib/task/import/csvAuthorityRecordImportTask.class.php Tue Sep
4 15:57:08 2012 (r12262)
@@ -365,33 +365,32 @@
'actorNames' => $actorNames,
'actorRelationTypes' => $termData['actorRelationTypes']
),
- 'ignoreColumns' => array(
- 'RecordID'
- ),
+
'variableColumns' => array(
- 'Source_Name',
- 'Target_Name',
- 'Relationship_Category',
- 'Relationship_Date',
- 'Relationship_StartDate',
- 'Relationship_EndDate',
- 'Relationship_Description'
+ 'sourceAuthorizedFormOfName',
+ 'targetAuthorizedFormOfName',
+ 'category',
+ 'description',
+ 'date',
+ 'startDate',
+ 'endDate'
),
+
'saveLogic' => function(&$self)
{
// figure out ID of the two actors
- $sourceActorId = array_search($self->rowStatusVars['Source_Name'],
$self->status['actorNames']);
- $targetActorId = array_search($self->rowStatusVars['Target_Name'],
$self->status['actorNames']);
+ $sourceActorId =
array_search($self->rowStatusVars['sourceAuthorizedFormOfName'],
$self->status['actorNames']);
+ $targetActorId =
array_search($self->rowStatusVars['targetAuthorizedFormOfName'],
$self->status['actorNames']);
// determine type ID of relationship type
$relationTypeId = array_search(
- $self->rowStatusVars['Relationship_Category'],
+ $self->rowStatusVars['category'],
$self->status['actorRelationTypes']
);
if (!$relationTypeId)
{
- // throw new sfException('Unknown relationship type :'.
$self->rowStatusVars['Relationship_Category']);
+ throw new sfException('Unknown relationship type :'.
$self->rowStatusVars['category']);
} else {
// determine type ID of relationship type
@@ -399,8 +398,8 @@
if (!$sourceActorId || !$targetActorId)
{
$badActor = (!$sourceActorId)
- ? $self->rowStatusVars['Source_Name']
- : $self->rowStatusVars['Target_Name'];
+ ? $self->rowStatusVars['sourceAuthorizedFormOfName']
+ : $self->rowStatusVars['targetAuthorizedFormOfName'];
$error = 'Actor "'. $badActor .'" does not exist';
print $self->logError($error);
@@ -410,21 +409,21 @@
$relation->objectId = $targetActorId;
$relation->typeId = $relationTypeId;
- if ($self->rowStatusVars['Relationship_Date'])
+ if ($self->rowStatusVars['date'])
{
- $relation->date = $self->rowStatusVars['Relationship_Date'];
+ $relation->date = $self->rowStatusVars['date'];
}
- if ($self->rowStatusVars['Relationship_StartDate'])
+ if ($self->rowStatusVars['startDate'])
{
- $relation->startDate =
$self->rowStatusVars['Relationship_StartDate'];
+ $relation->startDate = $self->rowStatusVars['startDate'];
}
- if ($self->rowStatusVars['Relationship_EndDate'])
+ if ($self->rowStatusVars['endDate'])
{
- $relation->endDate =
$self->rowStatusVars['Relationship_EndDate'];
+ $relation->endDate = $self->rowStatusVars['endDate'];
}
- if ($self->rowStatusVars['Relationship_Description'])
+ if ($self->rowStatusVars['description'])
{
- $relation->description =
$self->rowStatusVars['Relationship_Description'];
+ $relation->description = $self->rowStatusVars['description'];
}
$relation->save();
@@ -432,6 +431,7 @@
}
}
));
+
$import->csv($fh);
}
}
--
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.
