composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	synchro/synchrodatasource.class.inc.php
This commit is contained in:
Eric
2019-06-20 16:11:38 +02:00
parent b1761e04b2 5c341138e1
commit e68340273b
232 changed files with 7198 additions and 6186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
synchro/synchrodatasource.class.inc.php
View File

@@ -3452,7 +3452,8 @@ class SynchroExecution
}
$iLastReplicaProcessed = -1;
while ($oReplica = $oSetToProcess->Fetch())
/** @var SynchroReplica $oReplica */
while($oReplica = $oSetToProcess->Fetch())
{
set_time_limit($iLoopTimeLimit);
$iLastReplicaProcessed = $oReplica->GetKey();
@@ -3555,10 +3556,12 @@ class SynchroExecution
// Get all the replicas that are 'new' or modified or synchronized with a warning
//
$sSelectToSync = "SELECT SynchroReplica WHERE id > :curr_pos AND (status = 'new' OR status = 'modified' OR (status = 'synchronized' AND status_last_warning != '')) AND sync_source_id = :source_id AND status_last_seen >= :last_import";
$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array() /* order by*/,
array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos),
$this->m_aExtDataSpec);
$sSelectToSync = "SELECT SynchroReplica WHERE id > :curr_pos AND (status = 'new' OR status = 'modified' OR (status = 'synchronized' AND status_last_warning != '')) AND sync_source_id = :source_id AND status_last_seen >= :last_import";
$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array(), array(
'source_id' => $this->m_oDataSource->GetKey(),
'last_import' => $sLimitDate,
'curr_pos' => $iCurrPos,
), $this->m_aExtDataSpec);
$iCountScope = $oSetScope->Count();
$sDebugOQL = $oSetScope->GetFilter()->ToOQL(true);
$this->m_oStatLog->AddTrace("Looking for - new, modified or synchonized with a warning - replicas using the OQL query: '$sDebugOQL', returned $iCountScope replicas.");
@@ -3659,8 +3662,11 @@ class SynchroExecution
$this->m_oStatLog->AddTrace("Deletion date: $sDeletionDate");
}
$sSelectToDelete = "SELECT SynchroReplica WHERE id > :curr_pos AND sync_source_id = :source_id AND status IN ('obsolete') AND status_last_seen < :last_import";
$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array() /* order by*/,
array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sDeletionDate, 'curr_pos' => $iCurrPos));
$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array(), array(
'source_id' => $this->m_oDataSource->GetKey(),
'last_import' => $sDeletionDate,
'curr_pos' => $iCurrPos,
));
$iCountScope = $oSetScope->Count();
if ($iMaxReplica)
@@ -3677,7 +3683,8 @@ class SynchroExecution
}
$iLastReplicaProcessed = -1;
while ($oReplica = $oSetToProcess->Fetch())
/** @var SynchroReplica $oReplica */
while($oReplica = $oSetToProcess->Fetch())
{
set_time_limit($iLoopTimeLimit);
$iLastReplicaProcessed = $oReplica->GetKey();