Merge remote branch 'upstream/master'
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
class CLI
|
||||
{
|
||||
public static $tasks = array ();
|
||||
public static $currentTask = NULL;
|
||||
public static $currentTask = null;
|
||||
|
||||
/**
|
||||
* Adds a new task defined by it's name.
|
||||
@@ -46,7 +46,7 @@ class CLI
|
||||
public static function taskName ($name)
|
||||
{
|
||||
self::$currentTask = $name;
|
||||
self::$tasks[$name] = array ('name' => $name,'description' => NULL,'args' => array (),'function' => NULL,'opt' => array ('short' => '','long' => array (),'descriptions' => array ()
|
||||
self::$tasks[$name] = array ('name' => $name,'description' => null,'args' => array (),'function' => null,'opt' => array ('short' => '','long' => array (),'descriptions' => array ()
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -61,7 +61,7 @@ class CLI
|
||||
*/
|
||||
public static function taskDescription ($description)
|
||||
{
|
||||
assert( self::$currentTask !== NULL );
|
||||
assert( self::$currentTask !== null );
|
||||
self::$tasks[self::$currentTask]["description"] = $description;
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ class CLI
|
||||
*/
|
||||
public static function taskArg ($name, $optional = true, $multiple = false)
|
||||
{
|
||||
assert( self::$currentTask !== NULL );
|
||||
assert( self::$currentTask !== null );
|
||||
self::$tasks[self::$currentTask]["args"][$name] = array ('optional' => $optional,'multiple' => $multiple
|
||||
);
|
||||
}
|
||||
@@ -87,14 +87,16 @@ class CLI
|
||||
* @param string $short short options
|
||||
* @param array $long long options
|
||||
*/
|
||||
public static function taskOpt ($name, $description, $short, $long = NULL)
|
||||
public static function taskOpt ($name, $description, $short, $long = null)
|
||||
{
|
||||
assert( self::$currentTask !== NULL );
|
||||
assert( self::$currentTask !== null );
|
||||
$opts = self::$tasks[self::$currentTask]["opt"];
|
||||
if ($short)
|
||||
if ($short) {
|
||||
$opts['short'] .= $short;
|
||||
if ($long)
|
||||
}
|
||||
if ($long) {
|
||||
$opts['long'][] = $long;
|
||||
}
|
||||
$opts['descriptions'][$name] = array ('short' => $short,'long' => $long,'description' => $description
|
||||
);
|
||||
self::$tasks[self::$currentTask]["opt"] = $opts;
|
||||
@@ -107,7 +109,7 @@ class CLI
|
||||
*/
|
||||
public static function taskRun ($function)
|
||||
{
|
||||
assert( self::$currentTask !== NULL );
|
||||
assert( self::$currentTask !== null );
|
||||
self::$tasks[self::$currentTask]["function"] = $function;
|
||||
}
|
||||
|
||||
@@ -117,14 +119,15 @@ class CLI
|
||||
* @param array $args if defined, the task name should be argument 0
|
||||
* @param array $opts options as returned by getopt
|
||||
*/
|
||||
public static function help ($args, $opts = NULL)
|
||||
public static function help ($args, $opts = null)
|
||||
{
|
||||
global $argv;
|
||||
$scriptName = $argv[0];
|
||||
if (is_array( $args ))
|
||||
if (is_array( $args )) {
|
||||
$taskName = $args[0];
|
||||
else
|
||||
} else {
|
||||
$taskName = $args;
|
||||
}
|
||||
|
||||
if (! $taskName) {
|
||||
echo "usage: $scriptName <task> [options] [args]\n";
|
||||
@@ -142,10 +145,12 @@ class CLI
|
||||
$valid_args = array ();
|
||||
foreach (self::$tasks[$taskName]['args'] as $arg => $data) {
|
||||
$arg = strtoupper( $arg );
|
||||
if ($data['multiple'])
|
||||
if ($data['multiple']) {
|
||||
$arg = "$arg...";
|
||||
if ($data['optional'])
|
||||
}
|
||||
if ($data['optional']) {
|
||||
$arg = "[$arg]";
|
||||
}
|
||||
$valid_args[] = $arg;
|
||||
}
|
||||
$valid_args = join( " ", $valid_args );
|
||||
@@ -162,10 +167,12 @@ EOT;
|
||||
$valid_options = array ();
|
||||
foreach (self::$tasks[$taskName]['opt']['descriptions'] as $opt => $data) {
|
||||
$optString = array ();
|
||||
if ($data['short'])
|
||||
if ($data['short']) {
|
||||
$optString[] = "-{$data['short']}";
|
||||
if ($data['long'])
|
||||
}
|
||||
if ($data['long']) {
|
||||
$optString[] = "--{$data['long']}";
|
||||
}
|
||||
$valid_options[] = " " . join( ", ", $optString ) . "\n\t" . wordwrap( $data['description'], 70, "\n\t" );
|
||||
}
|
||||
$valid_options = join( "\n", $valid_options );
|
||||
@@ -194,14 +201,15 @@ EOT;
|
||||
$args = $argv;
|
||||
$cliname = array_shift( $args );
|
||||
$taskName = array_shift( $args );
|
||||
while ($taskName{0} == '-')
|
||||
while ($taskName{0} == '-') {
|
||||
$taskName = array_shift( $args );
|
||||
}
|
||||
if (! $taskName) {
|
||||
echo self::error( "Specify a task from the list below." ) . "\n\n";
|
||||
self::help( NULL, NULL );
|
||||
self::help( null, null );
|
||||
return;
|
||||
}
|
||||
$taskData = NULL;
|
||||
$taskData = null;
|
||||
foreach (self::$tasks as $name => $data) {
|
||||
if (strcasecmp( $name, $taskName ) === 0) {
|
||||
$taskData = $data;
|
||||
@@ -210,7 +218,7 @@ EOT;
|
||||
}
|
||||
if (! $taskData) {
|
||||
echo self::error( "Command not found: '$taskName'" ) . "\n\n";
|
||||
self::help( NULL, NULL );
|
||||
self::help( null, null );
|
||||
return;
|
||||
}
|
||||
G::LoadThirdParty( 'pear/Console', 'Getopt' );
|
||||
@@ -238,12 +246,15 @@ EOT;
|
||||
self::help( $taskName );
|
||||
return;
|
||||
}
|
||||
if (strpos( $optName, '--' ) === 0)
|
||||
if (strpos( $optName, '--' ) === 0) {
|
||||
$optName = substr( $optName, 2 );
|
||||
if (! array_key_exists( $optName, $validOpts ))
|
||||
}
|
||||
if (! array_key_exists( $optName, $validOpts )) {
|
||||
throw new Exception( "option not found: $optName" );
|
||||
if (array_key_exists( $validOpts[$optName], $taskOpts ))
|
||||
}
|
||||
if (array_key_exists( $validOpts[$optName], $taskOpts )) {
|
||||
throw new Exception( "'$optName' specified more then once" );
|
||||
}
|
||||
$taskOpts[$validOpts[$optName]] = $optArg;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
@@ -323,18 +334,18 @@ EOT;
|
||||
* @param string $message the message to display
|
||||
* @param string $filename the log file to write messages
|
||||
*/
|
||||
public static function logging ($message, $filename = NULL)
|
||||
public static function logging ($message, $filename = null)
|
||||
{
|
||||
static $log_file = NULL;
|
||||
static $log_file = null;
|
||||
if (isset( $filename )) {
|
||||
$log_file = fopen( $filename, "a" );
|
||||
fwrite( $log_file, " -- " . date( "c" ) . " " . $message . " --\n" );
|
||||
} else {
|
||||
if (isset( $log_file ))
|
||||
if (isset( $log_file )) {
|
||||
fwrite( $log_file, $message );
|
||||
}
|
||||
echo $message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -139,8 +139,9 @@ class Report
|
||||
//$aAux1 = explode('-', $from); date('Y-m-d H:i:s', mktime(0, 0, 0, $aAux1[1], $aAux1[2], $aAux1[0]))
|
||||
$oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
|
||||
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria->add( ApplicationPeer::APP_INIT_USER, $startedby );
|
||||
}
|
||||
|
||||
$oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID );
|
||||
$oCriteria->addGroupByColumn( 'C1.CON_VALUE' );
|
||||
@@ -155,11 +156,11 @@ class Report
|
||||
$oCriteria = new Criteria( 'workflow' );
|
||||
$oCriteria->addSelectColumn( ApplicationPeer::PRO_UID );
|
||||
$oCriteria->add( ApplicationPeer::PRO_UID, $aRow['PRO_UID'] );
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria->add( ApplicationPeer::APP_INIT_USER, $startedby );
|
||||
}
|
||||
|
||||
$aProcess[] = array ('PRO_UID' => $aRow['PRO_UID'],'PRO_TITLE' => $aRow['PRO_TITLE'],'CANTCASES' => ApplicationPeer::doCount( $oCriteria ),'MIN' => number_format( $aRow['MIN'], 2 ),'MAX' => number_format( $aRow['MAX'], 2 ),'TOTALDUR' => number_format( $aRow['TOTALDUR'], 2 ),'PROMEDIO' => number_format( $aRow['PROMEDIO'], 2 )
|
||||
);
|
||||
$aProcess[] = array ('PRO_UID' => $aRow['PRO_UID'],'PRO_TITLE' => $aRow['PRO_TITLE'],'CANTCASES' => ApplicationPeer::doCount( $oCriteria ),'MIN' => number_format( $aRow['MIN'], 2 ),'MAX' => number_format( $aRow['MAX'], 2 ),'TOTALDUR' => number_format( $aRow['TOTALDUR'], 2 ),'PROMEDIO' => number_format( $aRow['PROMEDIO'], 2 ));
|
||||
$oDataset->next();
|
||||
}
|
||||
|
||||
@@ -379,8 +380,9 @@ class Report
|
||||
|
||||
$oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
|
||||
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria->add( AppDelegationPeer::USR_UID, $startedby );
|
||||
}
|
||||
|
||||
$oCriteria->add( AppDelegationPeer::PRO_UID, $PRO_UID );
|
||||
|
||||
@@ -428,8 +430,9 @@ class Report
|
||||
|
||||
$oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) );
|
||||
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria->add( AppDelegationPeer::USR_UID, $startedby );
|
||||
}
|
||||
|
||||
$oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
|
||||
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
@@ -439,16 +442,16 @@ class Report
|
||||
$lastmonth = date( 'Y-m-d', mktime( 0, 0, 0, date( "m" ) - 2, date( "d" ), date( "Y" ) ) );
|
||||
$day = mktime( 0, 0, 0, date( "m" ), date( "d" ) - 1, date( "Y" ) );
|
||||
$lastday = mktime( 0, 0, 0, date( "m" ), date( "d" ) - 2, date( "Y" ) );
|
||||
$aProcess[] = array ('PRO_UID' => 'char','PRO_TITLE' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','CASELASTMONTH' => 'integer','CASELASTDAY' => 'integer'
|
||||
);
|
||||
$aProcess[] = array ('PRO_UID' => 'char','PRO_TITLE' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','CASELASTMONTH' => 'integer','CASELASTDAY' => 'integer');
|
||||
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
$oCriteria2 = new Criteria( 'workflow' );
|
||||
$oCriteria2->addSelectColumn( ApplicationPeer::PRO_UID );
|
||||
$oCriteria2->addAsColumn( "CANTCASES", "COUNT(*)" );
|
||||
$oCriteria2->add( ApplicationPeer::PRO_UID, $aRow['PRO_UID'] );
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_USER, $startedby );
|
||||
}
|
||||
$oCriteria2->addGroupByColumn( ApplicationPeer::PRO_UID );
|
||||
$oDataset2 = AppDelegationPeer::doSelectRS( $oCriteria2 );
|
||||
$oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
@@ -462,8 +465,9 @@ class Report
|
||||
$oCriteria2->add( ApplicationPeer::PRO_UID, $aRow['PRO_UID'] );
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_DATE, $lastmonth, Criteria::GREATER_EQUAL );
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_DATE, $month, Criteria::LESS_EQUAL );
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_USER, $startedby );
|
||||
}
|
||||
$oCriteria2->addGroupByColumn( ApplicationPeer::PRO_UID );
|
||||
$oDataset2 = AppDelegationPeer::doSelectRS( $oCriteria2 );
|
||||
$oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
@@ -477,8 +481,9 @@ class Report
|
||||
$oCriteria2->add( ApplicationPeer::PRO_UID, $aRow['PRO_UID'] );
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_DATE, $lastday, Criteria::GREATER_EQUAL );
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_DATE, $day, Criteria::LESS_EQUAL );
|
||||
if ($startedby != '')
|
||||
if ($startedby != '') {
|
||||
$oCriteria2->add( ApplicationPeer::APP_INIT_USER, $startedby );
|
||||
}
|
||||
$oCriteria2->addGroupByColumn( ApplicationPeer::PRO_UID );
|
||||
$oDataset2 = AppDelegationPeer::doSelectRS( $oCriteria2 );
|
||||
$oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
@@ -492,8 +497,7 @@ class Report
|
||||
'CASELASTMONTH' => $cant1,
|
||||
'CASELASTDAY' => $cant2
|
||||
);*/
|
||||
$aProcess[] = array ('PRO_UID' => $aRow['PRO_UID'],'PRO_TITLE' => $aRow['PRO_TITLE'],'CANTCASES' => $cant,'MIN' => number_format( $aRow['MIN'], 2 ),'MAX' => number_format( $aRow['MAX'], 2 ),'CASELASTMONTH' => number_format( $cant1, 2 ),'CASELASTDAY' => number_format( $cant2, 2 )
|
||||
);
|
||||
$aProcess[] = array ('PRO_UID' => $aRow['PRO_UID'],'PRO_TITLE' => $aRow['PRO_TITLE'],'CANTCASES' => $cant,'MIN' => number_format( $aRow['MIN'], 2 ),'MAX' => number_format( $aRow['MAX'], 2 ),'CASELASTMONTH' => number_format( $cant1, 2 ),'CASELASTDAY' => number_format( $cant2, 2 ));
|
||||
$oDataset->next();
|
||||
}
|
||||
|
||||
@@ -539,12 +543,10 @@ class Report
|
||||
$stmt = $con->prepareStatement( $sql );
|
||||
$rs = $stmt->executeQuery();
|
||||
|
||||
$ROW[] = array ('FECHA' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','TOTALDUR' => 'float','PROMEDIO' => 'float'
|
||||
);
|
||||
$ROW[] = array ('FECHA' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','TOTALDUR' => 'float','PROMEDIO' => 'float');
|
||||
|
||||
while ($rs->next()) {
|
||||
$ROW[] = array ('FECHA' => $rs->getString( 'FECHA' ),'CANTCASES' => $rs->getString( 'CANTCASES' ),'MIN' => number_format( $rs->getString( 'MIN' ), 2 ),'MAX' => number_format( $rs->getString( 'MAX' ), 2 ),'TOTALDUR' => number_format( $rs->getString( 'TOTALDUR' ), 2 ),'PROMEDIO' => number_format( $rs->getString( 'PROMEDIO' ), 2 )
|
||||
);
|
||||
$ROW[] = array ('FECHA' => $rs->getString( 'FECHA' ),'CANTCASES' => $rs->getString( 'CANTCASES' ),'MIN' => number_format( $rs->getString( 'MIN' ), 2 ),'MAX' => number_format( $rs->getString( 'MAX' ), 2 ),'TOTALDUR' => number_format( $rs->getString( 'TOTALDUR' ), 2 ),'PROMEDIO' => number_format( $rs->getString( 'PROMEDIO' ), 2 ));
|
||||
}
|
||||
|
||||
global $_DBArray;
|
||||
@@ -600,12 +602,10 @@ class Report
|
||||
$con = Propel::getConnection( "workflow" );
|
||||
$stmt = $con->prepareStatement( $sql );
|
||||
$rs = $stmt->executeQuery();
|
||||
$ROW[] = array ('FECHA' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','TOTALDUR' => 'float','PROMEDIO' => 'float'
|
||||
);
|
||||
$ROW[] = array ('FECHA' => 'char','CANTCASES' => 'integer','MIN' => 'float','MAX' => 'float','TOTALDUR' => 'float','PROMEDIO' => 'float');
|
||||
|
||||
while ($rs->next()) {
|
||||
$ROW[] = array ('FECHA' => $rs->getString( 'FECHA' ),'CANTCASES' => $rs->getString( 'CANTCASES' ),'MIN' => number_format( $rs->getString( 'MIN' ), 2 ),'MAX' => number_format( $rs->getString( 'MAX' ), 2 ),'TOTALDUR' => number_format( $rs->getString( 'TOTALDUR' ), 2 ),'PROMEDIO' => number_format( $rs->getString( 'PROMEDIO' ), 2 )
|
||||
);
|
||||
$ROW[] = array ('FECHA' => $rs->getString( 'FECHA' ),'CANTCASES' => $rs->getString( 'CANTCASES' ),'MIN' => number_format( $rs->getString( 'MIN' ), 2 ),'MAX' => number_format( $rs->getString( 'MAX' ), 2 ),'TOTALDUR' => number_format( $rs->getString( 'TOTALDUR' ), 2 ),'PROMEDIO' => number_format( $rs->getString( 'PROMEDIO' ), 2 ));
|
||||
}
|
||||
|
||||
global $_DBArray;
|
||||
@@ -902,11 +902,11 @@ class Report
|
||||
$aData['DEL_INDEX'] = $aRow['DEL_INDEX'];
|
||||
$aData['DEL_DELEGATE_DATE'] = $aRow['DEL_DELEGATE_DATE'];
|
||||
|
||||
if ($aRow['DEL_INIT_DATE'] == NULL)
|
||||
if ($aRow['DEL_INIT_DATE'] == null) {
|
||||
$aData['DEL_INIT_DATE'] = $aRow['DEL_DELEGATE_DATE'];
|
||||
else
|
||||
} else {
|
||||
$aData['DEL_INIT_DATE'] = $aRow['DEL_INIT_DATE'];
|
||||
|
||||
}
|
||||
//$aData['DEL_FINISH_DATE']=$aRow['DEL_FINISH_DATE'];
|
||||
if ($aRow['DEL_DURATION'] != 0) {
|
||||
G::LoadClass( 'dates' );
|
||||
@@ -920,5 +920,5 @@ class Report
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}// end Report class
|
||||
@@ -40,8 +40,7 @@ class ReportTables
|
||||
private $aDef = array ('mysql' => array ('number' => 'DOUBLE','char' => 'VARCHAR(255)','text' => 'TEXT','date' => 'DATETIME'
|
||||
),'pgsql' => array ('number' => 'DOUBLE','char' => 'VARCHAR(255)','text' => 'TEXT','date' => 'DATETIME'
|
||||
),'mssql' => array ('number' => 'FLOAT','char' => 'NVARCHAR(255)','text' => 'TEXT','date' => 'CHAR(19)'
|
||||
) /* Changed DATETIME CHAR(19) for compatibility issues. */
|
||||
);
|
||||
) /* Changed DATETIME CHAR(19) for compatibility issues. */ );
|
||||
//private $sPrefix = 'REP_';
|
||||
private $sPrefix = '';
|
||||
|
||||
@@ -146,7 +145,6 @@ class ReportTables
|
||||
$sQuery .= ' DEFAULT CHARSET=utf8;';
|
||||
$rs = $stmt->executeQuery( $sQuery );
|
||||
break;
|
||||
|
||||
case 'mssql':
|
||||
$sQuery = 'CREATE TABLE [' . $sTableName . '] (';
|
||||
if ($bDefaultFields) {
|
||||
@@ -569,7 +567,6 @@ class ReportTables
|
||||
$con = Propel::getConnection( $PropelDatabase );
|
||||
$stmt = $con->createStatement();
|
||||
switch (DB_ADAPTER) {
|
||||
|
||||
case 'mysql':
|
||||
$aTableFields = $this->getTableVars( $aRow['REP_TAB_UID'], true );
|
||||
if ($aRow['REP_TAB_TYPE'] == 'NORMAL') {
|
||||
@@ -786,12 +783,12 @@ class ReportTables
|
||||
public function tableExist ()
|
||||
{
|
||||
/*
|
||||
$bExists = true;
|
||||
$oConnection = mysql_connect(DB_HOST, DB_USER, DB_PASS);
|
||||
mysql_select_db(DB_NAME);
|
||||
$oDataset = mysql_query('SELECT COUNT(*) FROM REPORT_TABLE') || ($bExists = false);
|
||||
return $bExists;
|
||||
*/
|
||||
$bExists = true;
|
||||
$oConnection = mysql_connect(DB_HOST, DB_USER, DB_PASS);
|
||||
mysql_select_db(DB_NAME);
|
||||
$oDataset = mysql_query('SELECT COUNT(*) FROM REPORT_TABLE') || ($bExists = false);
|
||||
return $bExists;
|
||||
*/
|
||||
$bExists = true;
|
||||
$sDataBase = 'database_' . strtolower( DB_ADAPTER );
|
||||
if (G::LoadSystemExist( $sDataBase )) {
|
||||
@@ -814,12 +811,16 @@ class ReportTables
|
||||
{
|
||||
$repTabConnection = trim( strtoupper( $TabConnectionk ) );
|
||||
$PropelDatabase = 'rp';
|
||||
if ($repTabConnection == '' || $repTabConnection == 'REPORT')
|
||||
if ($repTabConnection == '' || $repTabConnection == 'REPORT') {
|
||||
$PropelDatabase = 'rp';
|
||||
if ($repTabConnection == 'RBAC')
|
||||
}
|
||||
if ($repTabConnection == 'RBAC') {
|
||||
$PropelDatabase = 'rbac';
|
||||
if ($repTabConnection == 'WF')
|
||||
}
|
||||
if ($repTabConnection == 'WF') {
|
||||
$PropelDatabase = 'workflow';
|
||||
}
|
||||
return ($PropelDatabase);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,46 +6,44 @@ require_once ('Base.php');
|
||||
*
|
||||
* @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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,33 +3,31 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* class.pmTalend.pmFunctions.php
|
||||
*
|
||||
@@ -19,17 +20,15 @@
|
||||
/**
|
||||
* Talend ETL Integration
|
||||
* @class pmTalend
|
||||
*
|
||||
* @name Talend ETL Integration
|
||||
* @icon /images/triggers/TalendOpenStudio.gif
|
||||
* @className class.pmTalend.pmFunctions.php
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @method
|
||||
*
|
||||
* Executes a Talend Web Service..
|
||||
* @method Executes a Talend Web Service..
|
||||
*
|
||||
* @name executeTalendWebservice
|
||||
* @label Executes a Talend Web Service.
|
||||
@@ -40,43 +39,48 @@
|
||||
* @return array | $return | Talend Array
|
||||
*
|
||||
*/
|
||||
function executeTalendWebservice($wsdl,$params=array(), $message){
|
||||
$client = new SoapClient($wsdl,array('trace' => 1));
|
||||
function executeTalendWebservice ($wsdl, $message, $params = array())
|
||||
{
|
||||
$client = new SoapClient( $wsdl, array ('trace' => 1
|
||||
) );
|
||||
|
||||
//Apply proxy settings
|
||||
$sysConf = System::getSystemConfiguration();
|
||||
if ($sysConf['proxy_host'] != '') {
|
||||
curl_setopt($client, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
|
||||
if ($sysConf['proxy_port'] != '') {
|
||||
curl_setopt($client, CURLOPT_PROXYPORT, $sysConf['proxy_port']);
|
||||
//Apply proxy settings
|
||||
$sysConf = System::getSystemConfiguration();
|
||||
if ($sysConf['proxy_host'] != '') {
|
||||
curl_setopt( $client, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
|
||||
if ($sysConf['proxy_port'] != '') {
|
||||
curl_setopt( $client, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
|
||||
}
|
||||
if ($sysConf['proxy_user'] != '') {
|
||||
curl_setopt( $client, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
|
||||
}
|
||||
curl_setopt( $client, CURLOPT_HTTPHEADER, array ('Expect:'
|
||||
) );
|
||||
}
|
||||
if ($sysConf['proxy_user'] != '') {
|
||||
curl_setopt($client, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : ''));
|
||||
|
||||
$params[0] = "";
|
||||
foreach ($params as $paramO) {
|
||||
$params[] = "--context_param" . $paramO[0] . "=" . $paramO[1];
|
||||
}
|
||||
curl_setopt($client, CURLOPT_HTTPHEADER, array('Expect:'));
|
||||
}
|
||||
$result = $client->__SoapCall( 'runJob', array ($params
|
||||
) );
|
||||
|
||||
$params[0]="";
|
||||
foreach($params as $paramO){
|
||||
$params[]="--context_param".$paramO[0]."=".$paramO[1];
|
||||
}
|
||||
$result = $client->__SoapCall('runJob', array($params));
|
||||
/*
|
||||
$params[1]="--context_param nb_line=".@=Quantity;
|
||||
|
||||
/*
|
||||
$params[1]="--context_param nb_line=".@=Quantity;
|
||||
$result = $client->__SoapCall('runJob', array($params));
|
||||
foreach ($result->item as $keyItem => $item){
|
||||
$gridRow=$keyItem+1;
|
||||
@=USERSINFO[$gridRow]['NAME']=$item->item[1];
|
||||
@=USERSINFO[$gridRow]['LASTNAME']=$item->item[2];
|
||||
@=USERSINFO[$gridRow]['DATE']=$item->item[0];
|
||||
@=USERSINFO[$gridRow]['STREET']=$item->item[3];
|
||||
@=USERSINFO[$gridRow]['CITY']=$item->item[4];
|
||||
@=USERSINFO[$gridRow]['STATE']=$item->item[5];
|
||||
@=USERSINFO[$gridRow]['STATEID']=$item->item[6];
|
||||
|
||||
$result = $client->__SoapCall('runJob', array($params));
|
||||
foreach ($result->item as $keyItem => $item){
|
||||
$gridRow=$keyItem+1;
|
||||
@=USERSINFO[$gridRow]['NAME']=$item->item[1];
|
||||
@=USERSINFO[$gridRow]['LASTNAME']=$item->item[2];
|
||||
@=USERSINFO[$gridRow]['DATE']=$item->item[0];
|
||||
@=USERSINFO[$gridRow]['STREET']=$item->item[3];
|
||||
@=USERSINFO[$gridRow]['CITY']=$item->item[4];
|
||||
@=USERSINFO[$gridRow]['STATE']=$item->item[5];
|
||||
@=USERSINFO[$gridRow]['STATEID']=$item->item[6];
|
||||
}
|
||||
*/
|
||||
G::SendMessageText( "<font color='blue'>Information from Talend ETL webservice</font><font color='darkgray'><br>" . $wsdl . "</font>", "INFO" );
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
G::SendMessageText( "<font color='blue'>Information from Talend ETL webservice</font><font color='darkgray'><br>".$wsdl."</font>", "INFO");
|
||||
}
|
||||
Reference in New Issue
Block a user