[Mapbender-commits] r9764 - trunk/mapbender/http/classes
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Aug 21 08:25:23 PDT 2017
Author: armin11
Date: 2017-08-21 08:25:23 -0700 (Mon, 21 Aug 2017)
New Revision: 9764
Modified:
trunk/mapbender/http/classes/class_syncCkan.php
Log:
Fix description for ckan export handler
Modified: trunk/mapbender/http/classes/class_syncCkan.php
===================================================================
--- trunk/mapbender/http/classes/class_syncCkan.php 2017-08-18 12:25:30 UTC (rev 9763)
+++ trunk/mapbender/http/classes/class_syncCkan.php 2017-08-21 15:25:23 UTC (rev 9764)
@@ -460,11 +460,11 @@
//pull all relevant information from mapbender database - first pull the resources which are owned by the corresponding group!
//only use metadata for which real licenses are defined !!!!!! - what should be done with the other metadata?- DO a left join!!!
if ($organization['is_primary_group']) {
- $sql = "SELECT *, f_get_coupled_resources(metadata_id) from mb_metadata LEFT OUTER JOIN md_termsofuse ON mb_metadata.metadata_id = md_termsofuse.fkey_metadata_id WHERE fkey_mb_user_id = $1 AND (fkey_mb_group_id is null OR fkey_mb_group_id = 0) AND export2csw IS true";
+ $sql = "SELECT *, f_get_coupled_resources(metadata_id) from mb_metadata JOIN md_termsofuse ON mb_metadata.metadata_id = md_termsofuse.fkey_metadata_id WHERE fkey_mb_user_id = $1 AND (fkey_mb_group_id is null OR fkey_mb_group_id = 0) AND export2csw IS true";
$v = array($this->mapbenderUserId);
$t = array('i');
} else {
- $sql = "SELECT *, f_get_coupled_resources(metadata_id) from mb_metadata LEFT OUTER JOIN md_termsofuse ON mb_metadata.metadata_id = md_termsofuse.fkey_metadata_id WHERE fkey_mb_group_id = $1 AND export2csw IS true";
+ $sql = "SELECT *, f_get_coupled_resources(metadata_id) from mb_metadata JOIN md_termsofuse ON mb_metadata.metadata_id = md_termsofuse.fkey_metadata_id WHERE fkey_mb_group_id = $1 AND export2csw IS true";
$v = array($organization['id']);
$t = array('i');
}
@@ -953,11 +953,11 @@
if ($res) {
while($row = db_fetch_array($res)) {
//generate "Kartenviewer intern" resource
- $resourcesArray[$indexResourceArray]->name = "Integrierte Kartenanzeige";//: ".$row['layer_title'];
+ $resourcesArray[$indexResourceArray]->name = "Onlinekarte";//: ".$row['layer_title'];
$resourcesArray[$indexResourceArray]->id = $row['uuid']."_geoportalrlp_mobile";
- $resourcesArray[$indexResourceArray]->description = "Anzeige des Kartenlayers ".$row['layer_title']." im integrierten Kartenviewer (GeoPortal.rlp mobile API).";
+ $resourcesArray[$indexResourceArray]->description = "Ebene: ".$row['layer_title']." - Vorschau im integrierten Kartenviewer";
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/extensions/mobilemap/map.php?layerid=".$row['layer_id'];
- $resourcesArray[$indexResourceArray]->format = "Kartenviewer inline";
+ $resourcesArray[$indexResourceArray]->format = "Karte";
//$resourcesArray[$indexResourceArray]->res_transparency_document_change_classification = "unaltered";
$indexResourceArray++;
//views to generate
@@ -972,19 +972,37 @@
$viewArray[$indexViewArray]['json'] = json_encode($viewJson);
$indexViewArray++;
//generate "Kartenviewer extern" resource
- $resourcesArray[$indexResourceArray]->name = "Anzeige im GeoPortal.rlp";//: ".$row['layer_title'];
+ $resourcesArray[$indexResourceArray]->name = "GeoPortal.rlp";//: ".$row['layer_title'];
$resourcesArray[$indexResourceArray]->id = $row['uuid']."_geoportalrlp";
- $resourcesArray[$indexResourceArray]->description = "Anzeige des Kartenlayers ".$row['layer_title']." im orginären System (GeoPortal.rlp).";
+ $resourcesArray[$indexResourceArray]->description = "Ebene: ".$row['layer_title']." - Anzeige im GeoPortal.rlp.";
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/../portal/karten.html?LAYER[zoom]=1&LAYER[id]=".$row['layer_id'];
- $resourcesArray[$indexResourceArray]->format = "Kartenviewer extern";
+ $resourcesArray[$indexResourceArray]->format = "Webanwendung";
$indexResourceArray++;
//generate wms capabilities resource
- $resourcesArray[$indexResourceArray]->name = "WMS Capabilities";// für ".$row['layer_title'];
+ $resourcesArray[$indexResourceArray]->name = "WMS Schnittstelle";// für ".$row['layer_title'];
$resourcesArray[$indexResourceArray]->id = $row['uuid']."_capabilities";
- $resourcesArray[$indexResourceArray]->description = "Kartenebene: ".$row['layer_title'];
+ $resourcesArray[$indexResourceArray]->description = "Ebene: ".$row['layer_title'];
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/php/wms.php?layer_id=".$row['layer_id']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";
$resourcesArray[$indexResourceArray]->format = "WMS";
$indexResourceArray++;
+ //generate html metadata
+ $resourcesArray[$indexResourceArray]->name = "Geo-Metadaten";// für ".$row['layer_title'];
+ $resourcesArray[$indexResourceArray]->id = $metadataUuid."_iso19139";
+ $resourcesArray[$indexResourceArray]->description = $row['layer_title']." - Anzeige der originären Metadaten";
+ $resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/php/mod_exportIso19139.php?url=http%3A%2F%2Fwww.geoportal.rlp.de%2Fmapbender%2Fphp%2Fmod_dataISOMetadata.php%3FoutputFormat%3Diso19139%26id%3D".$metadataUuid;
+ $resourcesArray[$indexResourceArray]->format = "HTML";
+ $indexResourceArray++;
+//views to generate
+ $viewArray[$indexViewArray]['view_type'] = "webpage_view";
+ $viewArray[$indexViewArray]['resource_id'] = $metadataUuid."_iso19139";
+ //build whole json structure
+ $viewJson->resource_id = $metadataUuid."_iso19139";
+ //$viewJson->id = $row['uuid']."_geoportalrlp_mobile_view";
+ $viewJson->title = "Metadaten HTML";
+ $viewJson->description = "Geo-Metadaten HTML";
+ $viewJson->view_type = "webpage_view";
+ $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
+ $indexViewArray++;
}
}
}
@@ -1017,29 +1035,29 @@
$indexViewArray++;
break;
case "wmslayerdataurl":
- $resourcesArray[$indexResourceArray]->name = "INSPIRE ATOM Feed Viewer";//: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->name = "Download (INSPIRE)";//: ".$metadataObject->title;
$resourcesArray[$indexResourceArray]->id = $option->serviceUuid;
- $resourcesArray[$indexResourceArray]->description = "Download von verlinkten Daten über INSPIRE ATOM Feed: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->description = $metadataObject->title." - Download von verlinkten Daten über INSPIRE ATOM Feed";
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/plugins/mb_downloadFeedClient.php?url=".urlencode($mapbenderUrl."/php/mod_inspireDownloadFeed.php?id=".$metadataUuid."&type=SERVICE&generateFrom=dataurl&layerid=".$option->resourceId);
- $resourcesArray[$indexResourceArray]->format = "ATOM Viewer";
+ $resourcesArray[$indexResourceArray]->format = "Diverse";
//$resourcesArray[$indexResourceArray]->res_transparency_document_change_classification = "unaltered";
$indexResourceArray++;
//views to generate
//build whole json structure
$viewJson->resource_id = $option->serviceUuid;
//$viewJson->id = $option->serviceUuid."_view";
- $viewJson->title = "INSPIRE ATOM Feed Viewer";
+ $viewJson->title = "Download (INSPIRE)";
$viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer dataurl ... description";
$viewJson->view_type = "webpage_view";
$viewArray[$indexViewArray]['json'] = json_encode($viewJson);
$indexViewArray++;
break;
case "wfsrequest":
- $resourcesArray[$indexResourceArray]->name = "INSPIRE ATOM Feed Viewer";//: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->name = "Download (INSPIRE)";//: ".$metadataObject->title;
$resourcesArray[$indexResourceArray]->id = $option->serviceUuid;
- $resourcesArray[$indexResourceArray]->description = "Download von Vektordaten (wfs-basiert) über INSPIRE ATOM Feed: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->description = $metadataObject->title." - Download von Vektordaten (wfs-basiert) über INSPIRE ATOM Feed";
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/plugins/mb_downloadFeedClient.php?url=".urlencode($mapbenderUrl."/php/mod_inspireDownloadFeed.php?id=".$metadataUuid."&type=SERVICE&generateFrom=wfs&wfsid=".$option->serviceId);
- $resourcesArray[$indexResourceArray]->format = "ATOM Viewer";
+ $resourcesArray[$indexResourceArray]->format = "Diverse";
//$resourcesArray[$indexResourceArray]->res_transparency_document_change_classification = "unaltered";
$indexResourceArray++;
//views to generate
@@ -1053,11 +1071,11 @@
$indexViewArray++;
break;
case "downloadlink":
- $resourcesArray[$indexResourceArray]->name = "INSPIRE ATOM Feed Viewer";//: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->name = "Download (INSPIRE)";//: ".$metadataObject->title;
$resourcesArray[$indexResourceArray]->id = $metadataObject->uuid."_downloadlink"; //TODO - no uuid for service known in this case
- $resourcesArray[$indexResourceArray]->description = "Download von verlinkten Daten über INSPIRE ATOM Feed: ".$metadataObject->title;
+ $resourcesArray[$indexResourceArray]->description = $metadataObject->title." - Download von verlinkten Daten über INSPIRE ATOM Feed";
$resourcesArray[$indexResourceArray]->url = $mapbenderUrl."/plugins/mb_downloadFeedClient.php?url=".urlencode($mapbenderUrl."/php/mod_inspireDownloadFeed.php?id=".$metadataUuid."&type=SERVICE&generateFrom=metadata");
- $resourcesArray[$indexResourceArray]->format = "ATOM Viewer";
+ $resourcesArray[$indexResourceArray]->format = "Diverse";
//$resourcesArray[$indexResourceArray]->res_transparency_document_change_classification = "unaltered";
$indexResourceArray++;
//views to generate
More information about the Mapbender_commits
mailing list