finish #66
This commit is contained in:
@@ -30,61 +30,61 @@ class SpsSqlManager extends SQLManager {
|
||||
* String for the select part of the query
|
||||
* @var string
|
||||
*/
|
||||
private $selectTerm = "SELECT DISTINCT id, parent FROM sps WHERE ";
|
||||
private static $selectTerm = "SELECT DISTINCT id, parent FROM sps WHERE ";
|
||||
|
||||
/**
|
||||
* String for the alias part of the query
|
||||
* @var string
|
||||
*/
|
||||
private $aliasTerm = "alias = ";
|
||||
private static $aliasTerm = "alias = ";
|
||||
|
||||
/**
|
||||
* String for the did part of the query
|
||||
* @var string
|
||||
*/
|
||||
private $domainTerm = "did = ";
|
||||
private static $domainTerm = "did = ";
|
||||
|
||||
/**
|
||||
* String for the dNamet part of the query
|
||||
* @var string
|
||||
*/
|
||||
private $domainNameTerm = "dName = ";
|
||||
private static $domainNameTerm = "dName = ";
|
||||
|
||||
/**
|
||||
* first part of intersect-function
|
||||
* @var string
|
||||
*/
|
||||
private $interSectTermStart = "Intersects(";
|
||||
private static $interSectTermStart = "Intersects(";
|
||||
|
||||
/**
|
||||
* last part of intersect-function
|
||||
* @var string
|
||||
*/
|
||||
private $interSectTermEnd = "),plan)";
|
||||
private static $interSectTermEnd = "),plan)";
|
||||
|
||||
/**
|
||||
* first part of GeomFromText('Polygon-function
|
||||
* @var string
|
||||
*/
|
||||
private $polyStartStr = "GeomFromText('Polygon((";
|
||||
private static $polyStartStr = "GeomFromText('Polygon((";
|
||||
|
||||
/**
|
||||
* last part of GeomFromText('Polygon-function
|
||||
* @var string
|
||||
*/
|
||||
private $polyEndStr = "))'";
|
||||
private static $polyEndStr = "))'";
|
||||
|
||||
/**
|
||||
* maximium length of the value-string for an aliasname
|
||||
* @var int
|
||||
*/
|
||||
private $aliasMaxLenght = 32;
|
||||
private static $aliasMaxLenght = 32;
|
||||
|
||||
/**
|
||||
* maximium length of the value-string for a domainname
|
||||
* @var int
|
||||
*/
|
||||
private $domainMaxLenght = 32;
|
||||
private static $domainMaxLenght = 32;
|
||||
|
||||
/**
|
||||
* Default-Constructor
|
||||
@@ -120,9 +120,9 @@ class SpsSqlManager extends SQLManager {
|
||||
}
|
||||
|
||||
// build query string
|
||||
$query = $this->selectTerm;
|
||||
$query = self::$selectTerm;
|
||||
if ($this->validAliasString($alias)) {
|
||||
$query .= $this->aliasTerm . $this->quoteTerm . $alias . $this->quoteTerm . $this->addDomainTerm($domain);
|
||||
$query .= self::$aliasTerm . self::$quoteTerm . $alias . self::$quoteTerm . self::$addDomainTerm($domain);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -152,7 +152,7 @@ class SpsSqlManager extends SQLManager {
|
||||
|
||||
// build query string
|
||||
if ($this->validPolyString($poly)) {
|
||||
$query = $this->selectTerm . $this->interSectTermStart . $poly . $this->interSectTermEnd . $this->addDomainTerm($domain);
|
||||
$query = self::$selectTerm . self::$interSectTermStart . $poly . self::$interSectTermEnd . $this->addDomainTerm($domain);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
@@ -171,9 +171,9 @@ class SpsSqlManager extends SQLManager {
|
||||
$result = null;
|
||||
if ($domain != null && $this->validDomainString($domain)) {
|
||||
if ($this->isDid($domain)) {
|
||||
$result .= $this->andTerm . $this->domainTerm . $this->quoteTerm . $domain . $this->quoteTerm;
|
||||
$result .= self::$andTerm . self::$domainTerm . self::$quoteTerm . $domain . self::$quoteTerm;
|
||||
} else {
|
||||
$result .= $this->andTerm . $this->domainNameTerm . $this->quoteTerm . $domain . $this->quoteTerm;
|
||||
$result .= self::$andTerm . self::$domainNameTerm . self::$quoteTerm . $domain . self::$quoteTerm;
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
@@ -185,7 +185,7 @@ class SpsSqlManager extends SQLManager {
|
||||
* @return boolean
|
||||
*/
|
||||
private function validAliasString($alias) {
|
||||
if (\utiliy\StringManager::validSQLString($alias) && ctype_alnum($alias) && strlen($alias) <= $this->aliasMaxLenght) {
|
||||
if (\utiliy\StringManager::validSQLString($alias) && ctype_alnum($alias) && strlen($alias) <= self::$aliasMaxLenght) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
@@ -197,7 +197,7 @@ class SpsSqlManager extends SQLManager {
|
||||
* @return boolean
|
||||
*/
|
||||
private function validDomainString($domain) {
|
||||
if (\utiliy\StringManager::validSQLString($domain) && ctype_alnum($domain) && strlen($domain) <= $this->domainMaxLenght) {
|
||||
if (\utiliy\StringManager::validSQLString($domain) && ctype_alnum($domain) && strlen($domain) <= self::$domainMaxLenght) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
@@ -209,8 +209,8 @@ class SpsSqlManager extends SQLManager {
|
||||
* @return boolean
|
||||
*/
|
||||
private function validPolyString($poly) {
|
||||
if (\utiliy\StringManager::validSQLString($poly) && \utiliy\StringManager::startsWith($poly, $this->polyStartStr)
|
||||
&& \utiliy\StringManager::endsWith($poly, $this->polyEndStr)) {
|
||||
if (\utiliy\StringManager::validSQLString($poly) && \utiliy\StringManager::startsWith($poly, self::$polyStartStr)
|
||||
&& \utiliy\StringManager::endsWith($poly, self::$polyEndStr)) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
|
||||
Reference in New Issue
Block a user