[Mapbender-commits] r7422 - in trunk/mapbender/http: classes
geoportal php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jan 5 05:46:57 EST 2011
Author: armin11
Date: 2011-01-05 02:46:57 -0800 (Wed, 05 Jan 2011)
New Revision: 7422
Added:
trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php
Modified:
trunk/mapbender/http/classes/class_metadata_new.php
trunk/mapbender/http/php/mod_callMetadata.php
trunk/mapbender/http/php/tagCloud.php
Log:
Bugfixes for search and modules for loading wfs-confs dynamically
Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php 2011-01-05 09:42:41 UTC (rev 7421)
+++ trunk/mapbender/http/classes/class_metadata_new.php 2011-01-05 10:46:57 UTC (rev 7422)
@@ -84,16 +84,16 @@
$this->searchURL = $searchURL;
$this->hostName = $hostName;
$this->orderBy = $orderBy;
- //definitions for tags
+ //definitions for generating tagClouds
$this->maxObjects = 15;
$this->maxFontSize = 30;
$this->maxWeight = 0;
$this->scale = 'linear';
+ $this->minFontSize = 10;
-
$this->tempFolder = TMPDIR; //TODO define another path - maybe the one which is given in mapbender.conf
if ($this->outputFormat == 'json'){
$this->json = new Mapbender_JSON;
@@ -1059,7 +1059,7 @@
'title' => $this->keywordTitle,
'tags' => array()
);
- $this->inc = $this->maxFontSize/$this->maxObjects;//maybe 10 or 5 or ...
+ $this->inc = ($this->maxFontSize-$this->minFontSize)/$this->maxObjects;//maybe 10 or 5 or ...
//generate the list of category counts
$sqlCat = array();
//generate the sql for the keyword count
@@ -1081,26 +1081,21 @@
for ($j = 0; $j < count($keywordCounts); $j++) {
if ($this->scale == 'linear'){
//order in a linear scale desc
- $keywordCounts[$j]['count'] = $this->maxFontSize-($j*$this->inc);
+ $keywordCounts[$j]['count'] = $this->maxFontSize-($j*$this->inc);
} else {
//set weight prop to count
$keywordCounts[$j]['count'] = $keywordCounts[$j]['count']*$this->maxFontSize/$this->maxWeight;
}
+ /*if ($scale == 'linear'){
+ $tags[$i]['weight'] = $maxFontSize-($i*$inc);
+ } else {
+ $tags[$i]['weight'] = $tags[$i]['weight']*$maxFontSize/$maxWeight;
+ }*/
}
- //$this->maxWeight = $keywordCounts[0]['count'];
shuffle($keywordCounts);
for ($j = 0; $j < count($keywordCounts); $j++) {
$this->keyJSON->tagCloud->tags[$j]->title = $keywordCounts[$j]['keyword'];
- //generate the weight:
- //if ($this->scale == 'linear'){
- //order in a linear scale desc
- $this->keyJSON->tagCloud->tags[$j]->weight = $keywordCounts[$j]['count'];
- //} else {
- //set weight prop to count
- // $this->keyJSON->tagCloud->tags[$j]->weight = $keywordCounts[$j]['count']*$this->maxFontSize/$this->maxWeight;
- //}
- //$this->keyJSON->tags[$j]->weight = $keywordCounts[$j]['count'];
-
+ $this->keyJSON->tagCloud->tags[$j]->weight = $keywordCounts[$j]['count'];
$paramValue = $this->getValueForParam('searchText', $this->searchURL);
//delete resources part from query and set some new one
$searchUrlKeywords = $this->delTotalFromQuery('searchResources',$this->searchURL);
@@ -1108,7 +1103,7 @@
$searchUrlKeywords .= '&searchResources='.$this->searchResources;
$e = new mb_exception("class_metadata_new: value ".$paramValue." for searchText param found");
$paramValue = urldecode($paramValue);
- if ($paramValue == false) {
+ if ($paramValue == false || $paramValue == '*') {
$this->keyJSON->tagCloud->tags[$j]->url = $searchUrlKeywords."&searchText=".$keywordCounts[$j]['keyword'];
} else {
$this->keyJSON->tagCloud->tags[$j]->url = $this->addToQuery('searchText',$searchUrlKeywords,$keywordCounts[$j]['keyword'],$paramValue);
Added: trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php (rev 0)
+++ trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php 2011-01-05 10:46:57 UTC (rev 7422)
@@ -0,0 +1,368 @@
+<?php
+# $Id: mod_wfs_gazetteer_client.php 1414 2008-01-17 08:55:06Z diewald $
+# maintained by http://www.mapbender.org/index.php/User:Verena Diewald
+# http://www.mapbender.org/index.php/WFS_gazetteer
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+session_start();
+$gui_id = $_SESSION["mb_user_gui"];
+$e_target = $_REQUEST["e_target"];
+$e_id_css = $_REQUEST["e_id_css"];
+
+require(dirname(__FILE__)."/../../conf/mapbender.conf");
+
+$con = db_connect($DBSERVER,$OWNER,$PW);
+db_select_db($DB,$con);
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset='<?php echo CHARSET;?>'">
+<title>mod_wfs_gazetteer</title>
+
+<?php
+include '../include/dyn_css.php';
+?>
+<script type="text/javascript">
+<?php
+ echo "var targetString = '" . $e_target . "';";
+ echo "var wfsConfIdString = '" . $wfsConfIdString . "';";
+?>
+
+// Element var maxHighlightedPoints
+try{
+ if (maxHighlightedPoints){
+ maxHighlightedPoints = Number(maxHighlightedPoints);
+
+ if (isNaN(maxHighlightedPoints)) {
+ var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints must be a number.");
+ }
+ }
+}
+catch(e){
+ maxHighlightedPoints = 0;
+ var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
+}
+
+
+// Helper functions
+/**
+ * Deletes all nodes under a specified node.
+ */
+function removeChildNodes(node) {
+ try {
+ while (node.childNodes.length > 0) {
+ var childNode = node.firstChild;
+ node.removeChild(childNode);
+ }
+ }
+ catch(e) {
+// console.log(e);
+ }
+}
+
+/**
+ * removes whitespaces and endlines before and after a string
+ */
+function trimString (str) {
+ return str.replace(/^\s+|\s+|\n+$/g, '');
+}
+
+// ----------------------------
+
+var targetArray = targetString.split(",");
+var global_wfsConfObj;
+var global_selectedWfsConfId;
+var searchPopup;
+
+// removed because initWfs is done on load wmc, which itself is done on init
+//parent.mb_registerInitFunctions("window.frames['"+this.name+"'].initModWfsGazetteer()");
+parent.mb_registerloadWmcSubFunctions("window.frames['"+this.name+"'].appendWfsConf(restoredWmcExtensionData.wfsConfIdString);window.frames['"+this.name+"'].initModWfsGazetteer()");
+
+function openwindow(Adresse) {
+ Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
+ Fenster1.focus();
+}
+
+function appendWfsConf(newWfsConfIdString) {
+ // merge with existing wfs conf ids
+ if (wfsConfIdString !== "" && typeof(wfsConfIdString) != "undefined") {
+ if (newWfsConfIdString !== "" && typeof(newWfsConfIdString) != "undefined") {
+ wfsConfIdString += "," + newWfsConfIdString;
+ }
+ }
+ else {
+ if (newWfsConfIdString !== "" && typeof(newWfsConfIdString) != "undefined") {
+ wfsConfIdString = newWfsConfIdString;
+ }
+ else {
+ wfsConfIdString = "";
+ }
+ }
+}
+
+function fixConfString() {
+ if (wfsConfIdString && typeof(wfsConfIdString) == "string") {
+ var confIdArray = wfsConfIdString.split(",");
+ var newIdArray = [];
+ for (var i = 0; i < confIdArray.length; i++) {
+ var current = parseInt(confIdArray[i]);
+ if (!isNaN(current) && typeof(current) == "number") {
+ var found = false;
+ for (var j = 0; j < newIdArray.length && !found; j++) {
+ if (current == newIdArray[j]) {
+ found = true;
+ }
+ }
+ if (!found) {
+ newIdArray.push(current);
+ }
+ }
+ }
+ wfsConfIdString = newIdArray.join(",");
+ }
+ else {
+ wfsConfIdString = "";
+ }
+}
+function initModWfsGazetteer() {
+ fixConfString();
+ deleteWfsInfo()
+
+ // delete WFS conf select box entries
+ removeChildNodes(document.getElementById("wfs_conf_sel"));
+ removeChildNodes(document.getElementById("wfs_messages"));
+
+ var url = "../x_geoportal/mod_wfsGazetteerEditor_server.php";
+ var properties = {command:"getWfsConf", wfsConfIdString:wfsConfIdString};
+
+ parent.mb_ajax_json(url , properties, function(json, status) {
+ global_wfsConfObj = json;
+ var wfsCount = 0;
+ for (var wfsConfId in global_wfsConfObj) {
+ global_selectedWfsConfId = wfsConfId;
+ if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
+ wfsCount++;
+ }
+ }
+ // If no WFS is available, display an error message...
+ if (wfsCount === 0) {
+
+ var msges = document.getElementById("wfs_messages");
+ var textNode = document.createTextNode("Kein WFS verfügbar. Über die Suche können Sie Dienste hinzuladen.");
+ msges.appendChild(textNode);
+
+ var selectbox = document.getElementById("wfs_conf_sel");
+ selectbox.style.display = "none";
+
+ hideWfsInfo();
+
+ var e = parent.Mb_exception("no wfs conf id available.");
+
+ }
+ // ...else, display a Select Box with available WFS.
+ else {
+ appendWfsConfSelectBox();
+ setWfsInfo();
+ }
+ parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+ });
+}
+
+function deleteWfsInfo () {
+ // delete WFS conf info
+ removeChildNodes(document.getElementById("wfsInfo"));
+}
+
+function hideWfsInfo () {
+ var wfsPreConfiguredOrEditor = document.getElementById("wfsPreConfiguredOrEditor");
+ wfsPreConfiguredOrEditor.style.display = 'none';
+ var wfsGeomTypeNode = document.getElementById("wfsGeomType");
+ wfsGeomTypeNode.style.display = "none";
+ var wfsInfoNode = document.getElementById("wfsInfo");
+ wfsInfoNode.style.display = "none";
+ var wfsRemoveNode = document.getElementById("wfsRemove");
+ wfsRemoveNode.style.display = "none";
+ var wfsSubmitNode = document.getElementById("wfsSubmit");
+ wfsSubmitNode.style.display = "none";
+ return;
+}
+
+function setWfsInfo() {
+ //
+ // append bulb image
+ //
+ var bulbNode = document.getElementById("wfsInfo");
+ removeChildNodes(bulbNode);
+ var imgNode = document.createElement("img");
+ imgNode.id = "wfsInfoImg";
+ imgNode.src = "../x_geoportal/img/info.png";
+ imgNode.border = 0;
+ bulbNode.appendChild(imgNode);
+ bulbNode.href = "javascript:openwindow('../x_geoportal/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
+ bulbNode.style.display = "inline";
+
+ //
+ // set image (pre configured or editor)
+ //
+ var wfsPreConfiguredOrEditor = document.getElementById("wfsPreConfiguredOrEditor");
+ var preConfigured = false;
+ for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
+ if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_search)) {
+ preConfigured = true;
+ break;
+ }
+ }
+ if (preConfigured) {
+ wfsPreConfiguredOrEditor.src = "../x_geoportal/img/modul_suche.png";
+ wfsPreConfiguredOrEditor.title = "Modultyp: Suche";
+ }
+ else {
+ wfsPreConfiguredOrEditor.src = "../x_geoportal/img/modul_download.png";
+ wfsPreConfiguredOrEditor.title = "Modultyp: Download";
+ }
+ wfsPreConfiguredOrEditor.style.display = 'inline';
+
+ //
+ // set wfsGeomType image
+ //
+ var wfsGeomTypeNode = document.getElementById("wfsGeomType");
+ var wfsGeomType = "";
+ for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
+ if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_geom)) {
+ wfsGeomType = global_wfsConfObj[global_selectedWfsConfId].element[i].element_type;
+ }
+ }
+ if (wfsGeomType.match(/Point/)) {
+ wfsGeomTypeNode.src = "../x_geoportal/img/wfs_pkt.gif";
+ wfsGeomTypeNode.style.display = 'inline';
+ wfsGeomTypeNode.title = 'Geometrietyp: Punkt';
+ }
+ else if (wfsGeomType.match(/Line/)) {
+ wfsGeomTypeNode.src = "../x_geoportal/img/wfs_l.gif";
+ wfsGeomTypeNode.style.display = 'inline';
+ wfsGeomTypeNode.title = 'Geometrietyp: Linie';
+ }
+ else if (wfsGeomType.match(/Polygon/)) {
+ wfsGeomTypeNode.src = "../x_geoportal/img/wfs_p.gif";
+ wfsGeomTypeNode.style.display = 'inline';
+ wfsGeomTypeNode.title = 'Geometrietyp: Fläche';
+ }
+ else {
+ var e = new parent.Mb_exception("WFS gazetteer: geometry type unknown.");
+ }
+
+ //
+ // set image: remove this WFS
+ //
+ var wfsRemoveNode = document.getElementById("wfsRemove");
+ wfsRemoveNode.src = "../x_geoportal/img/modul_loeschen.png";
+ wfsRemoveNode.style.display = 'inline';
+ wfsRemoveNode.onclick = function () {
+ delete global_wfsConfObj[global_selectedWfsConfId];
+ setWfsConfIdString();
+ initModWfsGazetteer();
+ parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+ }
+
+ var wfsSubmitNode = document.getElementById("wfsSubmit");
+ wfsSubmitNode.style.display = "display";
+
+}
+
+function setWfsConfIdString() {
+ var str = [];
+ for (var wfsConfId in global_wfsConfObj) {
+ global_selectedWfsConfId = wfsConfId;
+ if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
+ str.push(wfsConfId);
+ }
+ }
+ wfsConfIdString = str.join(",");
+}
+
+function appendWfsConfSelectBox() {
+ var selectNode = document.getElementById("wfs_conf_sel");
+ selectNode.style.display = "block";
+ selectNode.onchange = function () {
+ global_selectedWfsConfId = this.value;
+ setWfsInfo();
+ };
+
+ var isSelected = false;
+ for (var wfsConfId in global_wfsConfObj) {
+ var optionNode = document.createElement("option");
+
+ optionNode.value = wfsConfId;
+ optionNode.innerHTML = global_wfsConfObj[wfsConfId].g_label;
+
+ if (!isSelected) {
+ optionNode.selected = true;
+ isSelected = true;
+ global_selectedWfsConfId = wfsConfId;
+ }
+ selectNode.appendChild(optionNode);
+ }
+}
+
+function displayPopup(){
+ var e_id = "<?php echo $e_id_css; ?>";
+ var url = "../x_geoportal/mod_wfsGazetteerEditor_client.php?" +
+ "e_target=<?php echo $e_target; ?>" +
+ "&e_id_css=" + e_id;
+
+ if (typeof(searchPopup) == "undefined") {
+ searchPopup = new parent.mb_popup({title:global_wfsConfObj[global_selectedWfsConfId].g_label,
+ url:url, width:430, height:400, top:50, left:50, frameName:e_id + "_",
+ minTop:"document",minLeft:"document",maxRight:"document",maxBottom:"document",destroy:false});
+ }
+ else{
+ searchPopup.setUrl(url);
+ searchPopup.setTitle(global_wfsConfObj[global_selectedWfsConfId].g_label);
+ }
+ searchPopup.show();
+}
+
+function openWfsEditor() {
+ displayPopup();
+ return false;
+}
+
+</script>
+</head>
+<body leftmargin='0' topmargin='10' bgcolor='#ffffff'>
+
+ <!-- WFS conf selector -->
+ <form name='selectWfsConfForm' id='selectWfsConfForm' onsubmit='return openWfsEditor();'>
+
+ <select id='wfs_conf_sel' name='wfs_conf_sel' style='display:none'>
+ </select>
+
+ <!-- WFS conf info -->
+ <img src = "" name='wfsPreConfiguredOrEditor' id='wfsPreConfiguredOrEditor' style='display:none'>
+ <img src = "" name='wfsGeomType' id='wfsGeomType' style='display:none'>
+ <img src = "" title='Modul löschen' name='wfsRemove' id='wfsRemove' style='display:none'>
+ <a name='wfsInfo' title='Informationen anzeigen' id='wfsInfo' style='display:none'></a>
+
+ <!-- opens the WFS editor -->
+ <br>
+ <input id='wfsSubmit' type='submit' value='Modul laden'>
+ </form>
+ <p id = "wfs_messages">
+ </p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php (rev 0)
+++ trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php 2011-01-05 10:46:57 UTC (rev 7422)
@@ -0,0 +1,70 @@
+<?php
+# $Id: mod_wfs_gazetteer_client.php 1044 2007-10-10 08:30:29Z baudson $
+# maintained by http://www.mapbender.org/index.php/User:Verena Diewald
+# http://www.mapbender.org/index.php/WFS_gazetteer
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+session_start();
+$gui_id = $_SESSION["mb_user_gui"];
+
+$target = $_REQUEST["target"];
+//$e_id_css = $_REQUEST["e_id_css"];
+
+require_once("../../conf/mapbender.conf");
+
+$con = db_connect($DBSERVER,$OWNER,$PW);
+db_select_db($DB,$con);
+
+//include '../include/dyn_css.php';
+?>
+
+function setWfsConfString() {
+<?php
+echo "\tvar gazetteerFrameId = '" . $e_id . "';\n";
+// if services were selected in search, append them to the wfs gazetteer
+echo "\tvar gazetteerWfsConfFromPortal = '" . $_REQUEST["portal_services_wfs"] . "';\n";
+?>
+
+// now done somewhere else
+// var gazetteerWfsConfFromWMC = mb_getWmcExtensionData("wfsConfIdString");
+
+ //just initialise the gazetteer.
+// if (!gazetteerWfsConfFromPortal && !gazetteerWfsConfFromWMC) {
+// console.log("no WFS conf from WMC and Portal");
+// }
+ // append WFS conf from WMC
+// else if (!gazetteerWfsConfFromPortal && gazetteerWfsConfFromWMC) {
+// console.log("WFS conf from WMC");
+// window.frames[gazetteerFrameId].appendWfsConf(gazetteerWfsConfFromWMC);
+// }
+ // append WFS conf from portal
+// else if (gazetteerWfsConfFromPortal && !gazetteerWfsConfFromWMC) {
+// console.log("WFS conf from Portal");
+// window.frames[gazetteerFrameId].appendWfsConf(gazetteerWfsConfFromPortal);
+// }
+ // append WFS conf from portal and WMC
+// else if (gazetteerWfsConfFromPortal && gazetteerWfsConfFromWMC) {
+// console.log("WFS conf from WMC and Portal");
+// window.frames[gazetteerFrameId].appendWfsConf(gazetteerWfsConfFromPortal + "," + gazetteerWfsConfFromWMC);
+// }
+
+ if (gazetteerWfsConfFromPortal && gazetteerWfsConfFromPortal != null) {
+ window.frames[gazetteerFrameId].appendWfsConf(gazetteerWfsConfFromPortal);
+ }
+}
+
+mb_registerloadWmcSubFunctions("setWfsConfString()");
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_callMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callMetadata.php 2011-01-05 09:42:41 UTC (rev 7421)
+++ trunk/mapbender/http/php/mod_callMetadata.php 2011-01-05 10:46:57 UTC (rev 7422)
@@ -559,9 +559,9 @@
$resourceCategories['georss'] = 'KML/Newsfeeds';
$orderByTitle['header'] = 'Sortierung nach:';
- $orderByTitle['id'] = 'ID';
- $orderByTitle['title'] = 'Titel';
- $orderByTitle['rank'] = 'Relevanz';
+ $orderByTitle['id'] = 'Identifizierungsnummer';
+ $orderByTitle['title'] = 'Alphabetisch';
+ $orderByTitle['rank'] = 'Nachfrage';
$orderByTitle['date'] = 'Letzte Änderung';
@@ -582,9 +582,9 @@
$resourceCategories['georss'] = 'KML/Newsfeeds';
$orderByTitle['header'] = 'Sort by:';
- $orderByTitle['id'] = 'ID';
- $orderByTitle['title'] = 'title';
- $orderByTitle['rank'] = 'relevance';
+ $orderByTitle['id'] = 'identification number';
+ $orderByTitle['title'] = 'alphabetically';
+ $orderByTitle['rank'] = 'demand';
$orderByTitle['date'] = 'last change';
break;
@@ -604,9 +604,9 @@
$resourceCategories['georss'] = 'KML/Newsfeeds';
$orderByTitle['header'] = 'Sort by:';
- $orderByTitle['id'] = 'identification';
- $orderByTitle['title'] = 'title';
- $orderByTitle['rank'] = 'relevance';
+ $orderByTitle['id'] = 'identification number';
+ $orderByTitle['title'] = 'alphabetically';
+ $orderByTitle['rank'] = 'demand';
$orderByTitle['date'] = 'last change';
break;
Modified: trunk/mapbender/http/php/tagCloud.php
===================================================================
--- trunk/mapbender/http/php/tagCloud.php 2011-01-05 09:42:41 UTC (rev 7421)
+++ trunk/mapbender/http/php/tagCloud.php 2011-01-05 10:46:57 UTC (rev 7422)
@@ -132,7 +132,7 @@
$maxWeight = (integer)$row['sum'];
}
if ($type == 'topicCategories') {
- $tags[$i] = array('weight' =>$row['sum'], 'tagname' =>$row[$showName], 'url'=>'http://'.$hostName.$pathToSearchScript.urlencode('searchText=e&resultTarget=file&outputFormat=json&isoCategories='.$row['md_topic_category_id'].'&languageCode='.$languageCode));
+ $tags[$i] = array('weight' =>$row['sum'], 'tagname' =>$row[$showName], 'url'=>'http://'.$hostName.$pathToSearchScript.urlencode('searchText=*&resultTarget=file&outputFormat=json&isoCategories='.$row['md_topic_category_id'].'&languageCode='.$languageCode));
}
if ($type == 'keywords') {
$tags[$i] = array('weight' =>$row['sum'], 'tagname' =>$row[$showName], 'url'=>'http://'.$hostName.$pathToSearchScript.urlencode('searchText='.$row[$showName].'&resultTarget=file&outputFormat=json&languageCode='.$languageCode));
More information about the Mapbender_commits
mailing list