[Mapbender-commits] r9732 - in trunk/mapbender: http/php http_auth/http owsproxy/http

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-04-04 06:44:41 -0700 (Tue, 04 Apr 2017)
New Revision: 9732

Modified:
   trunk/mapbender/http/php/mod_UsageShow.php
   trunk/mapbender/http_auth/http/index.php
   trunk/mapbender/owsproxy/http/index.php
Log:
Pulling the number of served features for wfs >= 2.0 from numberReturned attribute of wfs:FeatureCollection for logging

Modified: trunk/mapbender/http/php/mod_UsageShow.php
===================================================================
--- trunk/mapbender/http/php/mod_UsageShow.php	2017-04-03 15:18:20 UTC (rev 9731)
+++ trunk/mapbender/http/php/mod_UsageShow.php	2017-04-04 13:44:41 UTC (rev 9732)
@@ -141,7 +141,7 @@
 $sql = "SELECT mb_user_id, mb_user_name, mb_user_email, mb_user_phone from mb_user ";
 $sql .= " WHERE mb_user_id = $1";
 $v = array($_REQUEST['userid']);
-$t = array('i','i');
+$t = array('i');
 $res = db_prep_query($sql,$v,$t);
 $row = db_fetch_array($res);
 

Modified: trunk/mapbender/http_auth/http/index.php
===================================================================
--- trunk/mapbender/http_auth/http/index.php	2017-04-03 15:18:20 UTC (rev 9731)
+++ trunk/mapbender/http_auth/http/index.php	2017-04-04 13:44:41 UTC (rev 9732)
@@ -1313,30 +1313,37 @@
 	if ($featureCollectionXml !== false) {
 		//$featureCollectionXml->registerXPathNamespace("gmd", "http://www.isotc211.org/2005/gmd");
 		$featureCollectionXml->registerXPathNamespace("ogc", "http://www.opengis.net/ogc");
-		$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs");
+		if ($reqParams["version"] == '2.0.0' || $reqParams["version"] == '2.0.2') {
+			$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs/2.0");
+		} else {
+			$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs");
+		}
 		$featureCollectionXml->registerXPathNamespace("gco", "http://www.isotc211.org/2005/gco");
 		$featureCollectionXml->registerXPathNamespace("gml", "http://www.opengis.net/gml");
 		$featureCollectionXml->registerXPathNamespace("xlink", "http://www.w3.org/1999/xlink");
 		$featureCollectionXml->registerXPathNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
 		$featureCollectionXml->registerXPathNamespace("default", "");
         	preg_match('@version=(?P<version>\d\.\d\.\d)&@i', strtolower($url), $version);
-       		if (!$version['version']) {
-			$e = new mb_notice("owsproxy/http/index.php: No version for wfs request given in url!");
+       		if (!$reqParams['version']) {
+			$e = new mb_notice("owsproxy/http/index.php: No version for wfs request given in reqParams!");
 		}
-		switch ($version['version']) {
-			//case "1.0.0":
-			default:
+		switch ($reqParams['version']) {
+			case "1.0.0":
 				//get # of features from counting features
 				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/gml:featureMember');
 				$numberOfFeatures = count($numberOfFeatures);
-				$e = new mb_notice("owsproxy/index.php: wfs version ".$version[1]." used");
-			break;
-			/*case "1.1.0":
+				break;
+			case "1.1.0":
+				//get # of features from counting features
+				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/gml:featureMember');
+				$numberOfFeatures = count($numberOfFeatures);
+				break;
+			//for wfs 2.0 - don't count features
+			default:
 				//get # of features from attribut
-				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/@numberOfFeatures');
+				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/@numberReturned');
 				$numberOfFeatures = $numberOfFeatures[0];
-				$e = new mb_notice("owsproxy/index.php: wfs version ".$version[1]." used");
-			break;*/
+				break;
 		}
 		$endTime = microtime();
 		$e = new mb_notice("owsproxy/http/index.php: ".$numberOfFeatures." delivered features from wfs.");

Modified: trunk/mapbender/owsproxy/http/index.php
===================================================================
--- trunk/mapbender/owsproxy/http/index.php	2017-04-03 15:18:20 UTC (rev 9731)
+++ trunk/mapbender/owsproxy/http/index.php	2017-04-04 13:44:41 UTC (rev 9732)
@@ -1275,30 +1275,37 @@
 	if ($featureCollectionXml !== false) {
 		//$featureCollectionXml->registerXPathNamespace("gmd", "http://www.isotc211.org/2005/gmd");
 		$featureCollectionXml->registerXPathNamespace("ogc", "http://www.opengis.net/ogc");
-		$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs");
+		if ($reqParams["version"] == '2.0.0' || $reqParams["version"] == '2.0.2') {
+			$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs/2.0");
+		} else {
+			$featureCollectionXml->registerXPathNamespace("wfs", "http://www.opengis.net/wfs");
+		}
 		$featureCollectionXml->registerXPathNamespace("gco", "http://www.isotc211.org/2005/gco");
 		$featureCollectionXml->registerXPathNamespace("gml", "http://www.opengis.net/gml");
 		$featureCollectionXml->registerXPathNamespace("xlink", "http://www.w3.org/1999/xlink");
 		$featureCollectionXml->registerXPathNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
 		$featureCollectionXml->registerXPathNamespace("default", "");
         	preg_match('@version=(?P<version>\d\.\d\.\d)&@i', strtolower($url), $version);
-       		if (!$version['version']) {
-			$e = new mb_notice("owsproxy/http/index.php: No version for wfs request given in url!");
+       		if (!$reqParams['version']) {
+			$e = new mb_notice("owsproxy/http/index.php: No version for wfs request given in reqParams!");
 		}
-		switch ($version['version']) {
-			//case "1.0.0":
-			default:
+		switch ($reqParams['version']) {
+			case "1.0.0":
 				//get # of features from counting features
 				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/gml:featureMember');
 				$numberOfFeatures = count($numberOfFeatures);
-				$e = new mb_notice("owsproxy/index.php: wfs version ".$version[1]." used");
-			break;
-			/*case "1.1.0":
+				break;
+			case "1.1.0":
+				//get # of features from counting features
+				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/gml:featureMember');
+				$numberOfFeatures = count($numberOfFeatures);
+				break;
+			//for wfs 2.0 - don't count features
+			default:
 				//get # of features from attribut
-				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/@numberOfFeatures');
+				$numberOfFeatures = $featureCollectionXml->xpath('//wfs:FeatureCollection/@numberReturned');
 				$numberOfFeatures = $numberOfFeatures[0];
-				$e = new mb_notice("owsproxy/index.php: wfs version ".$version[1]." used");
-			break;*/
+				break;
 		}
 		$endTime = microtime();
 		$e = new mb_notice("owsproxy/http/index.php: ".$numberOfFeatures." delivered features from wfs.");