merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,41 +1,36 @@
<?php
/**
* File containing the XE 1.5 XmlQueryParserClass
*/
if(!defined('__XE_LOADED_XML_CLASS__')){
if(!defined('__XE_LOADED_XML_CLASS__'))
{
define('__XE_LOADED_XML_CLASS__', 1);
require(_XE_PATH_.'classes/xml/xmlquery/tags/query/QueryTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/table/TableTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/table/HintTableTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/table/TablesTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/ColumnTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/group/GroupsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/IndexTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/LimitTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/query/QueryTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/TableTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/HintTableTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/table/TablesTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/ColumnTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/group/GroupsTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
require(_XE_PATH_ . 'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
}
/**
@ -46,7 +41,17 @@ if(!defined('__XE_LOADED_XML_CLASS__')){
* @package classes\xml
* @version 0.1
*/
class XmlQueryParser extends XmlParser {
class XmlQueryParser extends XmlParser
{
/**
* constructor
* @return void
*/
function XmlQueryParser()
{
}
/**
* Create XmlQueryParser instance for Singleton
@ -56,8 +61,9 @@ class XmlQueryParser extends XmlParser {
function &getInstance()
{
static $theInstance = NULL;
if(!isset($theInstance)){
$theInstance = new XmlQueryParser();
if(!isset($theInstance))
{
$theInstance = new XmlQueryParser();
}
return $theInstance;
}
@ -65,8 +71,8 @@ class XmlQueryParser extends XmlParser {
/**
* Parses an XML query file
*
* 1. Read xml file <br />
* 2. Check the action <br />
* 1. Read xml file<br />
* 2. Check the action<br />
* 3. Parse and write cache file <br />
*
* @param $query_id
@ -82,7 +88,10 @@ class XmlQueryParser extends XmlParser {
// insert, update, delete, select action
$action = strtolower($xml_obj->query->attrs->action);
if(!$action) return;
if(!$action)
{
return;
}
// Write query cache file
$parser = new QueryParser($xml_obj->query);
@ -116,9 +125,14 @@ class XmlQueryParser extends XmlParser {
{
$buff = FileHandler::readFile($xml_file);
$xml_obj = parent::parse($buff);
if(!$xml_obj) return;
if(!$xml_obj)
{
return;
}
unset($buff);
return $xml_obj;
}
}
?>
/* End of file XmlQueryParser.150.class.php */
/* Location: ./classes/xml/XmlQueryParser.150.class.php */