rel #33501 : "inc" and "tot" options no longer block batch run

cosmogramme/php/integration/pseudo_notices.php

@@ -22,15 +22,6 @@
 // PSEUDO-NOTICES - cms rss sitotheque et albums (phase 0.1 a 0.6)
 // ----------------------------------------------------------------
 
-// ----------------------------------------------------------------
-// Batch
-// ----------------------------------------------------------------
-
-if ($phase >= 0 and $phase < 0.2) {
-	startIntegrationPhase('Batchs');
-	$phase = 0.2;
-}
-
 function deletePseudoNotice($id_notice) {
 	Class_Notice::find($id_notice)->delete();
 }

cosmogramme/php/integre_traite_main.php

-<?PHP
+<?php
 /**
  * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
  *
@@ -169,11 +169,23 @@ if (!$should_skip_records) {
   $log->ecrire('<h4>Traitement des notices</h4>');
   setVariable('traitement_phase', 'Intégration des notices');
   startIntegrationPhase('notice');
+}
+
+
+// ----------------------------------------------------------------
+// Batch
+// ----------------------------------------------------------------
+if ($phase >= 0 and $phase < 0.2) {
+  startIntegrationPhase('Batchs');
+	$phase = 0.2;
+}
 
+
+if (!$should_skip_records) {
   // ----------------------------------------------------------------
   // PSEUDO-NOTICES - cms rss sitotheque et albums (phase 0.1 a 0.6)
   // ----------------------------------------------------------------
-  if ($phase >= 0 and $phase < 1) {
+  if ($phase > 0.1 and $phase < 1) {
     include('integration/pseudo_notices.php');
     $phase = 1;
   }