[Mapbender-commits] r9117 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-10-29 05:15:20 -0700 (Wed, 29 Oct 2014)
New Revision: 9117

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Bugfix to pass GDI-DE testsuite

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-10-28 14:01:41 UTC (rev 9116)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-10-29 12:15:20 UTC (rev 9117)
@@ -462,7 +462,7 @@
 	$feed->setAttribute("xsi:schemaLocation", "http://a9.com/-/spec/opensearch/1.1/ OpenSearch.xsd");
 	//ShortName
 	$osShortName = $feedDoc->createElement("ShortName");
-	$osShortNameText = $feedDoc->createTextNode("INSPIRE Download Service.");
+	$osShortNameText = $feedDoc->createTextNode("INSPIRE DLS");
 	$osShortName->appendChild($osShortNameText);
 	$feed->appendChild($osShortName);
 	//Description
@@ -539,6 +539,7 @@
 	//example
 	//$mapbenderMetadata[$m]->datasetid_codespace."#".$mapbenderMetadata[$m]->datasetid;
 	$osQuery = $feedDoc->createElement("Query");
+	$osQuery->setAttribute("role", "example");
 	$osQuery->setAttribute("inspire_dls:spatial_dataset_identifier_namespace", $mapbenderMetadata[$m]->datasetid_codespace);
 	$osQuery->setAttribute("inspire_dls:spatial_dataset_identifier_code", $mapbenderMetadata[$m]->datasetid);
 	$osQuery->setAttribute("inspire_dls:crs", "EPSG:".$epsgId);
@@ -586,7 +587,7 @@
 		break;
 		case "metadata":
 			$sql = <<<SQL
-select 'metadata' as origin,mb_metadata.metadata_id, mb_metadata.uuid as metadata_uuid, mb_metadata.format,mb_metadata.title as metadata_title, mb_metadata.abstract as metadata_abstract, box2d(mb_metadata.the_geom) as metadata_bbox, mb_metadata.bounding_geom as polygon,  mb_metadata.ref_system as metadata_ref_system, mb_metadata.datasetid, mb_metadata.spatial_res_type, mb_metadata.spatial_res_value, mb_metadata.datasetid_codespace, mb_metadata.fkey_mb_user_id,  mb_metadata.lastchanged as md_timestamp, box2d(the_geom) as bbox2d, datalinks FROM mb_metadata where uuid = $1 and inspire_download = 1;
+select 'metadata' as origin,mb_metadata.metadata_id, mb_metadata.uuid as metadata_uuid, mb_metadata.format,mb_metadata.title as metadata_title, mb_metadata.abstract as metadata_abstract, box2d(mb_metadata.the_geom) as metadata_bbox, mb_metadata.bounding_geom as polygon,  mb_metadata.ref_system as metadata_ref_system, mb_metadata.datasetid, mb_metadata.spatial_res_type, mb_metadata.spatial_res_value, mb_metadata.datasetid_codespace, mb_metadata.fkey_mb_user_id,  mb_metadata.lastchanged as md_timestamp, box2d(the_geom) as bbox2d, datalinks, transfer_size FROM mb_metadata where uuid = $1 and inspire_download = 1;
 SQL;
 		break;
 		case "all":
@@ -1461,6 +1462,9 @@
 					$feedEntryLink->setAttribute("type", $furtherLinkType);
 					$feedEntryLink->setAttribute("hreflang", "de");
 					$feedEntryLink->setAttribute("title", $furtherLinkTitle);
+					if (isset($mapbenderMetadata[$i]->transfer_size) && $mapbenderMetadata[$i]->transfer_size !== '') {
+						$feedEntryLink->setAttribute("length", ceil(((double)$mapbenderMetadata[$i]->transfer_size)*1000000));
+					}
 					//$feedEntryLink->setAttribute("bbox", $newBox);
 					$feedEntry->appendChild($feedEntryLink);	
 				break;
@@ -1753,6 +1757,7 @@
 		$mapbenderMetadata[$indexMapbenderMetadata]->metadata_ref_system = $row['metadata_ref_system'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->format = $row['format'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->datalinks = $row['datalinks'];
+		$mapbenderMetadata[$indexMapbenderMetadata]->transfer_size = $row['transfer_size'];
 //		$mapbenderMetadata[$indexMapbenderMetadata]->datalink_format = $row['datalink_format'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->format = $row['format'];
 		$mapbenderMetadata[$indexMapbenderMetadata]->md_timestamp = $row['md_timestamp'];