Author: mcantelon
Date: Thu Dec 29 12:55:22 2011
New Revision: 10467
Log:
Fixed position of braces in import logic as per coding standards.
Modified:
trunk/lib/task/csvImportTask.class.php
Modified: trunk/lib/task/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/csvImportTask.class.php Thu Dec 29 12:50:39 2011
(r10466)
+++ trunk/lib/task/csvImportTask.class.php Thu Dec 29 12:55:22 2011
(r10467)
@@ -112,12 +112,14 @@
$self->information_object->parentId = QubitInformationObject::ROOT_ID;
- if (!isset($self->testing) || !$self->testing) {
+ if (!isset($self->testing) || !$self->testing)
+ {
$self->information_object->save();
}
// add alpha-numeric designation if specified
- if (isset($self->rowStatusVars['alphanumeric_designation'])) {
+ if (isset($self->rowStatusVars['alphanumeric_designation']))
+ {
# NOTE: This creates the note in the DB, but it doesn't show up
# on the user side yet
$self->createNote(247,
$self->rowStatusVars['alphanumeric_designation']);
@@ -130,7 +132,8 @@
isset($self->rowStatusVars['start_year'])
&& isset($self->rowStatusVars['end_year'])
)
- ) {
+ )
+ {
$endDate = (isset($self->rowStatusVars['end_year']))
? $self->rowStatusVars['end_year'] .'-00-00'
: false;
@@ -144,15 +147,18 @@
}
));
- $import->addColumnHandler('Level of description', function(&$self, $data) {
+ $import->addColumnHandler('Level of description', function(&$self, $data)
+ {
$self->information_object->setLevelOfDescriptionByName($data);
});
- $import->addColumnHandler('START YEAR', function(&$self, $data) {
+ $import->addColumnHandler('START YEAR', function(&$self, $data)
+ {
$self->rowStatusVars['start_year'] = $data;
});
- $import->addColumnHandler('START YEAR', function(&$self, $data) {
+ $import->addColumnHandler('START YEAR', function(&$self, $data)
+ {
$self->rowStatusVars['start_year'] = $data;
});
@@ -177,8 +183,10 @@
);
// set properties from options, halting upon invalid option
- foreach($options as $option => $value) {
- if (in_array($option, $allowed_options)) {
+ foreach($options as $option => $value)
+ {
+ if (in_array($option, $allowed_options))
+ {
$this->$option = $value;
}
else {
@@ -201,7 +209,8 @@
{
// attempting to directly call an object property that's a
// closure results in "Fatal error: Call to undefined method"
- if ($this->$property) {
+ if ($this->$property)
+ {
call_user_func_array($this->$property, array(&$this));
}
}
@@ -209,12 +218,14 @@
public function ignored()
{
$ignored = array();
- foreach($this->columns as $column) {
+ foreach($this->columns as $column)
+ {
if (
!isset($this->columnMap[$column])
&& !isset($this->propertyMap[$column])
&& !isset($this->handlers[$column])
- ) {
+ )
+ {
array_push($ignored, $column);
}
}
@@ -228,9 +239,11 @@
$ignored = $this->ignored();
- if (sizeof($ignored)) {
+ if (sizeof($ignored))
+ {
print "Ignoring columns:\n";
- foreach($ignored as $ignore) {
+ foreach($ignored as $ignore)
+ {
$output .= ' '. $ignore ."\n";
}
}
@@ -257,25 +270,29 @@
$this->executeClosurePropertyIfSet('rowInit');
// deal with data in each of row's columns
- for ($index = 0; $index < sizeof($row); $index++) {
+ for ($index = 0; $index < sizeof($row); $index++)
+ {
// determine what type of data should be in this column
$columnName = $this->columns[$index];
// if column maps to an attribute, set the attribute
- if (isset($this->columnMap) && isset($this->columnMap[$columnName])) {
+ if (isset($this->columnMap) && isset($this->columnMap[$columnName]))
+ {
$this->information_object->{$this->columnMap[$columnName]} =
$row[$index];
}
else {
// if column maps to a property, set the property
- if (isset($this->propertyMap) &&
isset($this->propertyMap[$columnName])) {
+ if (isset($this->propertyMap) &&
isset($this->propertyMap[$columnName]))
+ {
$this->information_object->addProperty(
$this->propertyMap[$columnName],
$row[$index]
);
}
- else if (isset($this->noteMap) && isset($this->noteMap[$columnName])) {
+ else if (isset($this->noteMap) && isset($this->noteMap[$columnName]))
+ {
$this->createNote($this->noteMap[$columnName], $row[index]);
}
else {
@@ -284,7 +301,8 @@
if (
isset($this->columns[$index])
&& isset($this->handlers[($this->columns[$index])])
- ) {
+ )
+ {
call_user_func_array(
$this->handlers[$columnName],
array(&$this, $row[$index])
@@ -301,8 +319,10 @@
$this->status['rows']++;
// get rid of row-specific status variables
- if ($this->rowStatusVars) {
- foreach($this->rowStatusVars as $var) {
+ if ($this->rowStatusVars)
+ {
+ foreach($this->rowStatusVars as $var)
+ {
unset($this->status[$var]);
}
}
@@ -326,10 +346,12 @@
$date->informationObjectId = $this->information_object->id;
$date->typeId = $typeId;
$date->startDate = $startDate;
- if ($endDate) {
+ if ($endDate)
+ {
$date->endDate = $endDate;
}
- if (!isset($self->testing) || !$self->testing) {
+ if (!isset($self->testing) || !$self->testing)
+ {
$date->save();
}
}
--
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.
