Author: mcantelon
Date: Tue Jan 17 14:40:45 2012
New Revision: 10701
Log:
Got rid of redundant printAndLogError function.
Modified:
trunk/lib/QubitFlatfileImport.class.php
trunk/lib/task/import/csvAccessionImportTask.class.php
trunk/lib/task/import/csvImportTask.class.php
Modified: trunk/lib/QubitFlatfileImport.class.php
==============================================================================
--- trunk/lib/QubitFlatfileImport.class.php Tue Jan 17 14:07:12 2012
(r10700)
+++ trunk/lib/QubitFlatfileImport.class.php Tue Jan 17 14:40:45 2012
(r10701)
@@ -620,19 +620,7 @@
{
$message = 'Row '. $this->getStatus('rows') .': '. $message ."\n";
if ($this->errorLog) file_put_contents($this->errorLog, $message,
FILE_APPEND);
- }
-
- /**
- * Display error message and log it, if an error log has been defined
- *
- * @param string $message error message
- *
- * @return void
- */
- public function printAndLogError($message)
- {
- print $message ."\n";
- $this->logError($message);
+ return $message;
}
/**
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Tue Jan 17
14:07:12 2012 (r10700)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Tue Jan 17
14:40:45 2012 (r10701)
@@ -133,7 +133,7 @@
} else {
$self->object = FALSE;
$error = "Couldn't find accession # ". $accessionNumber;
- $self->printAndLogError($error);
+ print $self->logError($error);
}
},
Modified: trunk/lib/task/import/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportTask.class.php Tue Jan 17 14:07:12
2012 (r10700)
+++ trunk/lib/task/import/csvImportTask.class.php Tue Jan 17 14:40:45
2012 (r10701)
@@ -235,7 +235,7 @@
.' Could not find PARENT_ID '
. $self->rowStatusVars['PARENT_ID']
.' in key_map table';
- $self->printAndLogError($error);
+ print $self->logError($error);
}
}
--
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.
