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

BUG 16468 SQL scripts still running with MySQL and not going through Solr SOLVED

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-12-23 14:26:52 -04:00
parent 6e698dfe3d
commit 2b2ead3186
1 changed files with 96 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
workflow/engine/controllers/home.php
View File

@@ -165,12 +165,38 @@ class Home extends Controller
public function indexSingle ($httpData) public function indexSingle ($httpData)
{ {
require_once 'classes/model/Step.php'; require_once 'classes/model/Step.php';
G::LoadClass( 'applications' );
$apps = new Applications();
$step = new Step(); $step = new Step();
$cases = $apps->getAll( $this->userID, 0, 1, 'todo' ); $solrEnabled = false;
if (($solrConf = System::solrEnv()) !== false) {
G::LoadClass("AppSolr");
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
$solrConf["solr_host"],
$solrConf["solr_instance"]
);
if ($ApplicationSolrIndex->isSolrEnabled() && $solrConf['solr_enabled'] == true) {
//Check if there are missing records to reindex and reindex them
$ApplicationSolrIndex->synchronizePendingApplications();
$solrEnabled = true;
} else{
$solrEnabled = false;
}
}
if ($solrEnabled) {
$cases = $ApplicationSolrIndex->getAppGridData($this->userID, 0, 1, 'todo');
} else {
G::LoadClass( 'applications' );
$apps = new Applications();
$cases = $apps->getAll( $this->userID, 0, 1, 'todo' );
}
if (! isset( $cases['data'][0] )) { if (! isset( $cases['data'][0] )) {
//the current user has not any aplication to do //the current user has not any aplication to do
@@ -314,9 +340,7 @@ class Home extends Controller
$category = null) $category = null)
{ {
require_once ("classes/model/AppNotes.php"); require_once ("classes/model/AppNotes.php");
G::LoadClass( 'applications' );
$apps = new Applications();
$appNotes = new AppNotes(); $appNotes = new AppNotes();
$start = empty( $start ) ? $this->appListStart : $start; $start = empty( $start ) ? $this->appListStart : $start;
@@ -339,7 +363,73 @@ class Home extends Controller
break; break;
} }
$cases = $apps->getAll( $user, $start, $limit, $type, $filter, $search, $process, $status, $type, $dateFrom, $dateTo, $callback, $dir, $sort, $category, false); $solrEnabled = false;
if ((
$type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
$type == "selfservice" || $type == "unassigned" || $type == "search"
) &&
(($solrConf = System::solrEnv()) !== false)
) {
G::LoadClass("AppSolr");
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
$solrConf["solr_host"],
$solrConf["solr_instance"]
);
if ($ApplicationSolrIndex->isSolrEnabled() && $solrConf['solr_enabled'] == true) {
//Check if there are missing records to reindex and reindex them
$ApplicationSolrIndex->synchronizePendingApplications();
$solrEnabled = true;
} else{
$solrEnabled = false;
}
}
if ($solrEnabled) {
$cases = $ApplicationSolrIndex->getAppGridData(
$user,
$start,
$limit,
$type,
$filter,
$search,
$process,
$status,
'',
$dateFrom,
$dateTo,
$callback,
$dir,
$sort,
$category
);
} else {
G::LoadClass( 'applications' );
$apps = new Applications();
$cases = $apps->getAll(
$user,
$start,
$limit,
$type,
$filter,
$search,
$process,
$status,
'',
$dateFrom,
$dateTo,
$callback,
$dir,
$sort,
$category,
false
);
}
// formating & complitting apps data with 'Notes' // formating & complitting apps data with 'Notes'
foreach ($cases['data'] as $i => $row) { foreach ($cases['data'] as $i => $row) {