forked from extern/egroupware
egw_async: handling the ##last-check-run## problem during restore. The line will be skipped.
This commit is contained in:
parent
2f28409738
commit
6bb48b2b87
@ -232,20 +232,27 @@
|
||||
}
|
||||
if ($table) // do we already reached the data part
|
||||
{
|
||||
$import = true;
|
||||
$data = $this->csv_split($line,$cols);
|
||||
|
||||
if (count($data) == count($cols))
|
||||
{
|
||||
if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
|
||||
{
|
||||
$translation->convert($data,$charset);
|
||||
}
|
||||
$this->db->insert($table,$data,False,__LINE__,__FILE__,'all-apps',true);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
|
||||
if ($table == 'egw_async' && in_array('##last-check-run##',$data)) {
|
||||
echo '<p>'.lang("Line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
|
||||
echo 'data=<pre>'.print_r($data,true)."</pre>\n";
|
||||
$import = false;
|
||||
}
|
||||
if ($import) {
|
||||
if (count($data) == count($cols))
|
||||
{
|
||||
if ($convert_to_system_charset && !$this->db->capabilities['client_encoding'])
|
||||
{
|
||||
$translation->convert($data,$charset);
|
||||
}
|
||||
$this->db->insert($table,$data,False,__LINE__,__FILE__,'all-apps',true);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<p>'.lang("Line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>",$n,$line,$table)."</p>\n";
|
||||
echo 'data=<pre>'.print_r($data,true)."</pre>\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -501,4 +508,4 @@ $line = '"de","ranking","use \\"yes\\", or \\"no, prefession\\"","benützen Sie
|
||||
|
||||
echo "<p>line='$line'</p>\n";
|
||||
echo "<pre>".print_r(db_backup::csv_split($line),true)."</pre>\n";
|
||||
*/
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user