Author: mcantelon
Date: Tue Jan 17 12:18:26 2012
New Revision: 10698
Log:
Moved some minor functionality into the import task base class.
Modified:
trunk/lib/task/import/csvAccessionImportTask.class.php
trunk/lib/task/import/csvImportBaseTask.class.php
trunk/lib/task/import/csvImportTask.class.php
Modified: trunk/lib/task/import/csvAccessionImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvAccessionImportTask.class.php Tue Jan 17
12:15:05 2012 (r10697)
+++ trunk/lib/task/import/csvAccessionImportTask.class.php Tue Jan 17
12:18:26 2012 (r10698)
@@ -43,14 +43,6 @@
$skipRows = ($options['skip-rows']) ? $options['skip-rows'] : 0;
- if (!$options['source-name'])
- {
- print "WARNING: If you're importing multiple CSV files as part of the "
- ."same import it's advisable to use the source-name CLI option to "
- ."specify a source name (otherwise the filename will be used as a "
- . "source name).\n";
- }
-
$sourceName = ($options['source-name'])
? $options['source-name']
: basename($arguments['filename']);
Modified: trunk/lib/task/import/csvImportBaseTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportBaseTask.class.php Tue Jan 17 12:15:05
2012 (r10697)
+++ trunk/lib/task/import/csvImportBaseTask.class.php Tue Jan 17 12:18:26
2012 (r10698)
@@ -60,5 +60,13 @@
{
throw new sfException('Path to error log is invalid.');
}
+
+ if (!$options['source-name'])
+ {
+ print "WARNING: If you're importing multiple CSV files as part of the "
+ ."same import it's advisable to use the source-name CLI option to "
+ ."specify a source name (otherwise the filename will be used as a "
+ . "source name).\n";
+ }
}
}
Modified: trunk/lib/task/import/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportTask.class.php Tue Jan 17 12:15:05
2012 (r10697)
+++ trunk/lib/task/import/csvImportTask.class.php Tue Jan 17 12:18:26
2012 (r10698)
@@ -44,14 +44,6 @@
$skipRows = ($options['skip-rows']) ? $options['skip-rows'] : 0;
- if (!$options['source-name'])
- {
- print "WARNING: If you're importing multiple CSV files as part of the "
- ."same import it's advisable to use the source-name CLI option to "
- ."specify a source name (otherwise the filename will be used as a "
- . "source name).\n";
- }
-
$sourceName = ($options['source-name'])
? $options['source-name']
: basename($arguments['filename']);
--
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.
