CODE STYLE

FILES:
gulliver/system/class.tree.php
workflow/engine/classes/class.memcached.php
workflow/engine/classes/class.net.php
workflow/engine/classes/entities/AppSolrQueue.php
workflow/engine/classes/entities/FacetInterfaceRequest.php
workflow/engine/classes/entities/FacetInterfaceResult.php
workflow/engine/classes/entities/FacetItem.php
workflow/engine/classes/entities/FacetResult.php
workflow/engine/classes/entities/SelectedFacetGroupItem.php
workflow/engine/classes/entities/SolrQueryResult.php
This commit is contained in:
jennylee
2012-10-22 16:35:54 -04:00
parent c2adddd9fc
commit dcf7b02979
10 changed files with 277 additions and 283 deletions

View File

@@ -45,7 +45,7 @@ class PMmemcached
var $enabled = false;
var $supported = false;
private static $instance = NULL;
private static $instance = null;
public function __construct ($workspace)
{
@@ -111,62 +111,71 @@ class PMmemcached
throw new Exception( "Deserializing is not allowed." );
}
function set ($key, $object, $timeout = 0)
public function set ($key, $object, $timeout = 0)
{
if (! $this->connected)
if (! $this->connected) {
return false;
if ($this->class != 'filecache')
}
if ($this->class != 'filecache') {
$this->mem->set( $this->workspace . '_' . $key, $object, false, $timeout );
else
} else {
$this->mem->set( $this->workspace . '_' . $key, $object );
}
}
function get ($key)
public function get ($key)
{
if (! $this->connected)
if (! $this->connected) {
return false;
}
return $this->mem->get( $this->workspace . '_' . $key );
}
function add ($key, $value)
public function add ($key, $value)
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
return $this->mem->add( $this->workspace . '_' . $key, $value );
}
function increment ($key, $value)
public function increment ($key, $value)
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
return $this->mem->increment( $this->workspace . '_' . $key, $value );
}
function delete ($key)
public function delete ($key)
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
return $this->mem->delete( $this->workspace . '_' . $key );
}
function flush ()
public function flush ()
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
return $this->mem->flush();
}
function getStats ()
public function getStats ()
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
return $status = $this->mem->getStats();
}
function printDetails ()
public function printDetails ()
{
if ((! $this->connected) || ($this->class == 'filecache'))
if ((! $this->connected) || ($this->class == 'filecache')) {
return false;
}
$status = $this->mem->getStats();
echo "<table border='1'>";
echo "<tr><td>Memcache Server version:</td><td> " . $status["version"] . "</td></tr>";
@@ -195,6 +204,5 @@ class PMmemcached
echo "<tr><td>Number of valid items removed from cache to free memory for new items.</td><td>" . $status["evictions"] . "</td></tr>";
echo "</table>";
}
}

View File

