fernando/luos
1
0
Fork 0
Code Releases Activity

SOLR IMPLEMENTATION FOR v4.0 UPDATES (First Part)

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-06-05 12:28:48 -04:00
parent b140da984c
commit a7f7109468
21 changed files with 5055 additions and 4450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

10
workflow/engine/classes/class.memcached.php
View File

@@ -153,7 +153,7 @@ class PMmemcached
public function delete($key)
{
if (!$this->connected) {
if (! $this->connected || $this->class == 'filecache') {
return false;
}
@@ -162,7 +162,7 @@ class PMmemcached
public function flush()
{
if (!$this->connected) {
if (! $this->connected || $this->class == 'filecache') {
return false;
}
@@ -171,7 +171,7 @@ class PMmemcached
public function getStats()
{
if (!$this->connected) {
if (! $this->connected || $this->class == 'filecache') {
return false;
}
@@ -180,13 +180,13 @@ class PMmemcached
public function printDetails()
{
if (!$this->connected) {
if (! $this->connected || $this->class == 'filecache') {
return false;
}
$status = $this->mem->getStats();
if (!is_array($status)) {
if (! is_array($status)) {
return false;
}

809
workflow/engine/classes/class.searchIndex.php
View File

File diff suppressed because it is too large Load Diff

1221
workflow/engine/classes/class.solr.php
View File

File diff suppressed because it is too large Load Diff

68
workflow/engine/classes/entities/AppSolrQueue.php
View File

@@ -1,43 +1,43 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
/**
* Application Solr Queue
*/
class Entity_AppSolrQueue extends Entity_Base
{
public $appUid = "";
public $appChangeDate = "";
public $appChangeTrace = "";
public $appUpdated = 0;
public $appUid = '';
public $appChangeDate = '';
public $appChangeTrace = '';
public $appUpdated = 0;
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_AppSolrQueue ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_AppSolrQueue ();
$obj->initializeObject ($data);
$requiredFields = array (
"appUid",
"appChangeDate",
"appChangeTrace",
"appUpdated"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_AppSolrQueue();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_AppSolrQueue();
$obj->initializeObject( $data );
$requiredFields = array(
"appUid",
"appChangeDate",
"appChangeTrace",
"appUpdated"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}

294
workflow/engine/classes/entities/Base.php
View File

File diff suppressed because it is too large Load Diff

70
workflow/engine/classes/entities/FacetGroup.php
View File

@@ -1,49 +1,51 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
/**
* Facet group entity that represent a facet group
*
* @property $facetGroupName: The name of the facet (field name in solr index)
* @property $facetGroupPrintName: The print name of the facet (Human readable
* description)
* description)
* @property $facetGroupType: The type of facet group, field, daterange, filter,
* range
* range
* @property $facetGroupId: An identifier to find group information
* @property $facetItems: array of facet items
* @author dev-HebertSaak
*
*
*/
class Entity_FacetGroup extends Entity_Base
{
public $facetGroupName = '';
public $facetGroupPrintName = '';
public $facetGroupType = ''; // field, daterange, query
public $facetGroupId = '';
public $facetItems = array ();
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_FacetGroup();
return $obj;
}
static function createForInsert ($data)
{
$obj = new Entity_FacetGroup();
$obj->initializeObject( $data );
$requiredFields = array ("facetGroupName","facetItems"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $facetGroupName = '';
public $facetGroupPrintName = '';
public $facetGroupType = ''; // field, daterange, query
public $facetGroupId = '';
public $facetItems = array ();
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetGroup ();
return $obj;
}
static function createForInsert($data)
{
$obj = new Entity_FacetGroup ();
$obj->initializeObject ($data);
$requiredFields = array (
"facetGroupName",
"facetItems"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

70
workflow/engine/classes/entities/FacetInterfaceRequest.php
View File

@@ -1,40 +1,40 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_FacetInterfaceRequest extends Entity_Base
{
public $searchText = '';
public $selectedFacetsString = ''; // string of selected facet groups and
// items in format:
// groupkey1::groupdesc1:::itemkey1::itemdesc1,groupkey2::groupdesc2:::itemkey2::itemdesc2,
// groupkey3::groupdesc3:::itemkey3::itemdesc3
// var $selectedFacetFields = array();
// var $selectedFacetTypes = array();
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_FacetInterfaceRequest();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_FacetInterfaceRequest();
$obj->initializeObject( $data );
$requiredFields = array ("searchText","selectedFacetsString"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $searchText = '';
public $selectedFacetsString = ''; // string of selected facet groups and
// items in format:
// groupkey1::groupdesc1:::itemkey1::itemdesc1,groupkey2::groupdesc2:::itemkey2::itemdesc2,
// groupkey3::groupdesc3:::itemkey3::itemdesc3
// var $selectedFacetFields = array();
// var $selectedFacetTypes = array();
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetInterfaceRequest ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_FacetInterfaceRequest ();
$obj->initializeObject ($data);
$requiredFields = array (
"searchText",
"selectedFacetsString"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

66
workflow/engine/classes/entities/FacetInterfaceResult.php
View File

@@ -1,37 +1,39 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_FacetInterfaceResult extends Entity_Base
{
// array of facetsgroups, array of Entity_SelectedFacetGroupItem, filter text
public $aFacetGroup = array ();
public $aSelectedFacetGroupItem = array ();
public $sFilterText = '';
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_FacetInterfaceResult();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_FacetInterfaceResult();
$obj->initializeObject( $data );
$requiredFields = array ("aFacetGroup","aSelectedFacetGroupItem","sFilterText"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
// array of facetsgroups, array of Entity_SelectedFacetGroupItem, filter text
public $aFacetGroup = array ();
public $aSelectedFacetGroupItem = array ();
public $sFilterText = '';
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetInterfaceResult ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_FacetInterfaceResult ();
$obj->initializeObject ($data);
$requiredFields = array (
"aFacetGroup",
"aSelectedFacetGroupItem",
"sFilterText"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

69
workflow/engine/classes/entities/FacetItem.php
View File

@@ -1,48 +1,47 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
/**
*
*
*
*
* Entity Face item, represent an option in a facet group
*
* @author dev-HebertSaak
*
*
*/
class Entity_FacetItem extends Entity_Base
{
public $facetName = '';
public $facetPrintName = '';
public $facetCount = '';
public $facetSelectCondition = ''; // selected condition used to select
// this facet
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_FacetItem();
return $obj;
}
static function createForInsert ($data)
{
$obj = new Entity_FacetItem();
$obj->initializeObject( $data );
$requiredFields = array ("facetName","facetCount"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $facetName = '';
public $facetPrintName = '';
public $facetCount = '';
public $facetSelectCondition = ''; // selected condition used to select
// this facet
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetItem ();
return $obj;
}
static function createForInsert($data)
{
$obj = new Entity_FacetItem ();
$obj->initializeObject ($data);
$requiredFields = array (
"facetName",
"facetCount"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

78
workflow/engine/classes/entities/FacetRequest.php
View File

@@ -1,45 +1,43 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_FacetRequest extends Entity_Base
{
public $workspace = '';
public $searchText = '';
public $facetFields = array ();
public $facetQueries = array ();
public $facetDates = array ();
public $facetDatesStart = '';
public $facetDatesEnd = '';
public $facetDateGap = '';
public $facetRanges = array ();
public $filters = array ();
public $selectedFacetsString = '';
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetRequest ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_FacetRequest ();
$obj->initializeObject ($data);
$requiredFields = array (
"workspace"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
public $workspace = '';
public $searchText = '';
public $facetFields = array();
public $facetQueries = array();
public $facetDates = array();
public $facetDatesStart = '';
public $facetDatesEnd = '';
public $facetDateGap = '';
public $facetRanges = array();
public $filters = array();
public $selectedFacetsString = '';
private function __construct()
{
}
public static function createEmpty()
{
$obj = new Entity_FacetRequest ();
return $obj;
}
public static function createForRequest($data)
{
$obj = new Entity_FacetRequest ();
$obj->initializeObject($data);
$requiredFields = array(
"workspace"
);
$obj->validateRequiredFields($requiredFields);
return $obj;
}
}
}

61
workflow/engine/classes/entities/FacetResult.php
View File

@@ -1,34 +1,37 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_FacetResult extends Entity_Base
{
public $aFacetGroups = array ();
public $aSelectedFacetGroups = array ();
public $sFilterText = '';
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_FacetResult();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_FacetResult();
$obj->initializeObject( $data );
$requiredFields = array ("aFacetGroups","aSelectedFacetGroups","sFilterText"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $aFacetGroups = array ();
public $aSelectedFacetGroups = array ();
public $sFilterText = '';
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_FacetResult ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_FacetResult ();
$obj->initializeObject ($data);
$requiredFields = array (
"aFacetGroups",
"aSelectedFacetGroups",
"sFilterText"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

70
workflow/engine/classes/entities/SelectedFacetGroupItem.php
View File

@@ -1,40 +1,40 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_SelectedFacetGroupItem extends Entity_Base
{
public $selectedFacetGroupName = '';
public $selectedFacetGroupPrintName = '';
public $selectedFacetItemName = '';
public $selectedFacetItemPrintName = '';
public $selectedFacetRemoveCondition = ''; // remove condition, string of
// selected facets without this
// facet
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_SelectedFacetGroupItem();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_SelectedFacetGroupItem();
$obj->initializeObject( $data );
$requiredFields = array ("selectedFacetGroupName","selectedFacetItemName"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $selectedFacetGroupName = '';
public $selectedFacetGroupPrintName = '';
public $selectedFacetItemName = '';
public $selectedFacetItemPrintName = '';
public $selectedFacetRemoveCondition = ''; // remove condition, string of
// selected facets without this
// facet
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_SelectedFacetGroupItem ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_SelectedFacetGroupItem ();
$obj->initializeObject ($data);
$requiredFields = array (
"selectedFacetGroupName",
"selectedFacetItemName"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

68
workflow/engine/classes/entities/SolrQueryResult.php
View File

@@ -1,38 +1,40 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_SolrQueryResult extends Entity_Base
{
public $sEcho = '';
public $iTotalRecords = 0;
public $iTotalDisplayRecords = 10;
public $aaData = array (); // array of arrays of records to
// display
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_SolrQueryResult();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_SolrQueryResult();
$obj->initializeObject( $data );
$requiredFields = array ('sEcho','iTotalRecords','iTotalDisplayRecords','aaData'
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
public $sEcho = '';
public $iTotalRecords = 0;
public $iTotalDisplayRecords = 10;
public $aaData = array (); // array of arrays of records to
// display
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_SolrQueryResult ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_SolrQueryResult ();
$obj->initializeObject ($data);
$requiredFields = array (
'sEcho',
'iTotalRecords',
'iTotalDisplayRecords',
'aaData'
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

84
workflow/engine/classes/entities/SolrRequestData.php
View File

@@ -1,48 +1,46 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_SolrRequestData extends Entity_Base
{
public $workspace = '';
public $startAfter = 0;
public $pageSize = 10;
public $searchText = '*:*';
public $filterText = ''; // comma separated list of filters field:value
public $numSortingCols = 0; // number of columns that are sorted
public $sortableCols = array (); // array of booleans indicating if column is
// sortable (true, false)
public $sortCols = array (); // array of indices of sorted columns index
// based in the total number of sorting cols
public $sortDir = array (); // array of direction of sorting for each
// column (desc, asc)
public $includeCols = array ();
public $resultFormat = 'xml'; // json, xml, php
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_SolrRequestData ();
return $obj;
}
static function createForRequestPagination($data)
{
$obj = new Entity_SolrRequestData ();
$obj->initializeObject ($data);
$requiredFields = array (
'workspace'
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
public $workspace = '';
public $startAfter = 0;
public $pageSize = 10;
public $searchText = '*:*';
public $filterText = ''; // comma separated list of filters field:value
public $numSortingCols = 0; // number of columns that are sorted
public $sortableCols = array(); // array of booleans indicating if column is
// sortable (true, false)
public $sortCols = array(); // array of indices of sorted columns index
// based in the total number of sorting cols
public $sortDir = array(); // array of direction of sorting for each
// column (desc, asc)
public $includeCols = array();
public $resultFormat = 'xml'; // json, xml, php
private function __construct()
{
}
public static function createEmpty()
{
$obj = new Entity_SolrRequestData ();
return $obj;
}
public static function createForRequestPagination($data)
{
$obj = new Entity_SolrRequestData ();
$obj->initializeObject($data);
$requiredFields = array(
'workspace'
);
$obj->validateRequiredFields($requiredFields);
return $obj;
}
}
}

58
workflow/engine/classes/entities/SolrUpdateDocument.php
View File

@@ -1,33 +1,35 @@
<?php
//require_once ('Base.php');
require_once ('Base.php');
class Entity_SolrUpdateDocument extends Entity_Base
{
var $workspace = '';
var $document = '';
private function __construct ()
{
}
static function createEmpty ()
{
$obj = new Entity_SolrUpdateDocument();
return $obj;
}
static function createForRequest ($data)
{
$obj = new Entity_SolrUpdateDocument();
$obj->initializeObject( $data );
$requiredFields = array ("workspace","document"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}
var $workspace = '';
var $document = '';
private function __construct()
{
}
static function createEmpty()
{
$obj = new Entity_SolrUpdateDocument ();
return $obj;
}
static function createForRequest($data)
{
$obj = new Entity_SolrUpdateDocument ();
$obj->initializeObject ($data);
$requiredFields = array (
"workspace",
"document"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
}

28
workflow/engine/classes/model/AppSolrQueue.php
View File

@@ -81,22 +81,30 @@ class AppSolrQueue extends BaseAppSolrQueue
* Returns the list of updated applications
* array of Entity_AppSolrQueue
*/
public function getListUpdatedApplications ()
public function getListUpdatedApplications($updated = true, $deleted = true)
{
$updatedApplications = array ();
try {
$c = new Criteria();
$c->addSelectColumn(AppSolrQueuePeer::APP_UID);
$c->addSelectColumn(AppSolrQueuePeer::APP_CHANGE_DATE);
$c->addSelectColumn(AppSolrQueuePeer::APP_CHANGE_TRACE);
$c->addSelectColumn(AppSolrQueuePeer::APP_UPDATED);
//"WHERE
$c->add( AppSolrQueuePeer::APP_UPDATED, 0, Criteria::NOT_EQUAL );
$rs = AppSolrQueuePeer::doSelectRS( $c );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
//"WHERE
if($updated == true && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 0, Criteria::NOT_EQUAL);
}
if($updated == true && $deleted == false){
$c->add(AppSolrQueuePeer::APP_UPDATED, 1, Criteria::EQUAL);
}
if($updated == false && $deleted == true){
$c->add(AppSolrQueuePeer::APP_UPDATED, 2, Criteria::EQUAL);
}
$rs = AppSolrQueuePeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//echo $c->toString();
$rs->next();
$row = $rs->getRow();
@@ -111,11 +119,11 @@ class AppSolrQueue extends BaseAppSolrQueue
$rs->next();
$row = $rs->getRow();
}
return $updatedApplications;
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
}
} // AppSolrQueue