extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add current record to the end of errors / warnings

Browse Source
This commit is contained in:
Nathan Gray 2012-02-29 17:24:42 +00:00
parent 706fd46d5a
commit 28f90f8554
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -179,7 +179,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
// Make sure type is valid // Make sure type is valid
if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']]) if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
{ {
$this->warnings[$import_csv->get_current_position()] .= lang('Unknown type: %1', $record['info_type']); $this->warnings[$import_csv->get_current_position()] .= ($this->warnings[$import_csv->get_current_position()] ? "\n":'').
lang('Unknown type: %1', $record['info_type']);
} }
// Set default status for type, if not specified // Set default status for type, if not specified
@ -270,6 +271,12 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
$success = $this->action( 'insert', $record, $import_csv->get_current_position() ); $success = $this->action( 'insert', $record, $import_csv->get_current_position() );
} }
if($success) $count++; if($success) $count++;
if($this->warnings[$import_csv->get_current_position()]) {
$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
}
if($this->errors[$import_csv->get_current_position()]) {
$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
}
} }
return $count; return $count;
} }