fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-1305

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2016-08-13 10:36:14 -04:00
parent 93cdedab85
commit 0d92b6cf07
2 changed files with 89 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
workflow/engine/bin/verify_solr.php
View File

@@ -46,10 +46,18 @@ if((count ($argv) > 2)){
$usrUid = $argv [3]; $usrUid = $argv [3];
} }
$debug = 1;//enable o disable notice, this mechanism is inherited from '/processmaker/workflow/engine/bin/reindex_solr.php'
ini_set ('display_errors', 1); ini_set ('display_errors', 1);
error_reporting (E_ALL);
ini_set ('memory_limit', '256M'); // set enough memory for the script ini_set ('memory_limit', '256M'); // set enough memory for the script
$e_all = defined( 'E_DEPRECATED' ) ? E_ALL & ~ E_DEPRECATED : E_ALL;
$e_all = defined( 'E_STRICT' ) ? $e_all & ~ E_STRICT : $e_all;
$e_all = $debug ? $e_all : $e_all & ~ E_NOTICE;
ini_set( 'error_reporting', $e_all );
if (! defined ('SYS_LANG')) { if (! defined ('SYS_LANG')) {
define ('SYS_LANG', 'en'); define ('SYS_LANG', 'en');
} }
@@ -74,8 +82,61 @@ if (! defined ('PATH_HOME')) {
define ('PATH_HOME', $pathhome); define ('PATH_HOME', $pathhome);
define ('PATH_TRUNK', $pathTrunk); define ('PATH_TRUNK', $pathTrunk);
define ('PATH_OUTTRUNK', $pathOutTrunk); define ('PATH_OUTTRUNK', $pathOutTrunk);
define( 'PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP );
require_once PATH_TRUNK . "framework/src/Maveriks/Util/ClassLoader.php";
require_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php'); require_once (PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php');
require_once (PATH_GULLIVER . "class.bootstrap.php");
Bootstrap::registerSystemClasses();
spl_autoload_register(array('Bootstrap', 'autoloadClass'));
Bootstrap::registerClass('BaseAppAssignSelfServiceValue', PATH_HOME . "engine/classes/model/om/BaseAppAssignSelfServiceValue.php");
Bootstrap::registerClass('BaseAppAssignSelfServiceValuePeer', PATH_HOME . "engine/classes/model/om/BaseAppAssignSelfServiceValuePeer.php");
Bootstrap::registerClass('AppAssignSelfServiceValue', PATH_HOME . "engine/classes/model/AppAssignSelfServiceValue.php");
Bootstrap::registerClass('AppAssignSelfServiceValuePeer', PATH_HOME . "engine/classes/model/AppAssignSelfServiceValuePeer.php");
Bootstrap::registerClass('BaseGroupwf', PATH_HOME . "engine/classes/model/om/BaseGroupwf.php");
Bootstrap::registerClass('BaseGroupwfPeer', PATH_HOME . "engine/classes/model/om/BaseGroupwfPeer.php");
Bootstrap::registerClass('BaseLanguage', PATH_HOME . "engine/classes/model/om/BaseLanguage.php");
Bootstrap::registerClass('BaseLanguagePeer', PATH_HOME . "engine/classes/model/om/BaseLanguagePeer.php");
Bootstrap::registerClass('AddonsManagerPeer', PATH_HOME . "engine/classes/model/AddonsManagerPeer.php");
Bootstrap::registerClass('BaseAppCacheView', PATH_HOME . "engine/classes/model/om/BaseAppCacheView.php");
Bootstrap::registerClass('BaseAppCacheViewPeer', PATH_HOME . "engine/classes/model/om/BaseAppCacheViewPeer.php");
Bootstrap::registerClass('AppCacheView', PATH_HOME . "engine/classes/model/AppCacheView.php");
Bootstrap::registerClass('AppCacheViewPeer', PATH_HOME . "engine/classes/model/AppCacheViewPeer.php");
Bootstrap::registerClass('BaseConfiguration', PATH_HOME . "engine/classes/model/om/BaseConfiguration.php");
Bootstrap::registerClass('BaseConfigurationPeer', PATH_HOME . "engine/classes/model/om/BaseConfigurationPeer.php");
Bootstrap::registerClass('BaseProcess', PATH_HOME . "engine/classes/model/om/BaseProcess.php");
Bootstrap::registerClass('ProcessPeer', PATH_HOME . "engine/classes/model/ProcessPeer.php");
Bootstrap::registerClass('BaseAppSolrQueue', PATH_HOME . "engine/classes/model/om/BaseAppSolrQueue.php");
Bootstrap::registerClass('BaseDynaform', PATH_HOME . "engine/classes/model/om/BaseDynaform.php");
Bootstrap::registerClass('DynaformPeer', PATH_HOME . "engine/classes/model/DynaformPeer.php");
Bootstrap::registerClass('BaseTaskUser', PATH_HOME . "engine/classes/model/om/BaseTaskUser.php");
Bootstrap::registerClass('BaseTask', PATH_HOME . "engine/classes/model/om/BaseTask.php");
Bootstrap::registerClass('BaseGroupUserPeer', PATH_HOME . "engine/classes/model/om/BaseGroupUserPeer.php");
Bootstrap::registerClass('BaseGroupUser', PATH_HOME . "engine/classes/model/om/BaseGroupUser.php");
Bootstrap::registerClass('BaseUsers', PATH_HOME . "engine/classes/model/om/BaseUsers.php");
Bootstrap::registerClass('BaseContent', PATH_HOME . "engine/classes/model/om/BaseContent.php");
Bootstrap::registerClass('BaseContentPeer', PATH_HOME . "engine/classes/model/om/BaseContentPeer.php");
Bootstrap::registerClass('ContentPeer', PATH_HOME . "engine/classes/model/ContentPeer.php");
Bootstrap::registerClass('BaseAppThread', PATH_HOME . "engine/classes/model/om/BaseAppThread.php");
Bootstrap::registerClass('AppThreadPeer', PATH_HOME . "engine/classes/model/AppThreadPeer.php");
Bootstrap::registerClass('BaseApplication', PATH_HOME . "engine/classes/model/om/BaseApplication.php");
Bootstrap::registerClass('ApplicationPeer', PATH_HOME . "engine/classes/model/ApplicationPeer.php");
Bootstrap::registerClass('BaseAppDelegation', PATH_HOME . "engine/classes/model/om/BaseAppDelegation.php");
Bootstrap::registerClass('BaseAppDelegationPeer', PATH_HOME . "engine/classes/model/om/BaseAppDelegationPeer.php");
Bootstrap::registerClass('BaseEvent', PATH_HOME . "engine/classes/model/om/BaseEvent.php");
Bootstrap::registerClass('BaseEventPeer', PATH_HOME . "engine/classes/model/om/BaseEventPeer.php");
Bootstrap::registerClass('BaseAppEvent', PATH_HOME . "engine/classes/model/om/BaseAppEvent.php");
Bootstrap::registerClass('AppEventPeer', PATH_HOME . "engine/classes/model/AppEventPeer.php");
Bootstrap::registerClass('BaseCaseScheduler', PATH_HOME . "engine/classes/model/om/BaseCaseScheduler.php");
Bootstrap::registerClass('BaseCaseSchedulerPeer', PATH_HOME . "engine/classes/model/om/BaseCaseSchedulerPeer.php");
Bootstrap::registerClass('CaseSchedulerPeer', PATH_HOME . "engine/classes/model/CaseSchedulerPeer.php");
require_once 'classes/model/AppDelegation.php';
require_once 'classes/model/Event.php';
require_once 'classes/model/AppEvent.php';
require_once 'classes/model/CaseScheduler.php';
G::LoadThirdParty ('pear/json', 'class.json'); G::LoadThirdParty ('pear/json', 'class.json');
G::LoadThirdParty ('smarty/libs', 'Smarty.class'); G::LoadThirdParty ('smarty/libs', 'Smarty.class');
@@ -100,10 +161,6 @@ if (! defined ('PATH_HOME')) {
require_once ("creole/Creole.php"); require_once ("creole/Creole.php");
} }
require_once 'classes/model/AppDelegation.php';
require_once 'classes/model/Event.php';
require_once 'classes/model/AppEvent.php';
require_once 'classes/model/CaseScheduler.php';
// G::loadClass('pmScript'); // G::loadClass('pmScript');
print "PATH_HOME: " . PATH_HOME . "\n"; print "PATH_HOME: " . PATH_HOME . "\n";

