[Mapbender-commits] r8346 - in trunk/mapbender: http/php resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2012-05-10 21:26:35 -0700 (Thu, 10 May 2012)
New Revision: 8346

Modified:
   trunk/mapbender/http/php/mod_dataLinkDownloadISOMetadata.php
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql
Log:
Adoptions for inspire.

Modified: trunk/mapbender/http/php/mod_dataLinkDownloadISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataLinkDownloadISOMetadata.php	2012-05-11 04:25:13 UTC (rev 8345)
+++ trunk/mapbender/http/php/mod_dataLinkDownloadISOMetadata.php	2012-05-11 04:26:35 UTC (rev 8346)
@@ -73,7 +73,6 @@
 select * from (select * from (select * from (select * from (select * from (select * from layer inner join ows_relation_metadata on layer.layer_id = ows_relation_metadata.fkey_layer_id where layer.layer_id = $1) as layer_relation inner join mb_metadata on layer_relation.fkey_metadata_id = mb_metadata.metadata_id) as layer_metadata inner join ows_relation_data on ows_relation_data.fkey_layer_id = layer_metadata.layer_id) as layer_relation_data inner join datalink on layer_relation_data.fkey_datalink_id = datalink.datalink_id) as layer_data inner join wms on layer_data.fkey_wms_id = wms.wms_id)  as layer_wms, layer_epsg where layer_wms.layer_id = layer_epsg.fkey_layer_id and layer_epsg.epsg = 'EPSG:4326';  
 
 SQL;
-
 	$v = array((integer)$recordId);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);
@@ -131,8 +130,8 @@
 	//generate identifier part 
 	$identifier = $iso19139->createElement("gmd:fileIdentifier");
 	$identifierString = $iso19139->createElement("gco:CharacterString");
-	if (isset($mapbenderMetadata['uuid'])) {
-		$identifierText = $iso19139->createTextNode($mapbenderMetadata['uuid']);//TODO use a special uuid for the concret download service
+	if (isset($mapbenderMetadata['datalink_randomid'])) {
+		$identifierText = $iso19139->createTextNode($mapbenderMetadata['datalink_randomid']);//TODO use a special uuid for the concret download service
 	}
 	else {
 		$identifierText = $iso19139->createTextNode("no id found");
@@ -251,7 +250,7 @@
 	$dateStamp->appendChild($mddate);
 	$dateStamp=$MD_Metadata->appendChild($dateStamp);
 
-	//standard definition - for wms everytime the same ;-)
+	//standard definition - for ows everytime the same ;-) but for feeds?
 	$metadataStandardName = $iso19139->createElement("gmd:metadataStandardName");
 	$metadataStandardVersion = $iso19139->createElement("gmd:metadataStandardVersion");
 	$metadataStandardNameText = $iso19139->createElement("gco:CharacterString");

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql	2012-05-11 04:25:13 UTC (rev 8345)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.2_to_2.7.3_pgsql_UTF-8.sql	2012-05-11 04:26:35 UTC (rev 8346)
@@ -413,4 +413,5 @@
 
 ALTER TABLE wfs_featuretype ADD COLUMN featuretype_latlon_bbox character varying;
 
+ALTER TABLE datalink RENAME column randomid TO datalink_randomid;