BUG 000 PM tables class generator & table build using phing

This commit is contained in:
Erik Amaru Ortiz
2011-09-08 15:00:41 -04:00
parent 1fef88d24e
commit 4968521a07
69 changed files with 579 additions and 1738 deletions

2
gulliver/thirdparty/phing/BuildEvent.php vendored Executable file → Normal file
View File

@@ -101,7 +101,7 @@ class BuildEvent extends EventObject {
$this->project = $source->getProject();
$this->target = $source;
$this->task = null;
} elseif ($source instanceof Task) {
} elseif ($source instanceof TaskPhing) {
$this->project = $source->getProject();
$this->target = $source->getOwningTarget();
$this->task = $source;

2
gulliver/thirdparty/phing/Phing.php vendored Executable file → Normal file
View File

@@ -22,7 +22,7 @@
require_once 'phing/Project.php';
require_once 'phing/ProjectComponent.php';
require_once 'phing/Target.php';
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/BuildException.php';
include_once 'phing/BuildEvent.php';

2
gulliver/thirdparty/phing/Project.php vendored Executable file → Normal file
View File

@@ -598,7 +598,7 @@ class Project {
$o = new $cls();
if ($o instanceof Task) {
if ($o instanceof TaskPhing) {
$task = $o;
} else {
$this->log (" (Using TaskAdapter for: $taskType)", PROJECT_MSG_DEBUG);

6
gulliver/thirdparty/phing/Target.php vendored Executable file → Normal file
View File

@@ -137,7 +137,7 @@ class Target implements TaskContainer {
* @param object The task object to add
* @access public
*/
function addTask(Task $task) {
function addTask(TaskPhing $task) {
$this->children[] = $task;
}
@@ -164,7 +164,7 @@ class Target implements TaskContainer {
$tasks = array();
for ($i=0,$size=count($this->children); $i < $size; $i++) {
$tsk = $this->children[$i];
if ($tsk instanceof Task) {
if ($tsk instanceof TaskPhing) {
// note: we're copying objects here!
$tasks[] = clone $tsk;
}
@@ -235,7 +235,7 @@ class Target implements TaskContainer {
public function main() {
if ($this->testIfCondition() && $this->testUnlessCondition()) {
foreach($this->children as $o) {
if ($o instanceof Task) {
if ($o instanceof TaskPhing) {
// child is a task
$o->perform();
} else {

4
gulliver/thirdparty/phing/TaskAdapter.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Use introspection to "adapt" an arbitrary ( not extending Task, but with
@@ -30,7 +30,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.7 $
* @package phing
*/
class TaskAdapter extends Task {
class TaskAdapter extends TaskPhing {
/** target object */
private $proxy;

2
gulliver/thirdparty/phing/TaskContainer.php vendored Executable file → Normal file
View File

@@ -38,5 +38,5 @@ interface TaskContainer {
* @param object The task to be added to the container
* @access public
*/
function addTask(Task $task);
function addTask(TaskPhing $task);
}

266
gulliver/thirdparty/phing/TaskPhing.php vendored Normal file
View File

@@ -0,0 +1,266 @@
<?php
/*
* $Id: Task.php 3076 2006-12-18 08:52:12Z fabien $
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information please see
* <http://phing.info>.
*/
require_once 'phing/ProjectComponent.php';
include_once 'phing/RuntimeConfigurable.php';
/**
* The base class for all Tasks.
*
* Use {@link Project#createTask} to register a new Task.
*
* @author Andreas Aderhold <andi@binarycloud.com>
* @copyright <20> 2001,2002 THYRELL. All rights reserved
* @version $Revision: 1.11 $
* @see Project#createTask()
* @package phing
*/
abstract class TaskPhing extends ProjectComponent {
/** owning Target object */
protected $target;
/** description of the task */
protected $description;
/** internal taskname (req) */
protected $taskType;
/** taskname for logger */
protected $taskName;
/** stored buildfile location */
protected $location;
/** wrapper of the task */
protected $wrapper;
/**
* Sets the owning target this task belongs to.
*
* @param object Reference to owning target
* @access public
*/
function setOwningTarget(Target $target) {
$this->target = $target;
}
/**
* Returns the owning target of this task.
*
* @return object The target object that owns this task
* @access public
*/
function getOwningTarget() {
return $this->target;
}
/**
* Returns the name of task, used only for log messages
*
* @return string Name of this task
* @access public
*/
function getTaskName() {
if ($this->taskName === null) {
// if no task name is set, then it's possible
// this task was created from within another task. We don't
// therefore know the XML tag name for this task, so we'll just
// use the class name stripped of "task" suffix. This is only
// for log messages, so we don't have to worry much about accuracy.
return preg_replace('/task$/i', '', get_class($this));
}
return $this->taskName;
}
/**
* Sets the name of this task for log messages
*
* @return string A string representing the name of this task for log
* @access public
*/
function setTaskName($name) {
$this->taskName = (string) $name;
}
/**
* Returns the name of the task under which it was invoked,
* usually the XML tagname
*
* @return string The type of this task (XML Tag)
*/
function getTaskType() {
return $this->taskType;
}
/**
* Sets the type of the task. Usually this is the name of the XML tag
*
* @param string The type of this task (XML Tag)
*/
function setTaskType($name) {
$this->taskType = (string) $name;
}
/**
* Returns a name
*
*/
protected function getRegisterSlot($slotName) {
return Register::getSlot('task.' . $this->getTaskName() . '.' . $slotName);
}
/**
* Provides a project level log event to the task.
*
* @param string The message to log
* @param integer The priority of the message
* @see BuildEvent
* @see BuildListener
*/
function log($msg, $level = PROJECT_MSG_INFO) {
$this->project->logObject($this, $msg, $level);
}
/**
* Sets a textual description of the task
*
* @param string The text describing the task
*/
public function setDescription($desc) {
$this->description = $desc;
}
/**
* Returns the textual description of the task
*
* @return string The text description of the task
*/
public function getDescription() {
return $this->description;
}
/**
* Called by the parser to let the task initialize properly.
* Should throw a BuildException if something goes wrong with the build
*
* This is abstract here, but may not be overloaded by subclasses.
*
* @throws BuildException
*/
public function init() {
}
/**
* Called by the project to let the task do it's work. This method may be
* called more than once, if the task is invoked more than once. For
* example, if target1 and target2 both depend on target3, then running
* <em>phing target1 target2</em> will run all tasks in target3 twice.
*
* Should throw a BuildException if someting goes wrong with the build
*
* This is abstract here. Must be overloaded by real tasks.
*
* @access public
*/
abstract function main();
/**
* Returns the location within the buildfile this task occurs. Used
* by {@link BuildException} to give detailed error messages.
*
* @return Location The location object describing the position of this
* task within the buildfile.
*/
function getLocation() {
return $this->location;
}
/**
* Sets the location within the buildfile this task occurs. Called by
* the parser to set location information.
*
* @return object The location object describing the position of this
* task within the buildfile.
* @access public
*/
function setLocation(Location $location) {
$this->location = $location;
}
/**
* Returns the wrapper object for runtime configuration
*
* @return object The wrapper object used by this task
* @access public
*/
function getRuntimeConfigurableWrapper() {
if ($this->wrapper === null) {
$this->wrapper = new RuntimeConfigurable($this, $this->getTaskName());
}
return $this->wrapper;
}
/**
* Sets the wrapper object this task should use for runtime
* configurable elements.
*
* @param object The wrapper object this task should use
* @access public
*/
function setRuntimeConfigurableWrapper(RuntimeConfigurable $wrapper) {
$this->wrapper = $wrapper;
}
/**
* Configure this task if it hasn't been done already.
*
* @access public
*/
function maybeConfigure() {
if ($this->wrapper !== null) {
$this->wrapper->maybeConfigure($this->project);
}
}
/**
* Perfrom this task
*
* @access public
*/
function perform() {
try { // try executing task
$this->project->fireTaskStarted($this);
$this->maybeConfigure();
$this->main();
$this->project->fireTaskFinished($this, $null=null);
} catch (Exception $exc) {
if ($exc instanceof BuildException) {
if ($exc->getLocation() === null) {
$exc->setLocation($this->getLocation());
}
}
$this->project->fireTaskFinished($this, $exc);
throw $exc;
}
}
}

12
gulliver/thirdparty/phing/UnknownElement.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Wrapper class that holds all information necessary to create a task
@@ -34,7 +34,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.9 $
* @package phing
*/
class UnknownElement extends Task {
class UnknownElement extends TaskPhing {
private $elementName;
private $realThing;
@@ -69,7 +69,7 @@ class UnknownElement extends Task {
$this->realThing = $this->makeObject($this, $this->wrapper);
$this->wrapper->setProxy($this->realThing);
if ($this->realThing instanceof Task) {
if ($this->realThing instanceof TaskPhing) {
$this->realThing->setRuntimeConfigurableWrapper($this->wrapper);
}
@@ -91,7 +91,7 @@ class UnknownElement extends Task {
throw new BuildException("Should not be executing UnknownElement::main() -- task/type: {$this->elementName}");
}
if ($this->realThing instanceof Task) {
if ($this->realThing instanceof TaskPhing) {
$this->realThing->main();
}
@@ -134,12 +134,12 @@ class UnknownElement extends Task {
}
$childWrapper->setProxy($realChild);
if ($realChild instanceof Task) {
if ($realChild instanceof TaskPhing) {
$realChild->setRuntimeConfigurableWrapper($childWrapper);
}
$child->handleChildren($realChild, $childWrapper);
if ($realChild instanceof Task) {
if ($realChild instanceof TaskPhing) {
$realChild->maybeConfigure();
}
}

4
gulliver/thirdparty/phing/tasks/ext/CapsuleTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
include_once 'phing/BuildException.php';
include_once 'phing/lib/Capsule.php';
include_once 'phing/util/StringHelper.php';
@@ -34,7 +34,7 @@ include_once 'phing/util/StringHelper.php';
* @version $Revision: 1.17 $
* @package phing.tasks.ext
*/
class CapsuleTask extends Task {
class CapsuleTask extends TaskPhing {
/**
* Capsule "template" engine.

4
gulliver/thirdparty/phing/tasks/ext/CreoleTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/types/Reference.php';
/**
@@ -34,7 +34,7 @@ include_once 'phing/types/Reference.php';
* @version $Revision: 1.13 $
* @package phing.tasks.system
*/
abstract class CreoleTask extends Task {
abstract class CreoleTask extends TaskPhing {
/**
* Used for caching loaders / driver. This is to avoid

4
gulliver/thirdparty/phing/tasks/ext/MailTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
/**
* Send a message by mail()
@@ -30,7 +30,7 @@ include_once 'phing/Task.php';
* @version $Revision: 1.1 $
* @package phing.tasks.ext
*/
class MailTask extends Task {
class MailTask extends TaskPhing {
protected $recipient;

4
gulliver/thirdparty/phing/tasks/ext/PackageAsPathTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Convert dot-notation packages to relative paths.
@@ -29,7 +29,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.5 $
* @package phing.tasks.ext
*/
class PackageAsPathTask extends Task {
class PackageAsPathTask extends TaskPhing {
/** The package to convert. */
protected $pckg;

4
gulliver/thirdparty/phing/tasks/ext/PhpLintTask.php vendored Executable file → Normal file
View File

@@ -1,5 +1,5 @@
<?php
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* A PHP lint task. Checking syntax of one or more PHP source file.
@@ -7,7 +7,7 @@ require_once 'phing/Task.php';
* @author Knut Urdalen <knut.urdalen@telio.no>
* @package phing.tasks.ext
*/
class PhpLintTask extends Task {
class PhpLintTask extends TaskPhing {
protected $file; // the source file (from xml attribute)
protected $filesets = array(); // all fileset objects assigned to this task

4
gulliver/thirdparty/phing/tasks/ext/SmartyTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/BuildException.php';
include_once 'phing/util/StringHelper.php';
@@ -40,7 +40,7 @@ include_once 'phing/util/StringHelper.php';
* @version $Id: SmartyTask.php 3076 2006-12-18 08:52:12Z fabien $
* @package phing.tasks.ext
*/
class SmartyTask extends Task {
class SmartyTask extends TaskPhing {
/**
* Smarty template engine.

4
gulliver/thirdparty/phing/tasks/ext/XmlLintTask.php vendored Executable file → Normal file
View File

@@ -1,5 +1,5 @@
<?php
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* A XML lint task. Checking syntax of one or more XML files against an XML Schema using the DOM extension.
@@ -7,7 +7,7 @@ require_once 'phing/Task.php';
* @author Knut Urdalen <knut.urdalen@telio.no>
* @package phing.tasks.ext
*/
class XmlLintTask extends Task {
class XmlLintTask extends TaskPhing {
protected $file; // the source file (from xml attribute)
protected $schema; // the schema file (from xml attribute)

4
gulliver/thirdparty/phing/tasks/ext/ZendCodeAnalyzerTask.php vendored Executable file → Normal file
View File

@@ -1,5 +1,5 @@
<?php
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* ZendCodeAnalyzerTask analyze PHP source code using the ZendCodeAnalyzer included in Zend Studio 5.1
@@ -41,7 +41,7 @@ require_once 'phing/Task.php';
* @author Knut Urdalen <knut.urdalen@telio.no>
* @package phing.tasks.ext
*/
class ZendCodeAnalyzerTask extends Task {
class ZendCodeAnalyzerTask extends TaskPhing {
protected $analyzerPath = ""; // Path to ZendCodeAnalyzer binary
protected $file = ""; // the source file (from xml attribute)

4
gulliver/thirdparty/phing/tasks/ext/coverage/CoverageMergerTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/Writer.php';
require_once 'phing/system/util/Properties.php';
@@ -33,7 +33,7 @@ require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
* @package phing.tasks.ext.coverage
* @since 2.1.0
*/
class CoverageMergerTask extends Task
class CoverageMergerTask extends TaskPhing
{
/** the list of filesets containing the .php filename rules */
private $filesets = array();

4
gulliver/thirdparty/phing/tasks/ext/coverage/CoverageReportTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/Writer.php';
require_once 'phing/system/util/Properties.php';
@@ -34,7 +34,7 @@ require_once 'phing/tasks/ext/coverage/CoverageReportTransformer.php';
* @package phing.tasks.ext.coverage
* @since 2.1.0
*/
class CoverageReportTask extends Task
class CoverageReportTask extends TaskPhing
{
private $outfile = "coverage.xml";

View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/FileWriter.php';
require_once 'phing/util/ExtendedFileStream.php';
@@ -40,7 +40,7 @@ class CoverageReportTransformer
private $toDir = "";
private $document = NULL;
function __construct(Task $task)
function __construct(TaskPhing $task)
{
$this->task = $task;
}

4
gulliver/thirdparty/phing/tasks/ext/coverage/CoverageSetupTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/Writer.php';
require_once 'phing/system/util/Properties.php';
@@ -33,7 +33,7 @@ require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
* @package phing.tasks.ext.coverage
* @since 2.1.0
*/
class CoverageSetupTask extends Task
class CoverageSetupTask extends TaskPhing
{
/** the list of filesets containing the .php filename rules */
private $filesets = array();

4
gulliver/thirdparty/phing/tasks/ext/ioncube/IoncubeEncoderTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
/**
@@ -30,7 +30,7 @@ require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
* @package phing.tasks.ext.ioncube
* @since 2.2.0
*/
class IoncubeEncoderTask extends Task
class IoncubeEncoderTask extends TaskPhing
{
private $phpVersion = "5";
private $ioncubePath = "/usr/local/ioncube";

4
gulliver/thirdparty/phing/tasks/ext/ioncube/IoncubeLicenseTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
/**
@@ -30,7 +30,7 @@ require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
* @package phing.tasks.ext.ioncube
* @since 2.2.0
*/
class IoncubeLicenseTask extends Task
class IoncubeLicenseTask extends TaskPhing
{
private $ioncubePath = "/usr/local/ioncube";

4
gulliver/thirdparty/phing/tasks/ext/phpdoc/PHPDocumentorTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Task to run phpDocumentor.
@@ -29,7 +29,7 @@ require_once 'phing/Task.php';
* @version $Id: PHPDocumentorTask.php 3076 2006-12-18 08:52:12Z fabien $
* @package phing.tasks.ext.phpdoc
*/
class PHPDocumentorTask extends Task
class PHPDocumentorTask extends TaskPhing
{
/**
* The path to the executable for phpDocumentor

4
gulliver/thirdparty/phing/tasks/ext/phpunit2/PHPUnit2ReportTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/FileWriter.php';
require_once 'phing/util/ExtendedFileStream.php';
@@ -36,7 +36,7 @@ require_once 'phing/util/ExtendedFileStream.php';
* @package phing.tasks.ext.phpunit2
* @since 2.1.0
*/
class PHPUnit2ReportTask extends Task
class PHPUnit2ReportTask extends TaskPhing
{
private $format = "noframes";
private $styleDir = "";

6
gulliver/thirdparty/phing/tasks/ext/phpunit2/PHPUnit2Task.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/Writer.php';
require_once 'phing/util/LogWriter.php';
@@ -33,7 +33,7 @@ require_once 'phing/util/LogWriter.php';
* @see BatchTest
* @since 2.1.0
*/
class PHPUnit2Task extends Task
class PHPUnit2Task extends TaskPhing
{
private $batchtests = array();
private $formatters = array();
@@ -70,7 +70,7 @@ class PHPUnit2Task extends Task
// add some defaults to the PHPUnit2 Filter
PHPUnit2_Util_Filter::addFileToFilter('PHPUnit2Task.php');
PHPUnit2_Util_Filter::addFileToFilter('PHPUnit2TestRunner.php');
PHPUnit2_Util_Filter::addFileToFilter('phing/Task.php');
PHPUnit2_Util_Filter::addFileToFilter('phing/TaskPhing.php');
PHPUnit2_Util_Filter::addFileToFilter('phing/Target.php');
PHPUnit2_Util_Filter::addFileToFilter('phing/Project.php');
PHPUnit2_Util_Filter::addFileToFilter('phing/Phing.php');

4
gulliver/thirdparty/phing/tasks/ext/simpletest/SimpleTestTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/system/io/PhingFile.php';
require_once 'phing/system/io/Writer.php';
require_once 'phing/util/LogWriter.php';
@@ -32,7 +32,7 @@ require_once 'phing/util/LogWriter.php';
* @package phing.tasks.ext.simpletest
* @since 2.2.0
*/
class SimpleTestTask extends Task
class SimpleTestTask extends TaskPhing
{
private $formatters = array();
private $haltonerror = false;

4
gulliver/thirdparty/phing/tasks/ext/svn/SvnBaseTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
/**
* Send a message by mail()
@@ -30,7 +30,7 @@ include_once 'phing/Task.php';
* @version $Id: SvnBaseTask.php 3076 2006-12-18 08:52:12Z fabien $
* @package phing.tasks.ext
*/
abstract class SvnBaseTask extends Task
abstract class SvnBaseTask extends TaskPhing
{
private $workingCopy = "";

2
gulliver/thirdparty/phing/tasks/ext/svn/SvnExportTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
/**

2
gulliver/thirdparty/phing/tasks/ext/svn/SvnLastRevisionTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
/**

4
gulliver/thirdparty/phing/tasks/system/AdhocTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Abstract class for creating adhoc Phing components in buildfile.
@@ -34,7 +34,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.6 $
* @package phing.tasks.system
*/
class AdhocTask extends Task {
class AdhocTask extends TaskPhing {
/**
* The PHP script

2
gulliver/thirdparty/phing/tasks/system/AdhocTaskdefTask.php vendored Executable file → Normal file
View File

@@ -80,7 +80,7 @@ class AdhocTaskdefTask extends AdhocTask {
// instantiate it to make sure it is an instance of Task
$t = new $classname();
if (!($t instanceof Task)) {
if (!($t instanceof TaskPhing)) {
throw new BuildException("The adhoc class you defined must be an instance of phing.Task", $this->location);
}

4
gulliver/thirdparty/phing/tasks/system/AppendTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/types/FileList.php';
include_once 'phing/types/FileSet.php';
@@ -50,7 +50,7 @@ include_once 'phing/types/FileSet.php';
* @package phing.tasks.system
* @version $Revision: 1.14 $
*/
class AppendTask extends Task {
class AppendTask extends TaskPhing {
/** Append stuff to this file. */
private $to;

4
gulliver/thirdparty/phing/tasks/system/AvailableTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/tasks/system/condition/ConditionBase.php';
/**
@@ -32,7 +32,7 @@ include_once 'phing/tasks/system/condition/ConditionBase.php';
* @version $Revision: 1.11 $
* @package phing.tasks.system
*/
class AvailableTask extends Task {
class AvailableTask extends TaskPhing {
/** Property to check for. */
private $property;

4
gulliver/thirdparty/phing/tasks/system/ChmodTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/types/FileSet.php';
/**
@@ -30,7 +30,7 @@ include_once 'phing/types/FileSet.php';
* @version $Revision: 1.12 $
* @package phing.tasks.system
*/
class ChmodTask extends Task {
class ChmodTask extends TaskPhing {
private $file;

4
gulliver/thirdparty/phing/tasks/system/CopyTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/system/io/PhingFile.php';
include_once 'phing/util/FileUtils.php';
include_once 'phing/util/SourceFileScanner.php';
@@ -36,7 +36,7 @@ include_once 'phing/mappers/FlattenMapper.php';
* @version $Revision: 1.16 $ $Date: 2006-06-12 21:46:05 +0200 (Mon, 12 Jun 2006) $
* @package phing.tasks.system
*/
class CopyTask extends Task {
class CopyTask extends TaskPhing {
protected $file = null; // the source file (from xml attribute)
protected $destFile = null; // the destiantion file (from xml attribute)

4
gulliver/thirdparty/phing/tasks/system/CvsPassTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/system/io/BufferedReader.php';
include_once 'phing/system/io/BufferedWriter.php';
include_once 'phing/util/StringHelper.php';
@@ -32,7 +32,7 @@ include_once 'phing/util/StringHelper.php';
* @version $Revision: 1.7 $
* @package phing.tasks.system
*/
class CVSPassTask extends Task {
class CVSPassTask extends TaskPhing {
/** CVS Root */
private $cvsRoot;

4
gulliver/thirdparty/phing/tasks/system/CvsTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/tasks/system/ExecTask.php';
include_once 'phing/types/Commandline.php';
@@ -38,7 +38,7 @@ include_once 'phing/types/Commandline.php';
* @version $Revision: 1.14 $
* @package phing.tasks.system
*/
class CvsTask extends Task {
class CvsTask extends TaskPhing {
/**
* Default compression level to use, if compression is enabled via

4
gulliver/thirdparty/phing/tasks/system/DeleteTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Deletes a file or directory, or set of files defined by a fileset.
@@ -27,7 +27,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.13 $
* @package phing.tasks.system
*/
class DeleteTask extends Task {
class DeleteTask extends TaskPhing {
protected $file;
protected $dir;

4
gulliver/thirdparty/phing/tasks/system/EchoTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
/**
* Echos a message to the logging system or to a file
@@ -30,7 +30,7 @@ include_once 'phing/Task.php';
* @package phing.tasks.system
*/
class EchoTask extends Task {
class EchoTask extends TaskPhing {
protected $msg = "";

4
gulliver/thirdparty/phing/tasks/system/ExecTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Executes a command on the shell.
@@ -30,7 +30,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.17 $
* @package phing.tasks.system
*/
class ExecTask extends Task {
class ExecTask extends TaskPhing {
/**
* Command to execute.

4
gulliver/thirdparty/phing/tasks/system/ExitTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Exits the active build, giving an additional message
@@ -30,7 +30,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.7 $
* @package phing.tasks.system
*/
class ExitTask extends Task {
class ExitTask extends TaskPhing {
private $message;
private $ifCondition;

4
gulliver/thirdparty/phing/tasks/system/ForeachTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/tasks/system/PhingTask.php';
/**
@@ -46,7 +46,7 @@ include_once 'phing/tasks/system/PhingTask.php';
* @version $Revision: 1.9 $
* @package phing.tasks.system
*/
class ForeachTask extends Task {
class ForeachTask extends TaskPhing {
/** Delimter-separated list of values to process. */
private $list;

4
gulliver/thirdparty/phing/tasks/system/IncludePathTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/types/Path.php';
/**
@@ -37,7 +37,7 @@ include_once 'phing/types/Path.php';
* @version $Revision: 1.1 $
* @package phing.tasks.system
*/
class IncludePathTask extends Task {
class IncludePathTask extends TaskPhing {
/**
* Classname of task to register.

4
gulliver/thirdparty/phing/tasks/system/InputTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/input/InputRequest.php';
include_once 'phing/input/YesNoInputRequest.php';
include_once 'phing/input/MultipleChoiceInputRequest.php';
@@ -34,7 +34,7 @@ include_once 'phing/input/MultipleChoiceInputRequest.php';
* @version $Revision: 1.6 $
* @package phing.tasks.system
*/
class InputTask extends Task {
class InputTask extends TaskPhing {
private $validargs;
private $message = ""; // required

4
gulliver/thirdparty/phing/tasks/system/MatchingTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/types/selectors/SelectorContainer.php';
include_once 'phing/types/FileSet.php';
include_once 'phing/types/PatternSet.php';
@@ -41,7 +41,7 @@ include_once 'phing/util/DirectoryScanner.php';
* @version $Revision: 1.4 $
* @package phing.tasks.system
*/
abstract class MatchingTask extends Task implements SelectorContainer {
abstract class MatchingTask extends TaskPhing implements SelectorContainer {
/** @var boolean */
protected $useDefaultExcludes = true;

4
gulliver/thirdparty/phing/tasks/system/MkdirTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/system/io/PhingFile.php';
/**
@@ -29,7 +29,7 @@ include_once 'phing/system/io/PhingFile.php';
* @version $Revision: 1.8 $
* @package phing.tasks.system
*/
class MkdirTask extends Task {
class MkdirTask extends TaskPhing {
/** directory to create*/
private $dir;

4
gulliver/thirdparty/phing/tasks/system/PhingCallTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Call another target in the same project.
@@ -46,7 +46,7 @@ require_once 'phing/Task.php';
* @access public
* @package phing.tasks.system
*/
class PhingCallTask extends Task {
class PhingCallTask extends TaskPhing {
private $callee;
private $subTarget;

4
gulliver/thirdparty/phing/tasks/system/PhingTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
include_once 'phing/util/FileUtils.php';
include_once 'phing/types/Reference.php';
include_once 'phing/tasks/system/PropertyTask.php';
@@ -44,7 +44,7 @@ include_once 'phing/tasks/system/PropertyTask.php';
* @version $Revision: 1.20 $
* @package phing.tasks.system
*/
class PhingTask extends Task {
class PhingTask extends TaskPhing {
/** the basedir where is executed the build file */
private $dir;

4
gulliver/thirdparty/phing/tasks/system/PhpEvalTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Executes PHP function or evaluates expression and sets return value to a property.
@@ -34,7 +34,7 @@ require_once 'phing/Task.php';
*
* @todo Add support for evaluating expressions
*/
class PhpEvalTask extends Task {
class PhpEvalTask extends TaskPhing {
protected $expression; // Expression to evaluate
protected $function; // Function to execute

4
gulliver/thirdparty/phing/tasks/system/PropertyPromptTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/system/io/ConsoleReader.php';
/**
@@ -35,7 +35,7 @@ include_once 'phing/system/io/ConsoleReader.php';
* @package phing.tasks.system
* @deprecated - in favor of the more capable InputTask
*/
class PropertyPromptTask extends Task {
class PropertyPromptTask extends TaskPhing {
private $propertyName; // required
private $defaultValue;

4
gulliver/thirdparty/phing/tasks/system/PropertyTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
include_once 'phing/Task.php';
include_once 'phing/TaskPhing.php';
include_once 'phing/system/util/Properties.php';
/**
@@ -31,7 +31,7 @@ include_once 'phing/system/util/Properties.php';
* @version $Revision$
* @package phing.tasks.system
*/
class PropertyTask extends Task {
class PropertyTask extends TaskPhing {
/** name of the property */
protected $name;

4
gulliver/thirdparty/phing/tasks/system/ReflexiveTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* This task is for using filter chains to make changes to files and overwrite the original files.
@@ -46,7 +46,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.11 $
* @package phing.tasks.system
*/
class ReflexiveTask extends Task {
class ReflexiveTask extends TaskPhing {
/** Single file to process. */
private $file;

4
gulliver/thirdparty/phing/tasks/system/ResolvePathTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Task for resolving relative paths and setting absolute path in property value.
@@ -42,7 +42,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.6 $
* @package phing.tasks.system
*/
class ResolvePathTask extends Task {
class ResolvePathTask extends TaskPhing {
/** Name of property to set. */
private $propertyName;

6
gulliver/thirdparty/phing/tasks/system/SequentialTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
require_once 'phing/TaskContainer.php';
/**
@@ -32,7 +32,7 @@ require_once 'phing/TaskContainer.php';
*
* @since 2.1.2
*/
class SequentialTask extends Task implements TaskContainer {
class SequentialTask extends TaskPhing implements TaskContainer {
/** Optional Vector holding the nested tasks */
private $nestedTasks = array();
@@ -41,7 +41,7 @@ class SequentialTask extends Task implements TaskContainer {
* Add a nested task to Sequential.
* @param Task $nestedTask Nested task to execute Sequential
*/
public function addTask(Task $nestedTask) {
public function addTask(TaskPhing $nestedTask) {
$this->nestedTasks[] = $nestedTask;
}

4
gulliver/thirdparty/phing/tasks/system/TaskdefTask.php vendored Executable file → Normal file
View File

@@ -20,7 +20,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Register a task for use within a buildfile.
@@ -45,7 +45,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.11 $
* @package phing.tasks.system
*/
class TaskdefTask extends Task {
class TaskdefTask extends TaskPhing {
/** Tag name for task that will be used in XML */
private $name;

4
gulliver/thirdparty/phing/tasks/system/TouchTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/util/DirectoryScanner.php';
include_once 'phing/types/FileSet.php';
include_once 'phing/util/FileUtils.php';
@@ -34,7 +34,7 @@ include_once 'phing/system/io/IOException.php';
* @version $Revision: 1.12 $
* @package phing.tasks.system
*/
class TouchTask extends Task {
class TouchTask extends TaskPhing {
private $file;
private $millis = -1;

4
gulliver/thirdparty/phing/tasks/system/TstampTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Sets properties to the current time, or offsets from the current time.
@@ -32,7 +32,7 @@ require_once 'phing/Task.php';
* @package phing.tasks.system
* @since 2.2.0
*/
class TstampTask extends Task
class TstampTask extends TaskPhing
{
private $customFormats = array();

4
gulliver/thirdparty/phing/tasks/system/TypedefTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Register a datatype for use within a buildfile.
@@ -46,7 +46,7 @@ require_once 'phing/Task.php';
* @version $Revision: 1.7 $
* @package phing.tasks.system
*/
class TypedefTask extends Task {
class TypedefTask extends TaskPhing {
/** Tag name for datatype that will be used in XML */
private $name;

4
gulliver/thirdparty/phing/tasks/system/UpToDateTask.php vendored Executable file → Normal file
View File

@@ -19,7 +19,7 @@
* <http://phing.info>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'phing/tasks/system/condition/Condition.php';
include_once 'phing/util/DirectoryScanner.php';
include_once 'phing/util/SourceFileScanner.php';
@@ -36,7 +36,7 @@ include_once 'phing/mappers/MergeMapper.php';
* @version $Revision: 1.6 $
* @package phing.tasks.system
*/
class UpToDateTask extends Task implements Condition {
class UpToDateTask extends TaskPhing implements Condition {
private $_property;
private $_value;

4
gulliver/thirdparty/phing/util/LogWriter.php vendored Executable file → Normal file
View File

@@ -21,7 +21,7 @@
*/
require_once 'phing/system/io/Writer.php';
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* Extends the Writer class to output messages to Phing's log
@@ -39,7 +39,7 @@
/**
* Constructs a new LogWriter object
*/
function __construct(Task $task, $level = PROJECT_MSG_INFO)
function __construct(TaskPhing $task, $level = PROJECT_MSG_INFO)
{
$this->task = $task;
$this->level = $level;

View File

@@ -21,7 +21,7 @@
*/
//include_once 'phing/tasks/ext/CapsuleTask.php';
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'propel/engine/database/model/AppData.php';
include_once 'propel/engine/database/model/Database.php';
include_once 'propel/engine/database/transform/XmlToAppData.php';
@@ -36,7 +36,7 @@ include_once 'propel/engine/database/transform/XmlToAppData.php';
* @author Daniel Rall <dlr@finemaltcoding.com> (Torque)
* @package propel.phing
*/
abstract class AbstractPropelDataModelTask extends Task {
abstract class AbstractPropelDataModelTask extends TaskPhing {
/**
* Fileset of XML schemas which represent our data models.

View File

@@ -21,7 +21,7 @@
*/
include_once 'creole/Connection.php';
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
/**
* This class generates an XML schema of an existing database from
@@ -33,7 +33,7 @@ require_once 'phing/Task.php';
* @version $Revision: 538 $
* @package propel.phing
*/
class PropelCreoleTransformTask extends Task {
class PropelCreoleTransformTask extends TaskPhing {
/** Name of XML database schema produced. */
protected $xmlSchema;

View File

@@ -20,7 +20,7 @@
* <http://propel.phpdb.org>.
*/
require_once 'phing/Task.php';
require_once 'phing/TaskPhing.php';
include_once 'creole/Connection.php';
/**
@@ -39,7 +39,7 @@ include_once 'creole/Connection.php';
* @version $Revision: 536 $
* @package propel.phing
*/
class PropelSQLExec extends Task {
class PropelSQLExec extends TaskPhing {
private $goodSql = 0;
private $totalSql = 0;

View File

@@ -385,7 +385,7 @@ class PmTable
$line = substr($line, 0, strrpos($line, ";"));
// just execute the drop and create table for target table nad not for others
if (stripos('CREATE TABLE') !== false || stripos('DROP TABLE') !== false) {
if (stripos($line, 'CREATE TABLE') !== false || stripos($line, 'DROP TABLE') !== false) {
$isCreateForCurrentTable = preg_match('/CREATE\sTABLE\s[\'\"\`]{1}' . $this->tableName . '[\'\"\`]{1}/i', $line, $match);
if ($isCreateForCurrentTable) {
$queryStack['create'] = $line;

File diff suppressed because it is too large Load Diff

View File

@@ -178,162 +178,14 @@ class pmTablesProxy extends HttpProxyController
* save pm table
*/
public function save()
{
require_once 'classes/model/AdditionalTables.php';
require_once 'classes/model/Fields.php';
try {
$data = $_POST;
$data['PRO_UID'] = trim($data['PRO_UID']);
$data['columns'] = G::json_decode($_POST['columns']); //decofing data columns
$isReportTable = $data['PRO_UID'] != '' ? true : false;
// Reserved Words
$aReservedWords = array(
'ALTER', 'CLOSE', 'COMMIT', 'CREATE', 'DECLARE',
'DELETE', 'DROP', 'FETCH', 'FUNCTION', 'GRANT',
'INDEX', 'INSERT', 'OPEN', 'REVOKE', 'ROLLBACK',
'SELECT', 'SYNONYM', 'TABLE', 'UPDATE', 'VIEW',
'APP_UID', 'ROW'
);
$oAdditionalTables = new AdditionalTables();
$oFields = new Fields();
// verify if exists.
$aNameTable = $oAdditionalTables->loadByName($data['REP_TAB_NAME']);
$repTabClassName = $oAdditionalTables->getPHPName($data['REP_TAB_NAME']);
$repTabData = array(
'ADD_TAB_UID' => $data['REP_TAB_UID'],
'ADD_TAB_NAME' => $data['REP_TAB_NAME'],
'ADD_TAB_CLASS_NAME' => $repTabClassName,
'ADD_TAB_DESCRIPTION' => $data['REP_TAB_DSC'],
'ADD_TAB_PLG_UID' => '',
'DBS_UID' => ($data['REP_TAB_CONNECTION'] ? $data['REP_TAB_CONNECTION'] : 'workflow'),
'PRO_UID' => $data['PRO_UID'],
'ADD_TAB_TYPE' => $data['REP_TAB_TYPE'],
'ADD_TAB_GRID' => $data['REP_TAB_GRID']
);
$columns = $data['columns'];
if ($data['REP_TAB_UID'] == '') { //new report table
if ($isReportTable) { //setting default columns
$defaultColumns = $this->_getReportTableDefaultColumns($data['REP_TAB_TYPE']);
$columns = array_merge($defaultColumns, $columns);
}
/** validations **/
if(is_array($aNameTable)) {
throw new Exception('The table "' . $data['REP_TAB_NAME'] . '" already exits.');
}
if (in_array(strtoupper($data['REP_TAB_NAME']), $aReservedWords) ) {
throw new Exception('Could not create the table with the name "' . $data['REP_TAB_NAME'] . '" because it is a reserved word.');
}
//create record
$addTabUid = $oAdditionalTables->create($repTabData);
} else { //editing report table
$addTabUid = $data['REP_TAB_UID'];
//loading old data before update
$addTabBeforeData = $oAdditionalTables->load($addTabUid, true);
//updating record
$oAdditionalTables->update($repTabData);
//removing old data fields references
$oCriteria = new Criteria('workflow');
$oCriteria->add(FieldsPeer::ADD_TAB_UID, $data['REP_TAB_UID']);
//$oCriteria->add(FieldsPeer::FLD_NAME, 'APP_UID', Criteria::NOT_EQUAL);
//$oCriteria->add(FieldsPeer::FLD_NAME, 'ROW', Criteria::NOT_EQUAL);
FieldsPeer::doDelete($oCriteria);
//getting old fieldnames
$oldFields = array();
foreach ($addTabBeforeData['FIELDS'] as $field) {
$oldFields[$field['FLD_UID']] = $field;
}
}
$aFields = array();
$fieldsList = array();
$editFieldsList = array();
foreach ($columns as $i => $column) {
//new feature, to reorder the columns
// if (isset($oldFields[$column->uid])) { // the the field alreaday exists
// if ($oldFields[$column->uid]['FLD_INDEX'] != $i) { // if its index has changed
// $column->uid = ''; //set as new field,
// }
// }
$field = array(
'FLD_UID' => $column->uid,
'FLD_INDEX' => $i,
'ADD_TAB_UID' => $addTabUid,
'FLD_NAME' => $column->field_name,
'FLD_DESCRIPTION' => $column->field_label,
'FLD_TYPE' => $column->field_type,
'FLD_SIZE' => $column->field_size,
'FLD_NULL' => (isset($column->field_null) && $column->field_null ? 1 : 0),
'FLD_AUTO_INCREMENT' => (isset($column->field_autoincrement) && $column->field_autoincrement ? 1 : 0),
'FLD_KEY' => (isset($column->field_key) && $column->field_key ? 1 : 0),
'FLD_FOREIGN_KEY' => 0,
'FLD_FOREIGN_KEY_TABLE' => '',
'FLD_DYN_NAME' => $column->field_dyn,
'FLD_DYN_UID' => $column->field_uid,
'FLD_FILTER' => (isset($column->field_filter) && $column->field_filter ? 1 : 0)
);
$fieldUid = $oFields->create($field);
$fieldsList[] = $field;
if($data['REP_TAB_UID'] == '') { //new
$aFields[] = array(
'sType' => $column->field_type,
'iSize' => $column->field_size,
'sFieldName' => $column->field_name,
'bNull' => (isset($column->field_null) ? $column->field_null : 1),
'bAI' => (isset($column->field_autoincrement) ? $column->field_autoincrement : 0),
'bPrimaryKey' => (isset($column->field_key) ? $column->field_key : 0)
);
} else { //editing
$field['FLD_UID'] = $fieldUid;
$aFields[$fieldUid] = $field;
}
}
if ($data['REP_TAB_UID'] == '') { //create a new report table
$oAdditionalTables->createTable($data['REP_TAB_NAME'], $data['REP_TAB_CONNECTION'], $aFields);
} else { //editing
//print_R($aFields);
$oAdditionalTables->updateTable($data['REP_TAB_NAME'], $data['REP_TAB_CONNECTION'], $aFields, $oldFields);
}
$oAdditionalTables->createPropelClasses($data['REP_TAB_NAME'], '', $fieldsList, $addTabUid, $data['REP_TAB_CONNECTION']);
if ($isReportTable) {
$oAdditionalTables->populateReportTable($data['REP_TAB_NAME'], $data['REP_TAB_CONNECTION'], $data['REP_TAB_TYPE'], $fieldsList, $data['PRO_UID'], $data['REP_TAB_GRID']);
}
$result->success = true;
} catch (Exception $e) {
$result->success = false;
$result->msg = $e->getMessage();
$result->trace = $e->getTraceAsString();
}
return $result;
}
public function save_moved()
{
require_once 'classes/model/AdditionalTables.php';
require_once 'classes/model/Fields.php';
try {
$data = $_POST;
$data['PRO_UID'] = trim($data['PRO_UID']);
$data['columns'] = G::json_decode($_POST['columns']); //decofing data columns
$data['columns'] = G::json_decode(stripslashes($_POST['columns'])); //decofing data columns
$isReportTable = $data['PRO_UID'] != '' ? true : false;
$oAdditionalTables = new AdditionalTables();
$oFields = new Fields();
@@ -506,19 +358,15 @@ class pmTablesProxy extends HttpProxyController
$primaryKeys = $additionalTables->getPrimaryKeys();
if ($result) {
foreach ($result['rows'] as $i => $row) {
$primaryKeysValues = array();
foreach ($primaryKeys as $key) {
$primaryKeysValues[] = isset($row[$key['FLD_NAME']]) ? $row[$key['FLD_NAME']] : '';
}
$result['rows'][$i]['__index__'] = G::encrypt(implode('-', $primaryKeysValues), 'pmtable');
foreach ($result['rows'] as $i => $row) {
$primaryKeysValues = array();
foreach ($primaryKeys as $key) {
$primaryKeysValues[] = isset($row[$key['FLD_NAME']]) ? $row[$key['FLD_NAME']] : '';
}
}
else {
$result['rows'] = array();
$result['rows'][$i]['__index__'] = G::encrypt(implode('-', $primaryKeysValues), 'pmtable');
}
return $result;
}
@@ -538,7 +386,6 @@ class pmTablesProxy extends HttpProxyController
$this->className = $table['ADD_TAB_CLASS_NAME'];
$this->classPeerName = $this->className . 'Peer';
$row = (array) $rows;
$row = array_merge(array_change_key_case($row, CASE_UPPER), array_change_key_case($row, CASE_LOWER));
$toSave = false;
if (!file_exists (PATH_WORKSPACE . 'classes/' . $this->className . '.php') ) {
@@ -549,24 +396,31 @@ class pmTablesProxy extends HttpProxyController
eval('$obj = new ' .$this->className. '();');
if (count($row) > 0) {
eval('$con = Propel::getConnection('.$this->classPeerName.'::DATABASE_NAME);');
$obj->fromArray($row, BasePeer::TYPE_FIELDNAME);
try {
eval('$con = Propel::getConnection('.$this->classPeerName.'::DATABASE_NAME);');
$con->begin();
$obj->fromArray($row, BasePeer::TYPE_FIELDNAME);
if ($obj->validate()) {
$obj->save();
$toSave = true;
$primaryKeysValues = array();
foreach ($primaryKeys as $primaryKey) {
$method = 'get' . AdditionalTables::getPHPName($primaryKey['FLD_NAME']);
$primaryKeysValues[] = $obj->$method();
if ($obj->validate()) {
$obj->save();
$toSave = true;
$primaryKeysValues = array();
foreach ($primaryKeys as $primaryKey) {
$method = 'get' . AdditionalTables::getPHPName($primaryKey['FLD_NAME']);
$primaryKeysValues[] = $obj->$method();
}
}
}
else {
foreach($obj->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "\n";
else {
foreach($obj->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "\n";
}
throw new PropelException($msg);
}
throw new PropelException($msg);
}
catch(Exception $e) {
$con->rollback();
throw new Exception($e->getMessage());
}
$index = G::encrypt(implode('-', $primaryKeysValues), 'pmtable');
}
@@ -669,10 +523,9 @@ class pmTablesProxy extends HttpProxyController
return 0;
}
if($i == 1) {
// Only the first row. If a field has the same name is discarded.
$j = 0;
foreach ($aAdditionalTables['FIELDS'] as $aField) {
if(strtoupper($aField['FLD_NAME']) == strtoupper($aAux[$j])) $swHead = true;
if($aField['FLD_NAME'] === $aAux[$j]) $swHead = true;
$j++;
}
}
@@ -1232,7 +1085,7 @@ class pmTablesProxy extends HttpProxyController
$application->field_uid = '';
$application->field_name = 'APP_NUMBER';
$application->field_label = 'APP_NUMBER';
$application->field_type = 'INT';
$application->field_type = 'INTEGER';
$application->field_size = 11;
$application->field_dyn = '';
$application->field_key = 0;
@@ -1249,7 +1102,7 @@ class pmTablesProxy extends HttpProxyController
$gridIndex->field_uid = '';
$gridIndex->field_name = 'ROW';
$gridIndex->field_label = 'ROW';
$gridIndex->field_type = 'INT';
$gridIndex->field_type = 'INTEGER';
$gridIndex->field_size = '11';
$gridIndex->field_dyn = '';
$gridIndex->field_key = 1;

View File

@@ -15,7 +15,6 @@ var smodel;
var infoGrid;
var _fields;
var isReport;
var editor;
Ext.onReady(function(){
@@ -139,15 +138,13 @@ Ext.onReady(function(){
editor = new Ext.ux.grid.RowEditor({
saveText : _("ID_UPDATE"),
listeners : {
afteredit : {
fn:function(rowEditor, obj, data, rowIndex ){
if (data.phantom === true) {
setTimeout(function(){
store.reload();
}, 1100); // <-- (just for old pmtables class engine) only if it is an insert
}
}
}
afteredit : {
fn:function(rowEditor, obj, data, rowIndex ){
if (data.phantom === true) {
//store.reload(); // only if it is an insert
}
}
}
}
});
}
@@ -328,7 +325,7 @@ DoNothing = function(){};
var props = function(){};
NewPMTableRow = function(){
if (!editor || editor.editing) {
if (editor.editing) {
return false;
}
var PMRow = infoGrid.getStore().recordType;

View File

@@ -193,8 +193,8 @@ Ext.onReady(function(){
forceSelection: true,
store: new Ext.data.SimpleStore({
fields: ['type_id', 'type'],
data : [['VARCHAR',_("ID_VARCHAR")],['TEXT',_("ID_TEXT")],['DATE',_("ID_DATE")],['INT',_("ID_INT")],['FLOAT',_("ID_FLOAT")]],
//data: columnsTypes,
//data : [['VARCHAR',_("ID_VARCHAR")],['TEXT',_("ID_TEXT")],['DATE',_("ID_DATE")],['INT',_("ID_INT")],['FLOAT',_("ID_FLOAT")]],
data: columnsTypes,
sortInfo: {field:'type_id', direction:'ASC'}
})
})
@@ -662,11 +662,6 @@ function createReportTable()
PMExt.error(_('ID_ERROR'),_('ID_PMTABLES_ALERT1') + ' <b>' + row.data['field_name']+'</b>');
return false;
}
if (row.data['field_name'] == 'DESC') {
PMExt.error(_('ID_ERROR'), 'The word "DESC" is reserved by the database engine please set another one.');
return false;
}
// validate that fieldname is not empty
if(row.data['field_name'].trim() == '') {

View File

@@ -313,8 +313,8 @@ Ext.onReady(function(){
valueField:'type_id',
store: new Ext.data.SimpleStore({
fields: ['type_id', 'type'],
data : [['VARCHAR',_("ID_VARCHAR")],['TEXT',_("ID_TEXT")],['DATE',_("ID_DATE")],['INT',_("ID_INT")],['FLOAT',_("ID_FLOAT")]],
//data: columnsTypes,
//data : [['VARCHAR',_("ID_VARCHAR")],['TEXT',_("ID_TEXT")],['DATE',_("ID_DATE")],['INT',_("ID_INT")],['FLOAT',_("ID_FLOAT")]],
data: columnsTypes,
sortInfo: {field:'type_id', direction:'ASC'}
})
})