dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] WS : Fixed norm on WebserviceRequest

Browse Source
This commit is contained in:
aKorczak
2011-12-09 19:30:35 +00:00
parent d0d7a9912f
commit 7f4fa67d9e
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/webservice/WebserviceRequest.php
+8 -24
View File
@@ -1122,9 +1122,7 @@ class WebserviceRequestCore
$sql_sort .= 'main_i18n.`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY main_i18n.`field` ASC|DESC $sql_sort .= 'main_i18n.`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY main_i18n.`field` ASC|DESC
} }
else else
{
$sql_sort .= (isset($this->resourceConfiguration['retrieveData']['tableAlias']) ? $this->resourceConfiguration['retrieveData']['tableAlias'].'.' : '').'`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY `field` ASC|DESC $sql_sort .= (isset($this->resourceConfiguration['retrieveData']['tableAlias']) ? $this->resourceConfiguration['retrieveData']['tableAlias'].'.' : '').'`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY `field` ASC|DESC
}
} }
$sql_sort = rtrim($sql_sort, ', ')."\n"; $sql_sort = rtrim($sql_sort, ', ')."\n";
} }
@@ -1169,9 +1167,7 @@ class WebserviceRequestCore
if ($sqlObjects) if ($sqlObjects)
{ {
foreach ($sqlObjects as $sqlObject) foreach ($sqlObjects as $sqlObject)
{
$objects[] = new $this->resourceConfiguration['retrieveData']['className']($sqlObject[$this->resourceConfiguration['fields']['id']['sqlId']]); $objects[] = new $this->resourceConfiguration['retrieveData']['className']($sqlObject[$this->resourceConfiguration['fields']['id']['sqlId']]);
}
return $objects; return $objects;
} }
} }
@@ -1254,12 +1250,8 @@ class WebserviceRequestCore
protected function executeEntityPut() protected function executeEntityPut()
{ {
return $this->saveEntityFromXml(200); return $this->saveEntityFromXml(200);
} }
/** /**
* Execute DELETE method on a PrestaShop entity * Execute DELETE method on a PrestaShop entity
* *
@@ -1328,12 +1320,6 @@ class WebserviceRequestCore
} }
} }
/**
* Write XML output after GET and HEAD action
*
* @return void
*/
/** /**
* save Entity Object from XML * save Entity Object from XML
* *
@@ -1525,42 +1511,40 @@ class WebserviceRequestCore
protected function getSQLRetrieveFilter($sqlId, $filterValue, $tableAlias = 'main.') protected function getSQLRetrieveFilter($sqlId, $filterValue, $tableAlias = 'main.')
{ {
$ret = ''; $ret = '';
// "LIKE" case (=%[foo]%, =%[foo], =[foo]%)
preg_match('/^(.*)\[(.*)\](.*)$/', $filterValue, $matches); preg_match('/^(.*)\[(.*)\](.*)$/', $filterValue, $matches);
if (count($matches) > 1) if (count($matches) > 1)
{ {
if ($matches[1] == '%' || $matches[3] == '%') if ($matches[1] == '%' || $matches[3] == '%')
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` LIKE "'.$matches[1].pSQL($matches[2]).$matches[3]."\"\n";// AND field LIKE %value% $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` LIKE "'.$matches[1].pSQL($matches[2]).$matches[3]."\"\n";
elseif ($matches[1] == '' && $matches[3] == '') elseif ($matches[1] == '' && $matches[3] == '')
{ {
// "OR" case
if (strpos($matches[2], '|') > 0) if (strpos($matches[2], '|') > 0)
{ {
$values = explode('|', $matches[2]); $values = explode('|', $matches[2]);
$ret .= ' AND ('; $ret .= ' AND (';
$temp = ''; $temp = '';
foreach ($values as $value) foreach ($values as $value)
$temp .= $tableAlias.'`'.pSQL($sqlId).'` = "'.pSQL($value).'" OR ';// AND (field = value3 OR field = value7 OR field = value9) $temp .= $tableAlias.'`'.pSQL($sqlId).'` = "'.pSQL($value).'" OR ';
$ret .= rtrim($temp, 'OR ').')'."\n"; $ret .= rtrim($temp, 'OR ').')'."\n";
} }
elseif (preg_match('/^([\d\.:-\s]+),([\d\.:-\s]+)$/', $matches[2], $matches3))// "AND" case elseif (preg_match('/^([\d\.:-\s]+),([\d\.:-\s]+)$/', $matches[2], $matches3))
{ {
unset($matches3[0]); unset($matches3[0]);
if (count($matches3) > 0) if (count($matches3) > 0)
{ {
sort($matches3); sort($matches3);
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` BETWEEN "'.$matches3[0].'" AND "'.$matches3[1]."\"\n";// AND field BETWEEN value3 AND value4 $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` BETWEEN "'.pSQL($matches3[0]).'" AND "'.pSQL($matches3[1])."\"\n";
} }
} }
else else
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'`="'.$matches[2].'"'."\n";// AND field = value1 $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'`="'.pSQL($matches[2]).'"'."\n";
} }
elseif ($matches[1] == '>') elseif ($matches[1] == '>')
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` > "'.pSQL($matches[2])."\"\n";// AND field > value3 $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` > "'.pSQL($matches[2])."\"\n";
elseif ($matches[1] == '<') elseif ($matches[1] == '<')
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` < "'.pSQL($matches[2])."\"\n";// AND field < value3 $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` < "'.pSQL($matches[2])."\"\n";
elseif ($matches[1] == '!') elseif ($matches[1] == '!')
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` != "'.pSQL($matches[2])."\"\n";// AND field IS NOT value3 $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` != "'.pSQL($matches[2])."\"\n";
} }
else else
$ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` '.(Validate::isFloat(pSQL($filterValue)) ? 'LIKE' : '=').' "'.pSQL($filterValue)."\"\n"; $ret .= ' AND '.$tableAlias.'`'.pSQL($sqlId).'` '.(Validate::isFloat(pSQL($filterValue)) ? 'LIKE' : '=').' "'.pSQL($filterValue)."\"\n";