From d05950d6b7a6f15abc90fb3999fa151125ec7023 Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Mon, 6 Nov 2017 09:16:09 +0100 Subject: clars must propagate regardless, runs only if not new --- src/fextdata.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/fextdata.php') diff --git a/src/fextdata.php b/src/fextdata.php index 2b2d007..ca66a45 100644 --- a/src/fextdata.php +++ b/src/fextdata.php @@ -558,7 +558,8 @@ function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0,$mainsite=-1) if(isset($param['usersitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['usersitenumber']; if(isset($param['clarsitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['clarsitenumber']; if(isset($param['runsitenumber']) && !isset($param['sitenumber'])) $param['sitenumber']=$param['runsitenumber']; - if(!isset($param['sitenumber']) || ($param['sitenumber'] != $site && $param['sitenumber'] != $mainsite)) { + if(!isset($param['sitenumber']) || ($param['sitenumber'] != $site && ($param['sitenumber'] != $mainsite || $tomain) && + ($table != 'clartable' || $tomain))) { $logstr .= "$serv - site mismatch should be [$site] and is [" . $param['sitenumber'] . "]\n"; LOGError("importFromXML: site mismatch should be [$site] and is [" . $param['sitenumber'] . "]"); continue; @@ -635,7 +636,7 @@ function importFromXML($ar,$contest,$site,$tomain=false,$uptime=0,$mainsite=-1) } } if($table == "runtable") { - if(($ret=DBNewRun ($param, $conn))) { + if(($ret=DBNewRun ($param, $conn, $tomain))) { if($ret==2) { $logstr .= "$serv - Run " . $param['runnumber'] ."/".$param['sitenumber']." updated\n"; LOGInfo("importFromXML: Run " . $param['runnumber'] ."/".$param['sitenumber']." updated"); -- cgit v1.2.3