fix Argument and ConditionArgument type

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8563 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/xml/xmlquery/argument/Argument.class.php

@@ -3,6 +3,7 @@
 	class Argument {
 		var $value;
 		var $name;
+                var $type;
 		
 		var $isValid;
 		var $errorMessage;
@@ -13,6 +14,16 @@
 			$this->isValid = true;
 		}
 		
+                function getType(){
+                    if(isset($this->type)) return $this->type;
+                    if(is_string($this->value)) return 'column_name';
+                    return 'number';
+                }
+                
+                function setColumnType($value){
+                    $this->type = $value;
+                }
+                
 		function getName(){
 			return $this->name;
 		}
@@ -32,14 +43,22 @@
 		}
 		
 		function escapeValue($value){
-                        if(is_string($value)){
+                        if($this->getType() == 'column_name'){
 				$dbParser = XmlQueryParser::getDBParser();
 				return $dbParser->parseExpression($value);                            
                         }  
-                        return $value;
+			if(in_array($this->type, array('date', 'varchar', 'char','text', 'bigtext'))){
-		}
+				if(!is_array($value))
+					$value = '\''.$value.'\'';
+				else {
+					$total = count($value);
+					for($i = 0; $i < $total; $i++)
+						$value[$i] = '\''.$value[$i].'\'';
+				}
+			}	
+			return $value;  
+		}      
 		
-
 		function isValid(){
 			return $this->isValid;
 		}

classes/xml/xmlquery/argument/ConditionArgument.class.php

@@ -2,7 +2,7 @@
 
 	class ConditionArgument extends Argument {
 		var $operation;
-		var $type;
+		
                 
 		function ConditionArgument($name, $value, $operation){
 			parent::Argument($name, $value);
@@ -139,19 +139,7 @@
 			//if($column_type === '') $column_type = 'varchar';
 
 		}
-                
+
-                function escapeValue($value){
-			if(in_array($this->type, array('date', 'varchar', 'char','text', 'bigtext'))){
-				if(!is_array($value))
-					$value = '\''.$value.'\'';
-				else {
-					$total = count($value);
-					for($i = 0; $i < $total; $i++)
-						$value[$i] = '\''.$value[$i].'\'';
-				}
-			}	
-			return $value;                    
-                }
 		
                 
         }

classes/xml/xmlquery/tags/query/QueryTag.class.php

@@ -86,10 +86,11 @@ class QueryTag {
 		foreach($arguments as $argument){
 			if(isset($argument) && $argument->getArgumentName()){
 			$prebuff .= $argument->toString();
-                        if($argument->isConditionArgument())
+                        $column_type = $this->column_type[$this->getQueryId()][$argument->getColumnName()];
+                        if(isset($column_type))
                             $prebuff .= sprintf("$%s_argument->setColumnType('%s');\n"
                                     , $argument->getArgumentName()
-                                    , $this->column_type[$this->getQueryId()][$argument->getColumnName()] );
+                                    , $column_type );
 			}
 		}
 		$prebuff .= "\n";