Untis import removes deleted substitutions

This commit is contained in:
L_DA 2020-10-10 09:00:14 +00:00
parent 3442e33d4e
commit 204695172f

View file

@ -72,6 +72,7 @@ class import_data extends \core\task\scheduled_task {
if (($handle = fopen($filename, 'r')) == FALSE) return; if (($handle = fopen($filename, 'r')) == FALSE) return;
$hash = hash_file('md5', $filename); $hash = hash_file('md5', $filename);
if ($hash == $filehash) return; if ($hash == $filehash) return;
/*
$max_id = 0; $max_id = 0;
$max_changetime = 0; $max_changetime = 0;
if ($result = $DB->get_record_sql("select max(id), max(changetime) from {$CFG->prefix}timetable_substitution")) { if ($result = $DB->get_record_sql("select max(id), max(changetime) from {$CFG->prefix}timetable_substitution")) {
@ -80,8 +81,12 @@ class import_data extends \core\task\scheduled_task {
} }
echo "Max id = $max_id\n"; echo "Max id = $max_id\n";
echo "Max changetime = $max_changetime\n"; echo "Max changetime = $max_changetime\n";
*/
try { try {
$transaction = $DB->start_delegated_transaction(); $transaction = $DB->start_delegated_transaction();
echo "before delete\n";
$DB->delete_records_select("timetable_substitution", "id>0");
echo "after delete\n";
while (($data = fgetcsv($handle, 1000, ',')) !== FALSE) { while (($data = fgetcsv($handle, 1000, ',')) !== FALSE) {
$dataobject = (object)array('id' => $data[0], $dataobject = (object)array('id' => $data[0],
'date' => $data[1], 'date' => $data[1],
@ -109,6 +114,7 @@ class import_data extends \core\task\scheduled_task {
foreach (get_object_vars($dataobject) as $key => $value) { foreach (get_object_vars($dataobject) as $key => $value) {
if ($value=='') unset($dataobject->{$key}); if ($value=='') unset($dataobject->{$key});
} }
/*
if ($dataobject->id > $max_id) { if ($dataobject->id > $max_id) {
$DB->insert_record_raw("timetable_substitution", $dataobject,false, false, true); $DB->insert_record_raw("timetable_substitution", $dataobject,false, false, true);
echo "Object (id={$data[0]}) inserted\n"; echo "Object (id={$data[0]}) inserted\n";
@ -116,6 +122,8 @@ class import_data extends \core\task\scheduled_task {
$DB->update_record("timetable_substitution", $dataobject); $DB->update_record("timetable_substitution", $dataobject);
echo "Object (id={$data[0]}) updated\n"; echo "Object (id={$data[0]}) updated\n";
} }
*/
$DB->insert_record_raw("timetable_substitution", $dataobject,false, false, true);
} }
$transaction->allow_commit(); $transaction->allow_commit();
fclose($handle); fclose($handle);