diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index ed7aa5b8d..3a3d8f011 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -91,7 +91,7 @@ if (!defined('PATH_HOME')) { $e_all = $config['debug'] ? $e_all : $e_all & ~E_NOTICE; G::LoadSystem('inputfilter'); - $filter = new InputFilter(); + $filter = new InputFilter(); $config['debug'] = $filter->validateInput($config['debug']); $config['memory_limit'] = $filter->validateInput($config['memory_limit']); $config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int'); @@ -508,7 +508,9 @@ if (!defined('SYS_SYS')) { } } - unlink(PATH_CORE . 'config/_databases_.php'); + if (file_exists(PATH_CORE . "config" . PATH_SEP . "_databases_.php")) { + unlink(PATH_CORE . "config" . PATH_SEP . "_databases_.php"); + } } else { processWorkspace(); } diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index 1cac1d86c..87ec1e11b 100755 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -355,7 +355,7 @@ class CaseScheduler extends BaseCaseScheduler $criteria->add( $criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentIni, Criteria::GREATER_EQUAL)->addAnd( $criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentEnd, Criteria::LESS_EQUAL))->addOr( - $criteria->getNewCriterion(CaseSchedulerPeer::SCH_OPTION, 5, Criteria::GREATER_EQUAL))->addOr( + //$criteria->getNewCriterion(CaseSchedulerPeer::SCH_OPTION, 5, Criteria::GREATER_EQUAL))->addOr( $criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentIni, Criteria::LESS_THAN)) ); @@ -400,6 +400,7 @@ class CaseScheduler extends BaseCaseScheduler } if ($flagNewCase) { + println(" CASE SCHEDULER: " . $row["SCH_NAME"]); println(" - Connecting webservice: $wsdl"); $user = $row["SCH_DEL_USER_NAME"]; @@ -428,6 +429,9 @@ class CaseScheduler extends BaseCaseScheduler "WS_ROUTE_CASE_STATUS" => "" ); + $paramsLogResult = "FAILED"; + $paramsRouteLogResult = "FAILED"; + if ($result->status_code == 0) { eprintln(" OK", "green");