holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve handling / display of error messages

Browse Source
This commit is contained in:
Nathan Gray 2011-12-07 17:18:08 +00:00
parent fb4982c118
commit 5f815928f4
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
importexport/inc/class.importexport_schedule_ui.inc.php
View File

@ -42,17 +42,17 @@
if(is_array($async['data']['errors'])) { if(is_array($async['data']['errors'])) {
foreach($async['data']['errors'] as $target => $errors) foreach($async['data']['errors'] as $target => $errors)
{ {
$async['data']['errors'] = $target . ":\n" . implode("\n", $async['data']['errors']); $async['data']['errors'] = (is_numeric($target) ? '' : $target . ":\n") . implode("\n", $async['data']['errors']);
} }
} }
if(is_numeric($async['data']['record_count'])) { if(is_numeric($async['data']['record_count'])) {
$async['data']['record_count'] = lang('%1 records processed', $async['data']['record_count']); $async['data']['record_count'] = lang('%1 records processed', $async['data']['record_count']);
} }
$data['scheduled'][] = $async['data'] + array( $data['scheduled'][] = array_merge($async['data'], array(
'id' => $id, 'id' => $id,
'next' => $async['next'], 'next' => $async['next'],
'times' => str_replace("\n", '', print_r($async['times'], true)), 'times' => str_replace("\n", '', print_r($async['times'], true)),
); ));
} }
array_unshift($data['scheduled'], false); array_unshift($data['scheduled'], false);
} }
@ -310,15 +310,25 @@
public static function exec($data) { public static function exec($data) {
ob_start(); ob_start();
$data['last_run'] = time();
// check file // check file
$file_check = self::check_target($data); $file_check = self::check_target($data);
if($file_check !== true) { if($file_check !== true) {
$data['errors'][] = $file_check;
// Update job with results
self::update_job($data);
fwrite(STDERR,'importexport_schedule: ' . date('c') . ": $file_check \n"); fwrite(STDERR,'importexport_schedule: ' . date('c') . ": $file_check \n");
exit(); exit();
} }
$definition = new importexport_definition($data['definition']); $definition = new importexport_definition($data['definition']);
if( $definition->get_identifier() < 1 ) { if( $definition->get_identifier() < 1 ) {
$data['errors'][] = 'Definition not found!';
// Update job with results
self::update_job($data);
fwrite(STDERR,'importexport_schedule: ' . date('c') . ": Definition not found! \n"); fwrite(STDERR,'importexport_schedule: ' . date('c') . ": Definition not found! \n");
exit(); exit();
} }
@ -389,10 +399,9 @@
$data['result'][$target] = $result; $data['result'][$target] = $result;
} }
} }
$data['last_run'] = time();
// Delete file? // Delete file?
if($data['delete_files'] && $type == 'import' && !$data['errors'][$target]) if($data['delete_files'] && $type == 'import' && !$data['errors'])
{ {
foreach($targets as $target) foreach($targets as $target)
{ {
@ -400,10 +409,24 @@
{ {
$data['result'][$target] .= "\n..." . lang('deleted'); $data['result'][$target] .= "\n..." . lang('deleted');
} }
else
{
$data['errors'][$target] .= "\n..." . lang('Unable to delete');
}
} }
} }
// Update job with results // Update job with results
self::update_job($data);
$contents = ob_get_contents();
if($contents) {
fwrite(STDOUT,'importexport_schedule: ' . date('c') . ": \n".$contents);
}
ob_end_clean();
}
private static function update_job($data) {
$id = self::generate_id($data); $id = self::generate_id($data);
$async = ExecMethod('phpgwapi.asyncservice.read', $id); $async = ExecMethod('phpgwapi.asyncservice.read', $id);
$async = $async[$id]; $async = $async[$id];
@ -416,12 +439,7 @@
$data $data
); );
} }
return $result;
$contents = ob_get_contents();
if($contents) {
fwrite(STDOUT,'importexport_schedule: ' . date('c') . ": \n".$contents);
}
ob_end_clean();
} }
} }
?> ?>