[Mapbender-commits] r2399 - branches/2.5/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Apr 21 06:34:50 EDT 2008
Author: sven
Date: 2008-04-21 06:34:50 -0400 (Mon, 21 Apr 2008)
New Revision: 2399
Modified:
branches/2.5/http/php/mod_layerMetadata.php
Log:
page is redirected to metadata url (if available)
Modified: branches/2.5/http/php/mod_layerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_layerMetadata.php 2008-04-21 10:13:48 UTC (rev 2398)
+++ branches/2.5/http/php/mod_layerMetadata.php 2008-04-21 10:34:50 UTC (rev 2399)
@@ -37,24 +37,21 @@
}
return trim($epsg_list);
}
-?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
- <head>
- <title>Metadaten</title>
- <meta name="description" content="Metadaten" xml:lang="de" />
- <meta name="keywords" content="Metadaten" xml:lang="de" />
- <meta http-equiv="cache-control" content="no-cache">
- <meta http-equiv="pragma" content="no-cache">
- <meta http-equiv="expires" content="0">
- <meta http-equiv="content-language" content="de" />
- <meta http-equiv="content-style-type" content="text/css" />
- <link rel="stylesheet" type="text/css" href="../css/metadata.css" />
-<?php
- echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
- </head>
- <body>
-<?php
+$metadataStr = "";
+$metadataStr .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">' .
+ '<head>' .
+ '<title>Metadaten</title>' .
+ '<meta name="description" content="Metadaten" xml:lang="de" />'.
+ '<meta name="keywords" content="Metadaten" xml:lang="de" />' .
+ '<meta http-equiv="cache-control" content="no-cache">'.
+ '<meta http-equiv="pragma" content="no-cache">'.
+ '<meta http-equiv="expires" content="0">'.
+ '<meta http-equiv="content-language" content="de" />'.
+ '<meta http-equiv="content-style-type" content="text/css" />'.
+ '<link rel="stylesheet" type="text/css" href="../css/metadata.css" />' .
+ '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">' .
+ '</head>'.
+ '<body>';
$layer_id = $_GET['id'];
$wms_getmap = urldecode($_GET['wms']);
$layer_name = urldecode($_GET['name']);
@@ -85,7 +82,7 @@
}
else die("layer not specified!");
$res = db_prep_query($sql,$v,$t);
- echo db_error();
+ $metadataStr .= db_error();
$layer = array();
$row = db_fetch_array($res);
$layer_id = $row['layer_id'];
@@ -128,39 +125,44 @@
$layer['Fax'] = $row['contactfacsimiletelephone'];
$layer['E-Mail'] = $row['contactelectronicmailaddress'];
$layer['Land'] = $row['country'];
+ $metadataUrl = $row['layer_metadataurl'];
- echo "<table >\n";
- $t_a = "\t<tr>\n\t\t<th>\n\t\t\t";
- $t_b = "\n\t\t</th>\n\t\t<td>\n\t\t\t";
- $t_c = "\n\t\t</td>\n\t</tr>\n";
-
- $keys = array_keys($layer);
- for ($j=0; $j<count($layer); $j++) {
- echo $t_a . $keys[$j] . $t_b . display_text($layer[$keys[$j]]) . $t_c;
+ if ($metadataUrl) {
+ header("Location: " . $metadataUrl);
+ }
+ else {
+ $metadataStr .= "<table >\n";
+ $t_a = "\t<tr>\n\t\t<th>\n\t\t\t";
+ $t_b = "\n\t\t</th>\n\t\t<td>\n\t\t\t";
+ $t_c = "\n\t\t</td>\n\t</tr>\n";
+
+ $keys = array_keys($layer);
+ for ($j=0; $j<count($layer); $j++) {
+ $metadataStr .= $t_a . $keys[$j] . $t_b . display_text($layer[$keys[$j]]) . $t_c;
+ }
+
+ if (!$row['layer_pos'] && !$row['layer_parent']) {
+ $wms_id = $row['wms_id'];
+ $sql = "SELECT layer.layer_title, layer.layer_id FROM layer WHERE fkey_wms_id = $1 AND layer_pos <> 0";
+ $v = array($wms_id);
+ $t = array('i');
+ $res = db_prep_query($sql,$v,$t);
+ $i=0;
+ $layer = array();
+ while ($row = db_fetch_array($res)) {
+ $layer[$i] = array();
+ $layer[$i]['Titel'] = $row['layer_title'];
+ $layer[$i]['id'] = $row['layer_id'];
+ $i++;
+ }
+ $metadataStr .= "<tr><th>Ebenen</th><td>";
+ for ($i=0; $i<count($layer); $i++) {
+ if ($i >0) echo ", ";
+ $metadataStr .= "<a href='mod_layerMetadata.php?id=".$layer[$i]['id']."'>" . $layer[$i]['Titel'] . "</a>";
+ }
+ }
+ $metadataStr .= "</td></tr></table>\n";
+ $metadataStr .= '</div></body></html>';
+ echo $metadataStr;
}
-
- if (!$row['layer_pos'] && !$row['layer_parent']) {
- $wms_id = $row['wms_id'];
- $sql = "SELECT layer.layer_title, layer.layer_id FROM layer WHERE fkey_wms_id = $1 AND layer_pos <> 0";
- $v = array($wms_id);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $i=0;
- $layer = array();
- while ($row = db_fetch_array($res)) {
- $layer[$i] = array();
- $layer[$i]['Titel'] = $row['layer_title'];
- $layer[$i]['id'] = $row['layer_id'];
- $i++;
- }
- echo "<tr><th>Ebenen</th><td>";
- for ($i=0; $i<count($layer); $i++) {
- if ($i >0) echo ", ";
- echo "<a href='mod_layerMetadata.php?id=".$layer[$i]['id']."'>" . $layer[$i]['Titel'] . "</a>";
- }
- }
- echo "</td></tr></table>\n";
?>
- </div>
- </body>
-</html>
\ No newline at end of file
More information about the Mapbender_commits
mailing list