[Mapbender-commits] r10178 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-07-04 00:34:36 -0700 (Thu, 04 Jul 2019)
New Revision: 10178

Modified:
   trunk/mapbender/http/classes/class_metadata.php
Log:
Fix for wfs search - thanx to peter.lang from saarland ;-)

Modified: trunk/mapbender/http/classes/class_metadata.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata.php	2019-07-03 09:35:45 UTC (rev 10177)
+++ trunk/mapbender/http/classes/class_metadata.php	2019-07-04 07:34:36 UTC (rev 10178)
@@ -521,7 +521,7 @@
 					$perText = $this->getPermissionValueForWFS($wfsMatrix[$i]['wfs_id'], $wfsMatrix[$i]['wfs_conf_id']);
 					$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->modul[$m]->permission = $perText;
 				}
-				if ($wfsMatrix[$i]['wfs_id'] == $wfsMatrix[$i+1]['wfs_id']){
+				/*if ($wfsMatrix[$i]['wfs_id'] == $wfsMatrix[$i+1]['wfs_id']){
 					$j++; //next record is the same service
 					$l++;	
 				} else {
@@ -531,9 +531,20 @@
 					$m++;
 				} else {
 					$m = 0;
-				}	
+				}*/	
 				//alter ftype to array - not associative array - built new sequence
 				$this->wfsJSON->wfs->srv[$i-$j]->ftype = array_values($this->wfsJSON->wfs->srv[$i-$j]->ftype);
+				if ($wfsMatrix[$i]['wfs_id'] == $wfsMatrix[$i+1]['wfs_id']){
+					$j++; //next record is the same service
+					$l++;	
+				} else {
+					$l = 0;
+				}
+				if ($wfsMatrix[$i]['featuretype_id'] == $wfsMatrix[$i+1]['featuretype_id']){
+					$m++;
+				} else {
+					$m = 0;
+				}
 			}
 			$this->wfsJSON->wfs->srv = array_values($this->wfsJSON->wfs->srv);	
 	}