svn commit: r338 - trunk/mapbender/http/classes/class_wms.php
uli at osgeo.org
uli at osgeo.org
Wed May 24 06:18:19 EDT 2006
Author: uli
Date: 2006-05-24 10:18:18+0000
New Revision: 338
Modified:
trunk/mapbender/http/classes/class_wms.php
Log:
code cleaing, prepared statements
Modified: trunk/mapbender/http/classes/class_wms.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/classes/class_wms.php?view=diff&rev=338&p1=trunk/mapbender/http/classes/class_wms.php&p2=trunk/mapbender/http/classes/class_wms.php&r1=337&r2=338
==============================================================================
--- trunk/mapbender/http/classes/class_wms.php (original)
+++ trunk/mapbender/http/classes/class_wms.php 2006-05-24 10:18:18+0000
@@ -52,10 +52,7 @@
function createObjFromXML($url){
- global $DBSERVER,$DB,$OWNER,$PW;
- $con = db_connect($DBSERVER,$OWNER,$PW);
- db_select_db($DB,$con);
-
+
$x = new connector($url);
$data = $this->char_encode($x->file);
if(!$data){
@@ -72,18 +69,8 @@
$this->wms_status = true;
}
- # for temporary wms a id has to be created...
- /*
- $sql="SELECT MAX(wms_id) AS id FROM wms";
- $res = db_query($sql);
-
- if(db_fetch_row($res)){
- $this->wms_id = db_result($res, 0, "id") +1;
- }
- */
$time = explode(" ", microtime(1));
$this->wms_id = substr(md5(substr($time[0], 2)), 0, 5);
- //$this->wms_id = "id_" . substr(md5(srand((double)time())),0,6);
$parser = xml_parser_create(CHARSET);
xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,1);
@@ -363,13 +350,9 @@
}
if(strtoupper($element[tag]) == "SRS"){
- # $this->objLayer[$cnt_layer]->wms_srs = $element[value];
$this->objLayer[$cnt_layer]->wms_srs1 = $element[value];
- # $wms_srs2 = explode (" ", $wms_srs1);
$this->wms_srs = explode (" ", $this->objLayer[0]->wms_srs1);
- }
-
-
+ }
if(strtoupper($element[tag]) == "LATLONBOUNDINGBOX"){
$cnt_epsg++;
$this->objLayer[$cnt_layer]->layer_epsg[$cnt_epsg]["epsg"] = "EPSG:4326";
@@ -564,7 +547,6 @@
if($parent){
echo "parent.";
}
-
// wms_title and abstract have previously been urlencoded
// this solution may not yet be the ultimate one
print("add_wms('".
@@ -587,7 +569,6 @@
echo "parent.";
}
echo "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');";
- #echo "alert('". $this->data_type[$i] ."','". $this->data_format[$i] ."');";
}
for($i=0; $i<count($this->objLayer); $i++){
if($parent){
@@ -961,8 +942,10 @@
}
}
function update_gui_wms($myWMS){
- $sql = "SELECT * FROM gui_wms where fkey_wms_id = " . $myWMS;
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_wms where fkey_wms_id = $1";
+ $v = array($myWMS);
+ $t = array('i');
+ $res = db_prep_query($sql,$v,$t);
$cnt = 0;
while($row = db_fetch_array($res)){
unset($mySubmit);
@@ -1026,7 +1009,6 @@
function getCapabilitiesDoc() {
return $this->wms_getcapabilities_doc;
}
-
function transaction($sql){
#echo "<hr>". $sql;
$ok = db_query($sql);
@@ -1052,10 +1034,11 @@
*
*/
function createObjFromDB($gui_id,$wms_id){
- global $DBSERVER,$DB,$OWNER,$PW;
- $connect = db_connect($DBSERVER,$OWNER,$PW);
- $sql="Select * from gui_wms where fkey_wms_id=".$wms_id." AND fkey_gui_id='".$gui_id."';";
- $res = db_query($sql);
+
+ $sql = "Select * from gui_wms where fkey_wms_id = $1 AND fkey_gui_id = $2";
+ $v = array($wms_id,$gui_id);
+ $t = array('i','s');
+ $res = db_prep_query($sql,$v,$t);
$count=0;
#$res_count=db_num_rows($res);
@@ -1068,8 +1051,10 @@
$this->gui_wms_epsg=$row["gui_wms_epsg"];
$this->gui_wms_visible = $row["gui_wms_visible"];
- $sql="Select * from wms where wms_id=".$wms_id.";";
- $res_wms = db_query($sql);
+ $sql = "Select * from wms where wms_id = $1 ";
+ $v = array($wms_id);
+ $t = array('i');
+ $res_wms = db_prep_query($sql,$v,$t);
$count_wms=0;
while($row2 = db_fetch_array($res_wms)){
$this->wms_id = $row2["wms_id"];
@@ -1094,8 +1079,10 @@
}
### formats
- $sql = "SELECT * FROM wms_format WHERE fkey_wms_id = ".$wms_id.";";
- $res_wms = db_query($sql);
+ $sql = "SELECT * FROM wms_format WHERE fkey_wms_id = $1 ";
+ $v = array($wms_id);
+ $t = array('i');
+ $res_wms = db_prep_query($sql,$v,$t);
$count_format=0;
while($row3 = db_fetch_array($res_wms)){
$this->data_type[$count_format] = $row3["data_type"];
@@ -1106,16 +1093,19 @@
}
#layer
- $sql="Select * from gui_layer where gui_layer_wms_id=".$wms_id." AND fkey_gui_id='";
- $sql .= $gui_id."' AND gui_layer_status = 1 ORDER BY gui_layer_priority;";
-
- $res = db_query($sql);
+ $sql = "Select * from gui_layer where gui_layer_wms_id = $1 AND fkey_gui_id = $2 ";
+ $sql .= " AND gui_layer_status = 1 ORDER BY gui_layer_priority;";
+ $v = array($wms_id,$gui_id);
+ $t = array('i','s');
+ $res = db_prep_query($sql,$v,$t);
$count=0;
while($row = db_fetch_array($res)){
- $layer_id=$row["fkey_layer_id"];
- $sql="Select * from layer where layer_id=".$layer_id.";";
- $res_layer = db_query($sql);
+ $layer_id = $row["fkey_layer_id"];
+ $sql = "Select * from layer where layer_id = $1";
+ $v = array($layer_id);
+ $t = array('i');
+ $res_layer = db_prep_query($sql,$v,$t);
$count_layer=0;
while($row2 = db_fetch_array($res_layer)){
$this->addLayer($row2["layer_pos"],$row2["layer_parent"]);
@@ -1140,8 +1130,10 @@
$this->objLayer[$layer_cnt]->gui_layer_maxscale = $row["gui_layer_maxscale"];
$this->objLayer[$layer_cnt]->gui_layer_wfs_featuretype = $row["gui_layer_wfs_featuretype"];
- $sql="Select * from layer_epsg where fkey_layer_id=".$layer_id." ORDER BY fkey_layer_id;";
- $res_layer_epsg = db_query($sql);
+ $sql = "Select * from layer_epsg where fkey_layer_id = $1 ORDER BY fkey_layer_id";
+ $v = array($layer_id);
+ $t = array('i');
+ $res_layer_epsg = db_prep_query($sql,$v,$t);
$count_layer_epsg=0;
while($row2 = db_fetch_array($res_layer_epsg)){
@@ -1155,8 +1147,10 @@
}
### handle styles
- $sql = "SELECT * FROM layer_style WHERE fkey_layer_id = " . $layer_id;
- $res_style = db_query($sql);
+ $sql = "SELECT * FROM layer_style WHERE fkey_layer_id = $1 ";
+ $v = array($layer_id);
+ $t = array('i');
+ $res_style = db_prep_query($sql,$v,$t);
$count_layer_style = 0;
while($row2 = db_fetch_array($res_style)){
$this->objLayer[$layer_cnt]->layer_style[$count_layer_style]["name"]=$row2["name"];
@@ -1177,30 +1171,29 @@
* this function checks wether the onlineresource already exists in the database.
*/
function checkObjExistsInDB(){
- global $DBSERVER,$DB,$OWNER,$PW;
- $sql="Select * from wms where wms_getcapabilities='".$this->wms_getcapabilities."';";
- $res = db_query($sql);
- $res_count= db_num_rows($res);
-
- $wms_id=0;
- If ($res_count>0){
+ $sql = "Select * from wms where wms_getcapabilities = $1";
+ $v = array($this->wms_getcapabilities);
+ $t = array('s');
+ $res = db_prep_query($sql,$v,$t);
+ $res_count= db_num_rows($res);
+ $wms_id=0;
+ if($res_count>0){
$count=0;
while($row = db_fetch_array($res)){
- $wms_id=$row["wms_id"];
- $count++;
- }
- }
- return $wms_id;
- }
+ $wms_id=$row["wms_id"];
+ $count++;
+ }
+ }
+ return $wms_id;
+}
function displayDBInformation(){
-# include("../../conf/mapbender.conf");
- global $DBSERVER,$DB,$OWNER,$PW;
- $connect = db_connect($DBSERVER,$OWNER,$PW);
echo $this->wms_getcapabilities;
- $sql="Select * from wms where wms_getcapabilities='". $this->wms_getcapabilities ."';";
- $res = db_query($sql);
+ $sql="Select * from wms where wms_getcapabilities = $1";
+ $v = array($this->wms_getcapabilities);
+ $t = array('s');
+ $res = db_prep_query($sql,$v,$t);
$count=0;
while($row = db_fetch_array($res)){
echo "count: ".$count."<br>";
@@ -1216,9 +1209,11 @@
}
echo "----<br> wms_id: ".$wms_id."<br>";
- $sql="Select * from gui_wms where fkey_wms_id =".$wms_id.";";
+ $sql = "Select * from gui_wms where fkey_wms_id = $1";
+ $v = array($wms_id);
+ $t = array('i');
echo "sql: ".$sql." <br>---------<br>";
- $res = db_query($sql);
+ $res = db_prep_query($sql,$v,$t);
$res_count= db_num_rows($res);
echo "result count: ".$res_count." <br>---------<br>";
More information about the Mapbender_commits
mailing list