stubbfel/geodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/#153' into devel

Browse Source
This commit is contained in:
stubbfel
2013-08-19 17:25:37 +02:00
parent 31e0e2e65c 4f82d22024
commit 000dbb1995
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
geoapi/database/PisSqlManager.php
View File

@@ -38,6 +38,12 @@ class PisSqlManager extends SQLManager {
*/
private static $selectTerm = "SELECT pid, iName, iValue FROM pis WHERE ";
/**
* String for the select all part of the query
* @var string
*/
private static $selectAllTerm = "SELECT pid, iName, iValue FROM pis ";
/**
* String for the orderby part of the query
* @var string
@@ -83,19 +89,24 @@ class PisSqlManager extends SQLManager {
$query .= self::$openBracket;
$query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm);
$query .= self::$closeBracket;
} else {
} else if ($pidList[0] != "*") {
return null;
}
if (count($iNameList) > 0 && \utiliy\ArrayManager::validAlphaNumList($iNameList)) {
$query .= self::$andTerm;
if ($query != self::$selectTerm) {
$query .= self::$andTerm;
}
$query .= self::$openBracket;
$query .= \utiliy\ArrayManager::toSqlWhereString($iNameList, self::$orTerm, self::$iNameTerm);
$query .= self::$closeBracket;
}
if ($query == self::$selectTerm) {
$query = self::$selectAllTerm;
}
$query .= self::$orderByTerm;
// send query
return $this->query($query);
}

16
geoapi/database/PssSqlManager.php
View File

@@ -44,6 +44,12 @@ class PssSqlManager extends SQLManager {
*/
private static $selectTerm = "SELECT pid, sName, sap, request FROM pss WHERE ";
/**
* String for the select all part of the query
* @var string
*/
private static $selectAllTerm = "SELECT pid, sName, sap, request FROM pss ";
/**
* String for the orderby part of the query
* @var string
@@ -89,17 +95,23 @@ class PssSqlManager extends SQLManager {
$query .= self::$openBracket;
$query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm);
$query .= self::$closeBracket;
} else {
} else if ($pidList[0] != "*") {
return null;
}
if (count($sNameList) > 0 && \utiliy\ArrayManager::validAlphaNumList($sNameList)) {
$query .= self::$andTerm;
if ($query != self::$selectTerm) {
$query .= self::$andTerm;
}
$query .= self::$openBracket;
$query .= \utiliy\ArrayManager::toSqlWhereString($sNameList, self::$orTerm, self::$sNameTerm);
$query .= self::$closeBracket;
}
if ($query == self::$selectTerm) {
$query = self::$selectAllTerm;
}
$query .= self::$orderByTerm;
// send query

15
sql/insert/example/insert-20130805.sql
View File

@@ -455,6 +455,14 @@ INSERT INTO `placeinformation` (`pid`, `iid`, `value`) VALUES
(183190820, 3, 'Lehrgebäude 4/2'),
(183190822, 3, 'Lehrgebäude 4/5');
--
-- Daten für Tabelle `service`
--
INSERT INTO `service` (`id`, `name`, `sap`) VALUES
(1, 'website', 'http://www.');
--
-- Daten für Tabelle `placeservice`
--
@@ -465,13 +473,6 @@ INSERT INTO `placeservice` (`pid`, `sid`, `request`) VALUES
(3, 1, 'hslausitz.de/start.html'),
(4, 1, 'tucottbus.de/btu/');
--
-- Daten für Tabelle `service`
--
INSERT INTO `service` (`id`, `name`, `sap`) VALUES
(1, 'website', 'http://www.');
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;