@@ -31,7 +31,7 @@ class NET
* @param string $pHost
* @return void
*/
function __construct ($pHost)
public function __construct ($pHost)
{
$this->errno = 0;
$this->errstr = "";
@@ -56,7 +56,7 @@ class NET
* @param string $pHost
* @return void
*/
function resolv ($pHost)
public function resolv ($pHost)
{
$aHost = explode( "\\", $pHost );
if (count( $aHost ) > 1) {
@@ -75,7 +75,7 @@ class NET
} else {
$ip = @gethostbyname( $ipHost );
$long = ip2long( $ip );
if ($long == - 1 || $long === FALSE) {
if ($long == - 1 || $long === false) {
$this->errno = 2000;
$this->errstr = "NET::Host down";
$this->error = "Destination Host Unreachable";
@@ -92,7 +92,7 @@ class NET
* @param string $pPort
* @return true
*/
function scannPort ($pPort)
public function scannPort ($pPort)
{
define( 'TIMEOUT', 5 );
$hostip = @gethostbyname( $host ); // resloves IP from Hostname returns hostname on failure
@@ -114,7 +114,7 @@ class NET
* @param string $pHost
* @return true
*/
function is_ipaddress ($pHost)
public function is_ipaddress ($pHost)
{
$key = true;
#verifing if is a ip address
@@ -140,13 +140,14 @@ class NET
* @param string $pHost
* @return true
*/
function ping ($pTTL = 3000)
public function ping ($pTTL = 3000)
{
$cmd = "ping -w $pTTL $this->ip";
$output = exec( $cmd, $a, $a1 );
$this->errstr = "";
for ($i = 0; $i < count( $a ); $i ++)
for ($i = 0; $i < count( $a ); $i ++) {
$this->errstr += $a[$i];
}
$this->errno = $a1;
}
@@ -157,7 +158,7 @@ class NET
* @param string $pPasswd
* @return void
*/
function loginDbServer ($pUser, $pPasswd)
public function loginDbServer ($pUser, $pPasswd)
{
$this->db_user = $pUser;
$this->db_passwd = $pPasswd;
@@ -170,7 +171,7 @@ class NET
* @param string $pPort
* @return void
*/
function setDataBase ($pDb, $pPort = '')
public function setDataBase ($pDb, $pPort = '')
{
$this->db_sourcename = $pDb;
$this->db_port = $pPort;
@@ -182,7 +183,7 @@ class NET
* @param string $pDbDriver
* @return void
*/
function tryConnectServer ($pDbDriver)
public function tryConnectServer ($pDbDriver)
{
if ($this->errno != 0) {
return 0;
@@ -213,7 +214,6 @@ class NET
$this->errno = 10001;
}
break;
case 'pgsql':
$this->db_port = ($this->db_port == "") ? "5432" : $this->db_port;
$link = @pg_connect( "host='$this->ip' port='$this->db_port' user='$this->db_user' password='$this->db_passwd' dbname='$this->db_sourcename'" );
@@ -227,7 +227,6 @@ class NET
$this->errno = 20001;
}
break;
case 'mssql':
if ($this->db_instance != "") {
$str_port = "";
@@ -247,7 +246,6 @@ class NET
$this->errno = 30001;
}
break;
case 'oracle':
$this->db_port = (($this->db_port == "") || ($this->db_port == 0)) ? "1521" : $this->db_port;
try {
@@ -265,7 +263,6 @@ class NET
throw new Exception( "[erik] Couldn't connect to Oracle Server! - " . $e->getMessage() );
}
break;
case 'informix':
break;
case 'sqlite':
@@ -284,7 +281,7 @@ class NET
* @param string $pDbDriver
* @return void
*/
function tryOpenDataBase ($pDbDriver)
public function tryOpenDataBase ($pDbDriver)
{
if ($this->errno != 0) {
return 0;
@@ -322,7 +319,6 @@ class NET
$this->errno = 10001;
}
break;
case 'pgsql':
$this->db_port = (($this->db_port == "") || ($this->db_port == 0)) ? "5432" : $this->db_port;
$link = @pg_connect( "host='$this->ip' port='$this->db_port' user='$this->db_user' password='$this->db_passwd' dbname='$this->db_sourcename'" );
@@ -342,7 +338,6 @@ class NET
$this->errno = 20001;
}
break;
case 'mssql':
// $str_port = (($this->db_port == "") || ($this->db_port == 0) || ($this->db_port == 1433)) ? "" : ":".$this->db_port;
// $link = @mssql_connect($this->ip . $str_port, $this->db_user, $this->db_passwd);
@@ -370,7 +365,6 @@ class NET
$this->errno = 30001;
}
break;
case 'oracle':
$this->db_port = (($this->db_port == "") || ($this->db_port == 0)) ? "1521" : $this->db_port;
$link = @oci_connect( $this->db_user, $this->db_passwd, "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP) (HOST=$this->ip) (PORT=$this->db_port) )) (CONNECT_DATA=(SERVICE_NAME=$this->db_sourcename)))" );
@@ -393,10 +387,8 @@ class NET
$this->errno = 40001;
}
break;
case 'informix':
break;
case 'sqlite':
break;
}
@@ -412,15 +404,17 @@ class NET
* @param string $driver
* @return void
*/
function getDbServerVersion ($driver)
public function getDbServerVersion ($driver)
{
if (! isset( $this->ip ))
if (! isset( $this->ip )) {
$this->ip = getenv( 'HTTP_CLIENT_IP' );
}
if (isset( $this->ip ) && isset( $this->db_user ) && isset( $this->db_passwd )) {
try {
if (! isset( $this->db_sourcename ))
if (! isset( $this->db_sourcename )) {
$this->db_sourcename = DB_NAME;
}
$value = 'none';
$sDataBase = 'database_' . strtolower( DB_ADAPTER );
if (G::LoadSystemExist( $sDataBase )) {
@@ -443,7 +437,7 @@ class NET
* @param string $pAdapter
* @return void
*/
function dbName ($pAdapter)
public function dbName ($pAdapter)
{
switch ($pAdapter) {
case 'mysql':
@@ -473,7 +467,7 @@ class NET
* @param string $pAdapter
* @return void
*/
function showMsg ()
public function showMsg ()
{
if ($this->errno != 0) {
$msg = "
@@ -497,7 +491,7 @@ class NET
*
* @return string
*/
function getErrno ()
public function getErrno ()
{
return $this->errno;
}
@@ -508,11 +502,10 @@ class NET
*
* @return string
*/
function getErrmsg ()
public function getErrmsg ()
{
return $this->errstr;
}
}
/**
@@ -523,8 +516,9 @@ class Stat
{
public $stutus;
function __construct ()
public function __construct ()
{
$this->status = false;
}
}

View File

@@ -6,34 +6,32 @@ require_once ('Base.php');
*/
class Entity_AppSolrQueue extends Entity_Base
{
public $appUid = '';
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",
"appUpdated"
);
$obj->validateRequiredFields ($requiredFields);
return $obj;
}
public $appUid = '';
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","appUpdated"
);
$obj->validateRequiredFields( $requiredFields );
return $obj;
}
}

View File

@@ -3,38 +3,38 @@ 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;
}
}
}

View File

@@ -3,37 +3,35 @@ 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;
}
}
}

View File

@@ -5,43 +5,44 @@ 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;
}
}
}

View File

@@ -3,35 +3,32 @@ 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;
}
}
}

View File

@@ -3,38 +3,38 @@ 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;
}
}
}

View File

@@ -3,38 +3,36 @@ 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;
}
}
}