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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-09-26 01:17:52 -0700 (Thu, 26 Sep 2019)
New Revision: 10268

Modified:
   trunk/mapbender/http/classes/class_syncCkan.php
Log:
Fix for ckan sync - http->https

Modified: trunk/mapbender/http/classes/class_syncCkan.php
===================================================================
--- trunk/mapbender/http/classes/class_syncCkan.php	2019-09-24 06:32:21 UTC (rev 10267)
+++ trunk/mapbender/http/classes/class_syncCkan.php	2019-09-26 08:17:52 UTC (rev 10268)
@@ -1421,7 +1421,7 @@
 			$resourcesArray[$indexResourceArray]->url = $this->mapbenderUrl."/php/mod_showMetadata.php?resource=layer&layout=tabs&redirectToMetadataUrl=1&id=".$metadataId;
 			break;
 		case "metadata":
-			$resourcesArray[$indexResourceArray]->url = $this->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]->url = $this->mapbenderUrl."/php/mod_exportIso19139.php?url=https%3A%2F%2Fwww.geoportal.rlp.de%2Fmapbender%2Fphp%2Fmod_dataISOMetadata.php%3FoutputFormat%3Diso19139%26id%3D".$metadataUuid;
 			break;
 	}
 
@@ -1433,7 +1433,7 @@
 	//build whole json structure
 	$viewJson->resource_id = $metadataUuid."_iso19139";
 	$viewJson->title = "Metadaten HTML";
-	$viewJson->description = "Metadaten HTML";
+	$viewJson->description = "Metadaten HTML - GeoPortal.rlp Metadaten Plugin";
 	$viewJson->view_type = "webpage_view";
 	$viewArray[$indexViewArray]['json'] = json_encode($viewJson);
 	$indexViewArray++;
@@ -1458,7 +1458,7 @@
 	            $viewJson->resource_id = $row['uuid']."_geoportalrlp_mobile";
 	            //$viewJson->id = $row['uuid']."_geoportalrlp_mobile_view";
 	            $viewJson->title = "Integrierte Kartenanzeige";
-	            $viewJson->description = "Integrierte Kartenanzeige ... description";
+	            $viewJson->description = "GeoPortal.rlp Plugin zur Anzeige von Geodaten";
 	            $viewJson->view_type = "webpage_view";
 	            $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
 	            $indexViewArray++;
@@ -1504,7 +1504,7 @@
                     $viewJson->resource_id = $option->serviceUuid;
                     //$viewJson->id = $option->serviceUuid."_view";
                     $viewJson->title = "INSPIRE ATOM Feed Viewer";
-                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer ... description";
+                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer - GeoPortal.rlp Plugin";
                     $viewJson->view_type = "webpage_view";
                     $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
                     $indexViewArray++;
@@ -1522,7 +1522,7 @@
                     $viewJson->resource_id = $option->serviceUuid;
                     //$viewJson->id = $option->serviceUuid."_view";
                     $viewJson->title = "Download (INSPIRE)";
-                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer dataurl ... description";
+                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer dataurl - GeoPortal.rlp Plugin";
                     $viewJson->view_type = "webpage_view";
                     $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
                     $indexViewArray++;
@@ -1540,7 +1540,7 @@
                     $viewJson->resource_id = $option->serviceUuid;
                     //$viewJson->id = $option->serviceUuid."_view";
                     $viewJson->title = "INSPIRE ATOM Feed Viewer";
-                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer wfs ... description";
+                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer - GeoPortal.rlp Plugin";
                     $viewJson->view_type = "webpage_view";
                     $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
                     $indexViewArray++;
@@ -1558,9 +1558,9 @@
         		$numberOfServices++;
     		    } 
     		    if ($numberOfServices == 1 && $wfsVersion == "2.0.0") {
-			    $resourcesArray[$indexResourceArray]->name = "Linked Open Data API (WFS 3.0)";//: ".$metadataObject->title;
+			    $resourcesArray[$indexResourceArray]->name = "Linked Open Data API (OGC API Features)";//: ".$metadataObject->title;
 		            $resourcesArray[$indexResourceArray]->id = $option->serviceUuid."_lod_wfs_api";
-		            $resourcesArray[$indexResourceArray]->description = $metadataObject->title." - Zugriff auf Daten über LinkedOpenData Rest API (WFS 3.0)";
+		            $resourcesArray[$indexResourceArray]->description = $metadataObject->title." - Zugriff auf Daten über LinkedOpenData REST API (OGC API Features)";
 			    //ft id = $option->featureType[0] !
 			    $sql = "SELECT featuretype_name from wfs_featuretype WHERE featuretype_id = $1";
     		    	    $v = array($option->featureType[0]);
@@ -1580,7 +1580,7 @@
 		            $viewJson->resource_id = $option->serviceUuid."_lod_wfs_api";
 		            //$viewJson->id = $option->serviceUuid."_view";
 		            $viewJson->title = "Linked Open Data Zugriff (HTML)";
-		            $viewJson->description = "Integrierter LinkedOpenData HTML Client - GeoPortal.rlp WFS 3.0 Proxy";
+		            $viewJson->description = "Integrierter LinkedOpenData Client - GeoPortal.rlp OGC API Features Proxy";
 		            $viewJson->view_type = "webpage_view";
 		            $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
 		            $indexViewArray++;
@@ -1601,7 +1601,7 @@
                     $viewJson->resource_id = $metadataObject->uuid."_downloadlink";
                     //$viewJson->id = $metadataObject->uuid."_downloadlink"."_view";
                     $viewJson->title = "INSPIRE ATOM Feed Viewer";
-                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer wfs ... description";
+                    $viewJson->description = "Integrierter INSPIRE ATOM Feed Viewer - GeoPortal.rlp Plugin";
                     $viewJson->view_type = "webpage_view";
                     $viewArray[$indexViewArray]['json'] = json_encode($viewJson);
                     $indexViewArray++;