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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-08-08 00:07:39 -0700 (Thu, 08 Aug 2019)
New Revision: 10201

Modified:
   trunk/mapbender/http/php/mod_linkedDataProxy.php
Log:
Fix filter

Modified: trunk/mapbender/http/php/mod_linkedDataProxy.php
===================================================================
--- trunk/mapbender/http/php/mod_linkedDataProxy.php	2019-08-08 07:02:34 UTC (rev 10200)
+++ trunk/mapbender/http/php/mod_linkedDataProxy.php	2019-08-08 07:07:39 UTC (rev 10201)
@@ -225,9 +225,9 @@
 if (!isset($wfsid) || $wfsid == "") {
     //list all public available wfs which are classified as opendata!
     $returnObject->service = array();
-    //$sql = "SELECT * FROM (SELECT wfs_id, wfs_version, wfs_abstract, wfs_title, wfs_owsproxy, fkey_termsofuse_id, wfs_getcapabilities, providername, fees FROM wfs INNER JOIN wfs_termsofuse ON wfs_id = fkey_wfs_id) AS wfs_tou INNER JOIN termsofuse ON fkey_termsofuse_id = termsofuse_id WHERE isopen = 1";
+    $sql = "SELECT * FROM (SELECT wfs_id, wfs_version, wfs_abstract, wfs_title, wfs_owsproxy, fkey_termsofuse_id, wfs_getcapabilities, providername, fees FROM wfs INNER JOIN wfs_termsofuse ON wfs_id = fkey_wfs_id) AS wfs_tou INNER JOIN termsofuse ON fkey_termsofuse_id = termsofuse_id WHERE isopen = 1";
     //all wfs - without open filter!
-    $sql = "SELECT wfs_id, wfs_abstract, wfs_version, wfs_title, wfs_owsproxy, wfs_getcapabilities, providername, fees FROM wfs";
+    //$sql = "SELECT wfs_id, wfs_abstract, wfs_version, wfs_title, wfs_owsproxy, wfs_getcapabilities, providername, fees FROM wfs";
     $v = array();
     $t = array();
     $res = db_prep_query($sql, $v, $t);	
@@ -275,16 +275,17 @@
             $returnObject->providerHomepage = "http://www.geoportal.rlp.de/";
 	    $returnObject->license = $wfs->fees;
 
-	//get contraints
-        $constraints = new OwsConstraints();
-        $constraints->languageCode = "de";
-        $constraints->asTable = true;
-        $constraints->id = $wfsid;
-        $constraints->type = "wfs";
-        $constraints->returnDirect = false;
-        $tou = $constraints->getDisclaimer();//TODO encoding problems occur!
-	//$returnObject->license = $tou; - generate license info in json for json format!!!!!
-//
+	    //get contraints
+	    $constraints = new OwsConstraints();
+	    $constraints->languageCode = "de";
+	    $constraints->asTable = true;
+	    $constraints->id = $wfsid;
+	    $constraints->type = "wfs";
+	    $constraints->returnDirect = false;
+	    $tou = $constraints->getDisclaimer();//TODO encoding problems occur!
+	    if ($f == "html") {
+		$returnObject->license = $tou; //- generate license info in json for json format!!!!!
+	    }
 	    $returnObject->accessUrl = $wfs->getCapabilities;
 	    //
 	    $returnObject->links = array();