27
workflow/engine/classes/class.AppSolr.php
View File

@@ -31,6 +31,7 @@ require_once "classes/model/GroupUser.php";
require_once "classes/model/Task.php"; require_once "classes/model/Task.php";
require_once "classes/model/TaskUser.php"; require_once "classes/model/TaskUser.php";
require_once "classes/model/Dynaform.php"; require_once "classes/model/Dynaform.php";
require_once "classes/model/ProcessVariables.php";
require_once "entities/SolrRequestData.php"; require_once "entities/SolrRequestData.php";
require_once "entities/SolrUpdateDocument.php"; require_once "entities/SolrUpdateDocument.php";
require_once "entities/AppSolrQueue.php"; require_once "entities/AppSolrQueue.php";
@@ -169,6 +170,8 @@ class AppSolr
private $_solrInstance = ""; private $_solrInstance = "";
private $debug = false; //false private $debug = false; //false
private $debugAppInfo = false; private $debugAppInfo = false;
private $trunkSizeAcumulated;
private $totalTimeAcumulated;
public function __construct($SolrEnabled, $SolrHost, $SolrInstance) public function __construct($SolrEnabled, $SolrHost, $SolrInstance)
{ {
@@ -2403,6 +2406,7 @@ class AppSolr
} }
} }
} }
$dynaformFieldTypes = $this->getVariablesDynaform($documentInformation['PRO_UID'], $dynaformFieldTypes);
// create cache of dynaformfields // create cache of dynaformfields
//$oMemcache->set ("SOLR_DYNAFORM_FIELD_TYPES_" . $documentInformation ['PRO_UID'], $dynaformFieldTypes); //$oMemcache->set ("SOLR_DYNAFORM_FIELD_TYPES_" . $documentInformation ['PRO_UID'], $dynaformFieldTypes);
//} //}
@@ -2428,6 +2432,29 @@ class AppSolr
return $result; return $result;
} }
/**
*
*
* @param array $dynaformFieldTypes
* @return array
*/
public function getVariablesDynaform($processUid, $dynaformFieldTypes = array())
{
$criteria = new Criteria();
$criteria->add(ProcessVariablesPeer::PRJ_UID, $processUid);
$ds = ProcessVariablesPeer::doSelectRS($criteria);
$ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($ds->next()) {
$row = $ds->getRow();
$type = "text";
if ($row["VAR_FIELD_TYPE"] === "datetime") {
$type = "date";
}
$dynaformFieldTypes[$row["VAR_NAME"]] = $type;
}
return $dynaformFieldTypes;
}
/** /**
* Find the maximun value of the specified column in the array and return the * Find the maximun value of the specified column in the array and return the
* row index * row index