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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-07-12 00:25:49 -0700 (Thu, 12 Jul 2018)
New Revision: 9921

Modified:
   trunk/mapbender/http/classes/class_wfsToDb.php
Log:
Bugfixes for wfs metadata editor - update via metadata editor don't alter metadata coupling from capabilities any longer.

Modified: trunk/mapbender/http/classes/class_wfsToDb.php
===================================================================
--- trunk/mapbender/http/classes/class_wfsToDb.php	2018-06-21 10:40:37 UTC (rev 9920)
+++ trunk/mapbender/http/classes/class_wfsToDb.php	2018-07-12 07:25:49 UTC (rev 9921)
@@ -194,7 +194,7 @@
 			$sql = "UPDATE wfs SET wfs_version = $1, wfs_name = $2, wfs_getcapabilities = $3, wfs_getcapabilities_doc = $4, ";
 			$sql .= "wfs_upload_url = $5, wfs_describefeaturetype = $6, wfs_getfeature = $7, ";
 			$sql .= "wfs_transaction = $8, wfs_timestamp = $9, wfs_network_access = $10, fkey_mb_group_id = $11, ";
-			$sql .=  "wfs_max_features = $12, inspire_annual_requests = $13, wfs_username = $14, wfs_password = $15, wfs_auth_type = $16, wfs_license_source_note = $18";
+			$sql .=  "wfs_max_features = $12, inspire_annual_requests = $13, wfs_username = $14, wfs_password = $15, wfs_auth_type = $16, wfs_license_source_note = $18 ";
 			$sql .= "WHERE wfs_id = $17";
 			$v = array(
 				$aWfs->getVersion(),
@@ -216,7 +216,6 @@
 				$aWfs->id,
 				$aWfs->wfs_license_source_note
 			);
-			
 			$t = array('s','s','s','s','s','s','s','s','s','i','i','i','i','s','s','s','i','s');
 			$e = new mb_notice("class_wfsToDb.php: UPDATING WFS " . $aWfs->id);
 			$res = db_prep_query($sql, $v, $t);
@@ -226,10 +225,10 @@
 				return false;
 			}
 		} else {
-			$e = new mb_notice("classes/class_wfsToDb.php: - function update - from metadata editor");
+			$e = new mb_exception("classes/class_wfsToDb.php: - function update - from metadata editor");
 			//only update wfs elements that are given by metadata editor - noc technical things!
 			$sql = "UPDATE wfs SET wfs_timestamp = $1, wfs_network_access = $2, fkey_mb_group_id = $3, ";
-			$sql .=  "wfs_max_features = $4, inspire_annual_requests = $5, wfs_license_source_note = $7";
+			$sql .=  "wfs_max_features = $4, inspire_annual_requests = $5, wfs_license_source_note = $7 ";
 			$sql .= "WHERE wfs_id = $6";
 			$v = array(
 				strtotime("now"),
@@ -302,6 +301,8 @@
 		}
 
 		// delete all metadata relations which come capabilities
+
+if (!$updateMetadataOnly) {
 		$sql = "DELETE FROM ows_relation_metadata WHERE fkey_featuretype_id IN " ;
 		$sql .= "(SELECT featuretype_id FROM wfs_featuretype WHERE fkey_wfs_id = $1)";
 		$sql .= " AND ows_relation_metadata.relation_type = 'capabilities'";
@@ -309,6 +310,8 @@
 		$t = array("i");
 		$res = db_prep_query($sql,$v,$t);
 
+
+
 		// delete and refill WFS operations
 		$sql = "DELETE FROM wfs_operation WHERE fkey_wfs_id = $1 ";
 		$v = array($aWfs->id);
@@ -324,7 +327,7 @@
 				return false;
 			}
 		}
-	
+}	
 		// delete and refill WFS outputFormats
 		$sql = "DELETE FROM wfs_output_formats WHERE fkey_wfs_id = $1 ";
 		$v = array($aWfs->id);
@@ -1492,8 +1495,10 @@
 			$t = array('i');
 			$res = db_prep_query($sql,$v,$t);*/
 			// insert feature type MetadataURL from caps
+			//$e = new mb_exception("metadataUrls: ".count($aWfsFeatureType->metadataUrlArray));
 			for ($i = 0; $i < count($aWfsFeatureType->metadataUrlArray); $i++) {
 				$metadataUrl = $aWfsFeatureType->metadataUrlArray[$i];
+				//$e = new mb_exception("metadataUrl: ".json_encode($aWfsFeatureType->metadataUrlArray[$i]));
 				if (!WfsToDb::insertFeatureTypeMetadataUrl($aWfsFeatureType->id, $metadataUrl)) {
 					return false;	
 				}