[Mapbender-commits] r7475 - in branches/2.7: . http/classes
http/css http/extensions http/geoportal http/img/gnome
http/javascripts http/php http/plugins http/print lib
resources/db resources/db/pgsql/UTF-8/update tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Jan 27 04:48:28 EST 2011
Author: kmq
Date: 2011-01-27 01:48:27 -0800 (Thu, 27 Jan 2011)
New Revision: 7475
Added:
branches/2.7/http/geoportal/mod_wfsConfSelect_client.php
branches/2.7/http/geoportal/mod_wfs_gazetteer_importWfsConf.php
branches/2.7/http/img/gnome/createCategories.png
branches/2.7/http/img/gnome/deleteGui.png
branches/2.7/http/img/gnome/editGroup.png
branches/2.7/http/img/gnome/editGuiElements.png
branches/2.7/http/img/gnome/editMyGroup.png
branches/2.7/http/img/gnome/editMyUser.png
branches/2.7/http/img/gnome/editUser.png
branches/2.7/http/img/gnome/groupGui.png
branches/2.7/http/img/gnome/groupMyGui.png
branches/2.7/http/img/gnome/groupMyUser.png
branches/2.7/http/img/gnome/groupUser.png
branches/2.7/http/img/gnome/guiCategories.png
branches/2.7/http/img/gnome/guiGroup.png
branches/2.7/http/img/gnome/guiMyGroup.png
branches/2.7/http/img/gnome/guiMyUser.png
branches/2.7/http/img/gnome/guiOwner.png
branches/2.7/http/img/gnome/guiUser.png
branches/2.7/http/img/gnome/icn_suchmodul.png
branches/2.7/http/img/gnome/myGroupGui.png
branches/2.7/http/img/gnome/myGroupMyGui.png
branches/2.7/http/img/gnome/myGroupMyUser.png
branches/2.7/http/img/gnome/myGroupUser.png
branches/2.7/http/img/gnome/myGuiCategories.png
branches/2.7/http/img/gnome/myGuiGroup.png
branches/2.7/http/img/gnome/myGuiMyGroup.png
branches/2.7/http/img/gnome/myGuiMyUser.png
branches/2.7/http/img/gnome/myGuiUser.png
branches/2.7/http/img/gnome/myUserGroup.png
branches/2.7/http/img/gnome/myUserGui.png
branches/2.7/http/img/gnome/myUserMyGroup.png
branches/2.7/http/img/gnome/myUserMyGui.png
branches/2.7/http/img/gnome/newGui.png
branches/2.7/http/img/gnome/sqlExport.png
branches/2.7/http/img/gnome/userGroup.png
branches/2.7/http/img/gnome/userGui.png
branches/2.7/http/img/gnome/userMyGroup.png
branches/2.7/http/img/gnome/userMyGui.png
branches/2.7/http/php/mod_showCapDiff.php
branches/2.7/http/plugins/mb_adminpopup.js
branches/2.7/http/plugins/mb_iframepopup.js
branches/2.7/resources/db/materialize_wms_view.sql
branches/2.7/resources/db/new_admin_gui_de.sql
branches/2.7/tools/mod_updateDatabaseUuid.php
branches/2.7/tools/monitorCapabilities.sh
Modified:
branches/2.7/
branches/2.7/http/classes/class_georss.php
branches/2.7/http/classes/class_gml_2_factory.php
branches/2.7/http/classes/class_gml_polygon.php
branches/2.7/http/classes/class_metadata_new.php
branches/2.7/http/classes/class_rss.php
branches/2.7/http/classes/class_rss_factory.php
branches/2.7/http/classes/class_rss_item.php
branches/2.7/http/classes/class_wfsToDb.php
branches/2.7/http/classes/class_wmc.php
branches/2.7/http/classes/class_wms.php
branches/2.7/http/css/wfsconftree.css
branches/2.7/http/extensions/jqjson.min.js
branches/2.7/http/geoportal/gaz.php
branches/2.7/http/geoportal/insertUserDataIntoDb.php
branches/2.7/http/geoportal/mod_initialStartWmc.php
branches/2.7/http/javascripts/geometry.js
branches/2.7/http/javascripts/initWmcObj.php
branches/2.7/http/javascripts/mod_addWMSfromfilteredList_ajax.php
branches/2.7/http/javascripts/mod_sandclock.js
branches/2.7/http/javascripts/mod_savewmc.js
branches/2.7/http/javascripts/mod_wfsGazetteerEditor_client.php
branches/2.7/http/javascripts/mod_wfsGazetteerEditor_server.php
branches/2.7/http/javascripts/mod_zoomIn1.js
branches/2.7/http/php/mod_abo_show.php
branches/2.7/http/php/mod_callMetadata.php
branches/2.7/http/php/mod_deleteWFS.php
branches/2.7/http/php/mod_deleteWMS.php
branches/2.7/http/php/mod_getWmcDisclaimer.php
branches/2.7/http/php/mod_layerISOMetadata.php
branches/2.7/http/php/mod_loadwmc_server.php
branches/2.7/http/php/mod_monitorCapabilities_read.php
branches/2.7/http/php/mod_monitorCapabilities_read_single_diff.php
branches/2.7/http/php/mod_savewmc_server.php
branches/2.7/http/php/mod_sessionWmc_server.php
branches/2.7/http/php/mod_showMetadata.php
branches/2.7/http/php/mod_wfs_conf_interface.js
branches/2.7/http/php/mod_wfs_gazetteer_server.php
branches/2.7/http/php/tagCloud.php
branches/2.7/http/plugins/mb_extendedSearch_server.php
branches/2.7/http/plugins/mb_sessionWmc.js
branches/2.7/http/plugins/mb_wfsGazetteer.js
branches/2.7/http/plugins/wfsConfTree.js
branches/2.7/http/print/mapbender_template.json
branches/2.7/lib/class_Monitor.php
branches/2.7/lib/mb.ui.wfsGazetteer.js
branches/2.7/resources/db/new_admin_gui.sql
branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql
branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql
branches/2.7/tools/mod_monitorCapabilities_main.php
branches/2.7/tools/mod_monitorCapabilities_write.php
Log:
merge from trunk
Property changes on: branches/2.7
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/kmq_dev:4021-4487
+ /branches/kmq_dev:4021-4487
/trunk/mapbender:7363-7474
Modified: branches/2.7/http/classes/class_georss.php
===================================================================
--- branches/2.7/http/classes/class_georss.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_georss.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -14,7 +14,7 @@
*/
class GeoRss extends Rss {
- protected function createItem () {
+ protected function createRssItem () {
return new GeoRssItem();
}
@@ -23,4 +23,4 @@
' xmlns:georss="http://www.georss.org/georss"';
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/2.7/http/classes/class_gml_2_factory.php
===================================================================
--- branches/2.7/http/classes/class_gml_2_factory.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_gml_2_factory.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -99,7 +99,7 @@
$innerRingNodeArray = $simpleXMLNode->xpath("gml:innerBoundaryIs/gml:LinearRing");
if ($innerRingNodeArray) {
- $ringCount = 0;
+ $ringCount = 1;
foreach ($innerRingNodeArray as $ringNode) {
$coordinates = $ringNode->xpath("gml:coordinates");
foreach ($coordinates as $coordinate) {
Modified: branches/2.7/http/classes/class_gml_polygon.php
===================================================================
--- branches/2.7/http/classes/class_gml_polygon.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_gml_polygon.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -36,6 +36,13 @@
array_push($this->pointArray, array("x" => $x, "y" => $y));
}
+ /**
+ * @param integer 1-based index of the innerRing which to add the point to
+ * @param float x coordinate of the point
+ * @param float y-coordinate of the point
+ * @return void
+ *
+ */
public function addPointToRing ($i, $x, $y) {
if (count($this->innerRingArray) < $i) {
array_push($this->innerRingArray, array());
Modified: branches/2.7/http/classes/class_metadata_new.php
===================================================================
--- branches/2.7/http/classes/class_metadata_new.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_metadata_new.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -84,16 +84,17 @@
$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;
@@ -236,7 +237,7 @@
$this->orderBy = " ORDER BY load_count DESC";
break;
case "id":
- $this->orderBy = " ORDER BY wms_id,layer_pos DESC";
+ $this->orderBy = " ORDER BY wms_id,layer_pos ASC";
break;
case "title":
$this->orderBy = " ORDER BY layer_title ";
@@ -260,10 +261,10 @@
switch ($this->orderBy) {
case "rank":
- $this->orderBy = " ORDER BY wmc_id ";
+ $this->orderBy = " ORDER BY load_count DESC ";
break;
case "id":
- $this->orderBy = " ORDER BY wmc_id ";
+ $this->orderBy = " ORDER BY wmc_id";
break;
case "title":
$this->orderBy = " ORDER BY wmc_title ";
@@ -735,22 +736,6 @@
echo $this->wfsJSON;
}
}
- if ($this->outputFormat == 'xml'){
- //generate xml
- $this->generateXMLHead($xmlDoc);
- $this->generateXMLFoot($xmlDoc);
- $this->generateWFSResultXML($xmlDoc,$res);
- if ($this->resultTarget == 'file') {
- if($wfsFileHandleXML = fopen($this->tempFolder."/".$this->searchId."_".$this->searchResources."_".$this->searchPages.".xml","w")){
- fwrite($wfsFileHandleXML,$xmlDoc->saveXML());
- fclose($wfsFileHandleXML);
- }
- }
- if ($this->resultTarget == 'web') {
- header("Content-type: application/xhtml+xml; charset=UTF-8");
- echo $xmlDoc->saveXML();
- }
- }
$e = new mb_notice("Time to generate WFS-Metadata: ".$usedTime);
$e = new mb_notice("Wrote the MD_WFS-File");
@@ -852,7 +837,8 @@
}
//
//
- if ((integer)$postgisSubNumber >= 4){
+ $e = new mb_exception("class_metadata.php: spatial operator: ".$this->searchTypeBbox);
+ if ((integer)$postgisSubNumber >= 3){
#$spatialFilter = "(the_geom ";
$e = new mb_exception("class_metadata.php: spatial operator: ".$this->searchTypeBbox);
if ($this->searchTypeBbox == 'outside') {
@@ -866,7 +852,7 @@
if(count(explode(',',$this->searchBbox)) == 4){ //if searchBbox has 4 entries
$spatialFilterCoords = explode(',',$this->searchBbox);//read out searchBbox
//definition of the spatial filter
- $spatialFilter .= 'GeomFromText(\'POLYGON(('.$spatialFilterCoords[0];//minx
+ $spatialFilter .= 'the_geom,GeomFromText(\'POLYGON(('.$spatialFilterCoords[0];//minx
$spatialFilter .= ' '.$spatialFilterCoords[1].',';//miny
$spatialFilter .= $spatialFilterCoords[0];//minx
$spatialFilter .= ' '.$spatialFilterCoords[3].',';//maxy
@@ -876,7 +862,7 @@
$spatialFilter .= ' '.$spatialFilterCoords[1].',';//miny
$spatialFilter .= $spatialFilterCoords[0];//minx
$spatialFilter .= ' '.$spatialFilterCoords[1].'))\',4326)';//miny
- $spatialFilter .= ",the_geom)";
+ $spatialFilter .= ")";
array_push($whereCondArray, $spatialFilter);
}
} else {
@@ -1059,7 +1045,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 +1067,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 +1089,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);
@@ -1247,129 +1228,6 @@
}
-
-
- private function generateWFSResultXML($wfsDoc, $res) {
- $c = $this->wfsDoc->createElement("category");
- $results = $this->wfsDoc->getElementsByTagName("result");
- foreach ($results as $result) {
- $result->appendChild($c);
- $c->setAttribute('name', "WFS");
- $c->setAttribute('count', "0");
- }
- $i = 0;
- while($row = db_fetch_array($res)){
- $m = $this->wfsDoc->createElement('member');
- $m->setAttribute('wfs_id', $row['wfs_id']);
- $m->setAttribute('layer_pos', "");
- $c->appendChild($m); // member categorie 1 (first member)
- // epsg - TODO adopt
- $epsg = $this->wfsDoc->createElement('epsg');
- $m->appendChild($epsg);
- $equalEPSG = $row['featuretype_srs'];
- $isequal = "false";
- if ($equalEPSG == $this->search_epsg){
- $isequal = "true";
- }
- //Insert end
- $epsg_text = $this->wfsDoc->createTextNode($isequal);
- $epsg->appendChild($epsg_text);
- // country codes
- $state = $this->wfsDoc->createElement('federalstate');
- $m->appendChild($state);
- $spatialSource = "";
- $stateorprovince = $row['administrativearea'];
- if ($stateorprovince == "NULL" || $stateorprovince == "") {
- $spatialSource = $row['country'];
- } else {
- $spatialSource = $row['administrativearea'];
- }
- $countr_code_text = $this->wfsDoc->createTextNode($spatialSource);
- $state->appendChild($countr_code_text);
- //type
- $type = $this->wfsDoc->createElement('type');
- $m->appendChild($type);
- $ttype = $this->wfsDoc->createTextNode("wfs");
- $type->appendChild($ttype);
- //wfs_id
- $wfsid = $this->wfsDoc->createElement('wfs_id');
- $m->appendChild($wfsid);
- $twfsid = $this->wfsDoc->createTextNode($row['wfs_id']);
- $wfsid->appendChild($twfsid);
- //id
- $id = $this->wfsDoc->createElement('featuretype_id');
- $m->appendChild($id);
- $tid = $this->wfsDoc->createTextNode($row['featuretype_id']);
- $id->appendChild($tid);
- //title
- $title = $this->wfsDoc->createElement('featuretype_title');
- $m->appendChild($title);
- $ttitle = $this->wfsDoc->createTextNode($row['featuretype_title']);
- $title->appendChild($ttitle);
- //abstract
- $abst = $this->wfsDoc->createElement('featuretype_abstract');
- $m->appendChild($abst);
- $tabst = $this->wfsDoc->createTextNode($row['featuretype_abstract']);
- $abst->appendChild($tabst);
- // accesscontraints
- $ac = $this->wfsDoc->createElement('accessconstraints');
- $m->appendChild($ac);
-// $myac = $this->getAccessConstraints($this->cat[$i]['member'][$ii]['wms_id'], $this->cat[$i]['member'][$ii]['accessconstraints'], $this->cat[$i]['member'][$ii]['layer_id']);
- $myac = $this->wfsDoc->createTextNode($row['accessconstraints']);
- $ac->appendChild($myac);
- // termsofuse
- $ter = $this->wfsDoc->createElement('termsofuse');
- $m->appendChild($ter);
- $myter = $this->wfsDoc->createTextNode($row['termsofuse']);
- $ter->appendChild($myter);
- //date
- $date = $this->wfsDoc->createElement('date');
- $m->appendChild($date);
- $tdate = $this->wfsDoc->createTextNode(date("d.m.Y",$row['wfs_timestamp']));
- $date->appendChild($tdate);
- // Geomtype
- $geo = $this->wfsDoc->createElement('geomtype');
- $m->appendChild($geo);
- //$geo_text = $this->getGeoType($row['wfs_id'], $row['featuretype_id']);
- $geo_text = $this->wfsDoc->createTextNode($row['element_type']);
- //$ge = $this->wfsDoc->createTextNode($geo_text);
- $geo->appendChild($geo_text);
- //department
- $dm = $this->wfsDoc->createElement('department');
- $m->appendChild($dm);
- $tdm = $this->wfsDoc->createTextNode($row['mb_group_name']);
- $dm->appendChild($tdm);
- //permission Leseberechtigung des Benutzers(true), sonst Email zur Beantragung(email)
- $per = $this->wfsDoc->createElement('permission');
- $m->appendChild($per);
- $per_text = $this->getPermissionValueForWFS($row['wfs_id'], $row['wfs_conf_id']);
- $pe = $this->wfsDoc->createTextNode($per_text);
- $per->appendChild($pe);
- //wfs_conf_id
- $conf_id = $this->wfsDoc->createElement('wfs_conf_id');
- $m->appendChild($conf_id);
- $c_id = $this->wfsDoc->createTextNode($row['wfs_conf_id']);
- $conf_id->appendChild($c_id);
- //wfs_conf_title
- $conf_title = $this->wfsDoc->createElement('wfs_conf_title');
- $m->appendChild($conf_title);
- $conf_title_text = $this->wfsDoc->createTextNode($row['wfs_conf_abstract']);
- $conf_title->appendChild($conf_title_text);
- //wfs_conf_abstract
- $conf_abstract = $this->wfsDoc->createElement('wfs_conf_abstract');
- $m->appendChild($conf_abstract);
- $c_abstract = $this->wfsDoc->createTextNode($row['wfs_conf_description']);
- $conf_abstract->appendChild($c_abstract);
- //wfs_conf_modul
- $conf_modul = $this->wfsDoc->createElement('wfs_conf_modul');
- $m->appendChild($conf_modul);
- $c_modul = $this->wfsDoc->createTextNode($row['modultype']);
- $conf_modul->appendChild($c_modul);
- $i++;
- }
- $c->setAttribute('count', $i);
- }
-
private function getPermissionValueForWFS($wfs_id, $wfs_conf_id){
//TODO: Set Email of owner into view for ressource - so it don't have to be searched?
$return_permission = "";
@@ -1651,7 +1509,7 @@
#echo $returnJSON;
return array($hasConstraints, $symbolLink);
}
- //function to delete one of the comma separated values from one get request
+ //function to delete one of the comma separated values from a HTTP-GET request
//
//
//
@@ -1719,8 +1577,9 @@
die();
}
}*/
- }
-
+ }
+
+// function to add a new variable or complete parameter to a GET parameter query url
private function addToQuery($paramName,$queryString,$string,$queryList) {
//test if string was part of query before, if so, don't extent the query
//TODO: the strings come from json and so they are urlencoded! maybe we have to decode them to find the commata
@@ -1746,7 +1605,8 @@
return $queryString;
}
}
- //for debugging purposes
+
+//for debugging purposes only
private function logit($text){
if($h = fopen("/tmp/class_metadata_new.log","a")){
$content = $text .chr(13).chr(10);
@@ -1758,9 +1618,7 @@
}
-
-
-
+// function to delete one GET parameter totally from a query url
private function delTotalFromQuery($paramName,$queryString) {
$queryString = "&".$queryString;
#echo "<br>queryString: ".$queryString."<br>";
Modified: branches/2.7/http/classes/class_rss.php
===================================================================
--- branches/2.7/http/classes/class_rss.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_rss.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -14,8 +14,7 @@
*/
class Rss {
var $filename;
-
- var $channel_url;
+ var $channel_url;
var $channel_title;
var $channel_description;
var $channel_lang;
@@ -32,18 +31,30 @@
protected function createItem () {
return new RssItem();
}
-
+ //function to append item at the end of the item list
public function append () {
if (func_num_args() === 0) {
$item = $this->createItem();
}
else {
$item = func_get_arg(0);
- }
+ };
$this->items[]= $item;
$this->nritems++;
return $item;
}
+ //function to append item at the top of the item list - maybe most recent !
+ public function appendTop () {
+ if (func_num_args() === 0) {
+ $item = $this->createItem();
+ }
+ else {
+ $item = func_get_arg(0);
+ }
+ array_unshift($this->items, $item);
+ $this->nritems++;
+ return $item;
+ }
public function saveAsFile() {
if (func_num_args() === 1) {
@@ -93,7 +104,11 @@
$this->channel_description=$description;
$this->channel_lang=$lang;
$this->channel_copyright=$copyright;
- $this->channel_date=date("Y-m-d").'T'.date("H:i:s").'+01:00';
+ //$this->channel_date=date("Y-m-d").'T'.date("H:i:s").'+01:00';
+ $timestamp = ($timestamp==null) ? time() : $timestamp;
+ /*** Mon, 02 Jul 2009 11:36:45 +0000 ***/
+ $this->channel_date = date(DATE_RSS, $timestamp);
+
$this->channel_creator=$creator;
$this->channel_subject=$subject;
}
@@ -104,6 +119,7 @@
public function setItem($rssItem) {
if (is_a($rssItem, "RssItem")) {
+ #array_unshift($this->items, $rssItem);
$this->items[]= $rssItem;
$this->nritems++;
return true;
Modified: branches/2.7/http/classes/class_rss_factory.php
===================================================================
--- branches/2.7/http/classes/class_rss_factory.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_rss_factory.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -123,7 +123,7 @@
$item->setUrl(trim($childNode->nodeValue));
break;
- case "pupDate":
+ case "pubDate":
$item->setPubDate(trim($childNode->nodeValue));
break;
@@ -133,4 +133,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/2.7/http/classes/class_rss_item.php
===================================================================
--- branches/2.7/http/classes/class_rss_item.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_rss_item.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -15,6 +15,10 @@
protected $pubDate;
public function __construct () {
+ //$this->title = "dummytitle";
+ //$this->description = "dummydescription";
+ //$this->url = "dummyurl";
+ //$this->pubDate = "dummypubdate";
}
public function setUrl ($url) {
@@ -53,4 +57,4 @@
// "\n";
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/2.7/http/classes/class_wfsToDb.php
===================================================================
--- branches/2.7/http/classes/class_wfsToDb.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_wfsToDb.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -21,6 +21,7 @@
require_once(dirname(__FILE__)."/class_connector.php");
require_once(dirname(__FILE__)."/class_administration.php");
require_once(dirname(__FILE__)."/class_wfs.php");
+require_once dirname(__FILE__) . "//class_Uuid.php";
class WfsToDb {
@@ -45,12 +46,12 @@
*/
public static function insert ($aWfs) {
db_begin();
-
+ $uuid = new Uuid();
$sql = "INSERT INTO wfs (wfs_version, wfs_name, wfs_title, wfs_abstract, ";
$sql .= "wfs_getcapabilities, wfs_getcapabilities_doc, wfs_upload_url, ";
$sql .= "wfs_describefeaturetype, wfs_getfeature, wfs_transaction, fees, ";
- $sql .= "accessconstraints, wfs_owner, wfs_timestamp) ";
- $sql .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)";
+ $sql .= "accessconstraints, wfs_owner, wfs_timestamp, uuid) ";
+ $sql .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14,$15)";
$v = array(
$aWfs->getVersion(),
@@ -66,10 +67,11 @@
$aWfs->fees,
$aWfs->accessconstraints,
Mapbender::session()->get("mb_user_id"),
- strtotime("now")
+ strtotime("now"),
+ $uuid
);
- $t = array('s', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 'i', 'i');
+ $t = array('s', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 's', 'i', 'i','s');
$res = db_prep_query($sql, $v, $t);
@@ -430,18 +432,20 @@
* @param $aWfsFeatureType WfsFeatureType
*/
private static function insertFeatureType ($aWfsFeatureType) {
+ $uuid = new Uuid();
$sql = "INSERT INTO wfs_featuretype (fkey_wfs_id, featuretype_name, " .
- "featuretype_title, featuretype_abstract, featuretype_srs) " .
- "VALUES($1, $2, $3, $4, $5)";
+ "featuretype_title, featuretype_abstract, featuretype_srs, uuid) " .
+ "VALUES($1, $2, $3, $4, $5, $6)";
$v = array(
$aWfsFeatureType->wfs->id,
$aWfsFeatureType->name,
$aWfsFeatureType->title,
$aWfsFeatureType->summary,
- $aWfsFeatureType->srs
+ $aWfsFeatureType->srs,
+ $uuid
);
- $t = array('i','s','s','s','s');
+ $t = array('i','s','s','s','s','s');
$e = new mb_exception("INSERTING FT (FT: $aWfsFeatureType->name)");
$res = db_prep_query($sql,$v,$t);
@@ -747,4 +751,4 @@
return false;
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/2.7/http/classes/class_wmc.php
===================================================================
--- branches/2.7/http/classes/class_wmc.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_wmc.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -876,6 +876,64 @@
}
return true;
}
+ /*
+ * increments the wmc_load_count if it has been set before
+ * @param $wmc_id wmc_serial_id
+ */
+ public function incrementWmcLoadCount() {
+ $wmcId = $this->wmc_id;
+ //check for public else return false
+ if ($this->isPublic()) {
+ //check if a load_count has been set before
+ //if not been set, set it to 1
+ //else increment it
+ $sql = "SELECT load_count FROM wmc_load_count where fkey_wmc_serial_id = $1;";
+ $v = array($wmcId);
+ $t = array("i");
+ $res = db_prep_query($sql,$v,$t);
+ if(db_error()) {
+ return false;
+ }
+ $row = db_fetch_array($res);
+ if ($row) {
+ $e = new mb_exception("class_wmc: incrementWmcLoadCount found entry increment should be performed");
+ $count = $row['load_count'];
+ $count++;
+ $sql = "UPDATE wmc_load_count SET load_count = $2 WHERE fkey_wmc_serial_id = $1;";
+ $v = array($wmcId,$count);
+ $t = array("i","i");
+ $res = db_prep_query($sql,$v,$t);
+ } else {
+ $e = new mb_exception("class_wmc: incrementWmcLoadCount dont found entry - new should be set to 1");
+ $sql = "INSERT INTO wmc_load_count (fkey_wmc_serial_id,load_count) VALUES ($1, $2);";
+ $v = array($wmcId,1);
+ $t = array("i","i");
+ $res = db_prep_query($sql,$v,$t);
+ }
+ return true;
+ }
+ return false;
+ }
+ /*
+ * test if the given wmc is public
+ *
+ */
+ public function isPublic() {
+ $wmcId = $this->wmc_id;
+ $sql = "SELECT wmc_serial_id FROM mb_user_wmc ";
+ $sql .= "WHERE wmc_serial_id = $1 AND wmc_public = 1;";
+ $v = array($wmcId);
+ $t = array("i");
+ $res = db_prep_query($sql,$v,$t);
+ $row = db_fetch_array($res);
+ if (isset($row['wmc_serial_id']) && $row['wmc_serial_id'] != '') {
+ $e = new mb_exception("class_wmc: isPublic is true");
+ return true;
+ }
+ $e = new mb_exception("class_wmc: isPublic is false");
+ return false;
+ }
+
// ---------------------------------------------------------------------------
// GETTER FUNCTIONS
// ---------------------------------------------------------------------------
Modified: branches/2.7/http/classes/class_wms.php
===================================================================
--- branches/2.7/http/classes/class_wms.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/classes/class_wms.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -8,6 +8,7 @@
require_once dirname(__FILE__) . "/../../core/globalSettings.php";
require_once dirname(__FILE__) . "/class_connector.php";
require_once dirname(__FILE__) . "/class_user.php";
+require_once dirname(__FILE__) . "//class_Uuid.php";
require_once dirname(__FILE__) . "/class_administration.php";
require_once dirname(__FILE__) . "/class_georss_factory.php";
require_once dirname(__FILE__) . "/class_mb_exception.php";
@@ -95,11 +96,12 @@
}
public static function getWmsMetadataUrl ($wmsId) {
- return preg_replace(
- "/(.*)frames\/login.php/",
- "$1php/mod_layerMetadata.php?id=",
- LOGIN
- ) . $wmsId;
+ #return preg_replace(
+ # "/(.*)frames\/login.php/",
+ # "$1php/mod_layerMetadata.php?id=",
+ # LOGIN
+ #) . $wmsId;
+ return LOGIN."/../../mapbender/php/mod_showMetadata.php?resource=wms&id=".$wmsId;
}
public static function isOwsProxyUrl ($getmap) {
@@ -1449,7 +1451,7 @@
$authType = '';
}
$admin = new administration();
-
+ $uuid = new Uuid();
$this->checkObj();
db_begin();
@@ -1459,8 +1461,8 @@
$sql .= "accessconstraints, contactperson, contactposition, contactorganization, address, city, ";
$sql .= "stateorprovince, postcode, country, contactvoicetelephone, contactfacsimiletelephone, contactelectronicmailaddress, ";
$sql .= "wms_owner,wms_timestamp,wms_timestamp_create,wms_username,wms_password,wms_auth_type,";
- $sql .= "wms_supportsld, wms_userlayer, wms_userstyle, wms_remotewfs) ";
- $sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32)";
+ $sql .= "wms_supportsld, wms_userlayer, wms_userstyle, wms_remotewfs, uuid) ";
+ $sql .= "VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32,$33)";
$v = array(
$this->wms_version,
$this->wms_title,
@@ -1493,11 +1495,12 @@
$this->wms_supportsld,
$this->wms_userlayer,
$this->wms_userstyle,
- $this->wms_remotewfs
+ $this->wms_remotewfs,
+ $uuid
);
$t = array(
's','s','s','s','s','s','s','s','s','s','s','s','s','s','s','s',
- 's','s','s','s','s','s','i','i','i','s','s','s','s','s','s','s'
+ 's','s','s','s','s','s','i','i','i','s','s','s','s','s','s','s','s'
);
$res = db_prep_query($sql,$v,$t);
if(!$res){
@@ -1567,7 +1570,7 @@
$geoRss = $geoRssFactory->loadOrCreate(GEO_RSS_FILE);
if (!is_null($geoRss)) {
$geoRssItem = new GeoRssItem();
- $geoRssItem->setTitle("NEW: " . $this->wms_title);
+ $geoRssItem->setTitle("NEW WMS: " . $this->wms_title." (".$myWMS.")");
$geoRssItem->setDescription($this->wms_abstract);
$geoRssItem->setUrl(self::getWmsMetadataUrl($myWMS));
$geoRssItem->setPubDate(self::rssDate());
@@ -1586,24 +1589,27 @@
break;
}
}
-
- $geoRss->append($geoRssItem);
+ //for debugging:
+ //print_r($geoRss);
+ //die();
+ $geoRss->appendTop($geoRssItem);
$geoRss->saveAsFile();
}
- #Changes JW
+ //Changes JW
$this->wms_id = $myWMS;
}
function insertLayer($i,$myWMS){
global $con;
+ $uuid = new Uuid();
$sql = <<<SQL
INSERT INTO layer
(fkey_wms_id, layer_pos, layer_parent, layer_name, layer_title,
layer_queryable, layer_minscale, layer_maxscale, layer_dataurl,
-layer_metadataurl, layer_searchable, layer_abstract)
+layer_metadataurl, layer_searchable, layer_abstract, uuid)
VALUES
-($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
SQL;
if($this->objLayer[$i]->layer_id != null){
@@ -1620,8 +1626,9 @@
$this->objLayer[$i]->layer_queryable,$this->objLayer[$i]->layer_minscale,
$this->objLayer[$i]->layer_maxscale,$this->objLayer[$i]->layer_dataurl_href,
$this->objLayer[$i]->layer_metadataurl, $this->objLayer[$i]->layer_searchable,
- $this->objLayer[$i]->layer_abstract);
- $t = array('i','i','s','s','s','i','i','i','s','s','i','s');
+ $this->objLayer[$i]->layer_abstract,
+ $uuid);
+ $t = array('i','i','s','s','s','i','i','i','s','s','i','s','s');
$res = db_prep_query($sql,$v,$t);
if(!$res){
db_rollback();
@@ -2173,7 +2180,7 @@
$v = array($myWMS);
$t = array('i');
$c = 2;
- $sql = "SELECT layer_name, layer_title, layer_abstract FROM layer WHERE fkey_wms_id = $1 AND NOT layer_name IN(";
+ $sql = "SELECT layer_id, layer_name, layer_title, layer_abstract FROM layer WHERE fkey_wms_id = $1 AND NOT layer_name IN(";
for($i=0; $i<count($this->objLayer); $i++){
if($i>0){$sql .= ',';}
$sql .= "$".$c;
@@ -2185,6 +2192,7 @@
$res = db_prep_query($sql,$v,$t);
while ($row = db_fetch_array($res)) {
$oldLayerNameArray[]= array(
+ "id" => $row["layer_id"],
"name" => $row["layer_name"],
"title" => $row["layer_title"],
"abstract" => $row["layer_abstract"]
@@ -2257,7 +2265,7 @@
if (!is_null($geoRss)) {
$geoRssItem = new GeoRssItem();
- $geoRssItem->setTitle("UPDATED WMS: " . $this->wms_title);
+ $geoRssItem->setTitle("UPDATED WMS: " . $this->wms_title." (".$myWMS.")");
$geoRssItem->setDescription($this->wms_abstract);
$geoRssItem->setUrl(self::getWmsMetadataUrl($myWMS));
$geoRssItem->setPubDate(self::rssDate());
@@ -2275,15 +2283,15 @@
break;
}
}
- $geoRss->append($geoRssItem);
+ $geoRss->appendTop($geoRssItem);
foreach ($newLayerArray as $newLayer) {
$currentLayer = $this->objLayer[$newLayer];
- $geoRssItem = new GeoRssItem();
- $geoRssItem->setTitle("ADDED LAYER: " . $currentLayer->layer_title);
- $geoRssItem->setDescription($currentLayer->layer_abstract);
- $geoRssItem->setUrl(layer::getLayerMetadataUrl($currentLayer->layer_id));
- $geoRssItem->setPubDate(self::rssDate());
+ $geoRssItemNewLayer = new GeoRssItem();
+ $geoRssItemNewLayer->setTitle("NEW LAYER: " . $currentLayer->layer_title." (".$currentLayer->layer_id.")");
+ $geoRssItemNewLayer->setDescription($currentLayer->layer_abstract);
+ $geoRssItemNewLayer->setUrl(layer::getLayerMetadataUrl($currentLayer->layer_id));
+ $geoRssItemNewLayer->setPubDate(self::rssDate());
for ($j = 0; $j < count($currentLayer->layer_epsg); $j++) {
$currentEpsg = $currentLayer->layer_epsg[$j];
if ($currentEpsg["epsg"] === "EPSG:4326") {
@@ -2294,19 +2302,19 @@
$currentEpsg["maxy"],
$currentEpsg["epsg"]
);
- $geoRssItem->setBbox($currentBbox);
+ $geoRssItemNewLayer->setBbox($currentBbox);
break;
}
}
- $geoRss->append($geoRssItem);
+ $geoRss->appendTop($geoRssItemNewLayer);
}
foreach ($oldLayerNameArray as $oldLayer) {
- $geoRssItem = new GeoRssItem();
- $geoRssItem->setTitle("DELETED LAYER: " . $oldLayer["title"]);
- $geoRssItem->setDescription($oldLayer["abstract"]);
- $geoRssItem->setPubDate(self::rssDate());
+ $geoRssItemOldLayer = new GeoRssItem();
+ $geoRssItemOldLayer->setTitle("DELETED LAYER: " . $oldLayer["title"]." (".$oldLayer["id"].")");
+ $geoRssItemOldLayer->setDescription($oldLayer["abstract"]);
+ $geoRssItemOldLayer->setPubDate(self::rssDate());
// $geoRssItem->setUrl();
- $geoRss->append($geoRssItem);
+ $geoRss->appendTop($geoRssItemOldLayer);
}
$geoRss->saveAsFile();
}
@@ -3000,11 +3008,12 @@
}
public static function getLayerMetadataUrl ($layerId) {
- return preg_replace(
- "/(.*)frames\/login.php/",
- "$1php/mod_layerMetadata.php?id=",
- LOGIN
- ) . $layerId;
+ #return preg_replace(
+ # "/(.*)frames\/login.php/",
+ # "$1php/mod_showMetadata.php?resource=layer&id=",
+ # LOGIN
+ #) . $layerId;
+ return LOGIN."/../../mapbender/php/mod_showMetadata.php?resource=layer&id=".$layerId;
}
public function __toString () {
Modified: branches/2.7/http/css/wfsconftree.css
===================================================================
--- branches/2.7/http/css/wfsconftree.css 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/css/wfsconftree.css 2011-01-27 09:48:27 UTC (rev 7475)
@@ -27,8 +27,7 @@
ul.conftree li{
- padding-left: 2px;
-/* margin-left: 1em;*/
+ padding-bottom: 0;
}
ul.conftree button {
@@ -98,12 +97,21 @@
background-image: url("../img/button_digitize/geomRemove.png");
background-repeat: no-repeat;
background-position: 0 0;
+ color: transparent;
+ width: 2em;
}
+ul.conftree li a.meta{
+ background-image: url("../img/tree_new/info.png");
+ background-repeat: no-repeat;
+ background-position: 0 0;
+ color: transparent;
+ width: 2em;
+ display: inline-block;
+}
+
+
ul.conftree li.open, ul.conftree li.closed {
-/* background-image: url("http://localhost:8888/vertical_dots.png");*/
- background-repeat: repeat-x ;
- background-position: 10px 10px;
padding-bottom: 0.5em;
}
@@ -123,6 +131,8 @@
ul.conftree ul ul {
padding: 0;
+ margin-left: 0.5em;
+ border-left: thin dotted grey;
}
ul.conftree ul ul li {
@@ -132,3 +142,9 @@
ul.conftree ul ul li:hover {
border: 1px dotted gray;
}
+
+ul.conftree ul ul li img {
+ vertical-align: bottom;
+ height: 20px;
+
+}
Property changes on: branches/2.7/http/extensions/jqjson.min.js
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/mapbender/http/extensions/jqjson.min.js:7363-7474
Modified: branches/2.7/http/geoportal/gaz.php
===================================================================
--- branches/2.7/http/geoportal/gaz.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/geoportal/gaz.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -24,7 +24,8 @@
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../../conf/geoportal.conf");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once("/data/mapbender/http/classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+
$n = new mb_exception("-- gaz.php was invoked--");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
@@ -103,12 +104,6 @@
}
if (isset($orderBy) & ($orderBy != 'false')){
- #if ($searchTypeBbox == 'intersects') {
- # $openSearchFilter .= "+coord:intersect";
- #}
- #if ($searchTypeBbox == 'outside') {
- # $openSearchFilter .= "+coord:include";
- #}
if ($orderBy == 'rank') {
$openSearchFilter .= "+ranking:score";
}
@@ -126,8 +121,6 @@
-
-
#Geometry search:
$exec = "php5 /data/mapbender/http/geoportal/gaz_geom.php '".$userId."' '".$searchText."' '".$searchEPSG."' > ".$resdir."/".$searchId."_geom.xml &";
exec($exec);
Modified: branches/2.7/http/geoportal/insertUserDataIntoDb.php
===================================================================
--- branches/2.7/http/geoportal/insertUserDataIntoDb.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/geoportal/insertUserDataIntoDb.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -18,9 +18,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-
+ require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
- require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+ #echo "test<br>";
$mb_user_password = '';
$adm = new administration();
$con = db_connect(DBSERVER,OWNER,PW);
@@ -57,7 +57,7 @@
if(!isset($mb_user_postal_code) || $mb_user_postal_code == ''){ $mb_user_postal_code = 0;}
$sql = "INSERT INTO mb_user (mb_user_name,mb_user_password,mb_user_digest,mb_user_owner,mb_user_description,mb_user_email,mb_user_phone,mb_user_department,mb_user_organisation_name,mb_user_position_name,mb_user_city,mb_user_postal_code, mb_user_textsize, mb_user_glossar) VALUES ($1, $2,$13, '1', $3, $4, $5, $6, $7, $8, $9, $10,$11,$12)";
$v = array($mb_user_name, md5($mb_user_password), $mb_user_description, $mb_user_email, $mb_user_phone, $mb_user_department, $mb_user_organisation_name, $mb_user_position_name, $mb_user_city, $mb_user_postal_code, 'textsize1' ,'ja',md5($mb_user_name.";".$mb_user_email.":".REALM.":".$mb_user_password));
- $t = array('s', 's', 's', 's', 's', 's', 's', 's', 's', 'i', 's', 's');
+ $t = array('s', 's', 's', 's', 's', 's', 's', 's', 's', 'i', 's', 's', 's');
$res = db_prep_query($sql, $v, $t);
$sql = "SELECT mb_group_id FROM mb_group WHERE mb_group_name = 'guest' LIMIT 1";
@@ -71,6 +71,7 @@
//Mailversand
$mailBody=$mailBody1." ".$mb_user_password." ".$mailBody2;
+ #echo $mailBody."<br>";
$success = $adm->sendEmail(MAILADMIN, MAILADMINNAME, $mb_user_email, $mb_user_name, 'Ihre Registrierung', $mailBody, $error_msg );
}
else
Modified: branches/2.7/http/geoportal/mod_initialStartWmc.php
===================================================================
--- branches/2.7/http/geoportal/mod_initialStartWmc.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/geoportal/mod_initialStartWmc.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -61,11 +61,11 @@
}
//define sql for selecting informations from database:
$sql = "";
-$sql .= "SELECT search_wmc_view.wmc_serial_id,search_wmc_view.wmc_title,search_wmc_view.wmc_abstract, custom_category.custom_category_code_".$languageCode. " ";
+$sql .= "SELECT search_wmc_view.wmc_serial_id,search_wmc_view.wmc_title,search_wmc_view.wmc_abstract, custom_category.custom_category_code_".$languageCode. ", search_wmc_view.load_count ";
$sql .= "FROM search_wmc_view INNER JOIN wmc_custom_category ON ";
$sql .= "(wmc_custom_category.fkey_wmc_serial_id=search_wmc_view.wmc_serial_id) INNER JOIN custom_category ON ";
$sql .= "(custom_category.custom_category_id=wmc_custom_category.fkey_custom_category_id) WHERE ";
-$sql .= "custom_category.custom_category_key = 'mbc1' LIMIT $1";
+$sql .= "custom_category.custom_category_key = 'mbc1' ORDER BY search_wmc_view.load_count DESC LIMIT $1 ";
$v = array($maxObjects);
$t = array('i');
Copied: branches/2.7/http/geoportal/mod_wfsConfSelect_client.php (from rev 7473, trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php)
===================================================================
--- branches/2.7/http/geoportal/mod_wfsConfSelect_client.php (rev 0)
+++ branches/2.7/http/geoportal/mod_wfsConfSelect_client.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -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
Copied: branches/2.7/http/geoportal/mod_wfs_gazetteer_importWfsConf.php (from rev 7473, trunk/mapbender/http/geoportal/mod_wfs_gazetteer_importWfsConf.php)
===================================================================
--- branches/2.7/http/geoportal/mod_wfs_gazetteer_importWfsConf.php (rev 0)
+++ branches/2.7/http/geoportal/mod_wfs_gazetteer_importWfsConf.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -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
Copied: branches/2.7/http/img/gnome/createCategories.png (from rev 7473, trunk/mapbender/http/img/gnome/createCategories.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/deleteGui.png (from rev 7473, trunk/mapbender/http/img/gnome/deleteGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/editGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/editGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/editGuiElements.png (from rev 7473, trunk/mapbender/http/img/gnome/editGuiElements.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/editMyGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/editMyGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/editMyUser.png (from rev 7473, trunk/mapbender/http/img/gnome/editMyUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/editUser.png (from rev 7473, trunk/mapbender/http/img/gnome/editUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/groupGui.png (from rev 7473, trunk/mapbender/http/img/gnome/groupGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/groupMyGui.png (from rev 7473, trunk/mapbender/http/img/gnome/groupMyGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/groupMyUser.png (from rev 7473, trunk/mapbender/http/img/gnome/groupMyUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/groupUser.png (from rev 7473, trunk/mapbender/http/img/gnome/groupUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiCategories.png (from rev 7473, trunk/mapbender/http/img/gnome/guiCategories.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/guiGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiMyGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/guiMyGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiMyUser.png (from rev 7473, trunk/mapbender/http/img/gnome/guiMyUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiOwner.png (from rev 7473, trunk/mapbender/http/img/gnome/guiOwner.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/guiUser.png (from rev 7473, trunk/mapbender/http/img/gnome/guiUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/icn_suchmodul.png (from rev 7473, trunk/mapbender/http/img/gnome/icn_suchmodul.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGroupGui.png (from rev 7473, trunk/mapbender/http/img/gnome/myGroupGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGroupMyGui.png (from rev 7473, trunk/mapbender/http/img/gnome/myGroupMyGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGroupMyUser.png (from rev 7473, trunk/mapbender/http/img/gnome/myGroupMyUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGroupUser.png (from rev 7473, trunk/mapbender/http/img/gnome/myGroupUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGuiCategories.png (from rev 7473, trunk/mapbender/http/img/gnome/myGuiCategories.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGuiGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/myGuiGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGuiMyGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/myGuiMyGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGuiMyUser.png (from rev 7473, trunk/mapbender/http/img/gnome/myGuiMyUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myGuiUser.png (from rev 7473, trunk/mapbender/http/img/gnome/myGuiUser.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myUserGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/myUserGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myUserGui.png (from rev 7473, trunk/mapbender/http/img/gnome/myUserGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myUserMyGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/myUserMyGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/myUserMyGui.png (from rev 7473, trunk/mapbender/http/img/gnome/myUserMyGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/newGui.png (from rev 7473, trunk/mapbender/http/img/gnome/newGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/sqlExport.png (from rev 7473, trunk/mapbender/http/img/gnome/sqlExport.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/userGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/userGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/userGui.png (from rev 7473, trunk/mapbender/http/img/gnome/userGui.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/userMyGroup.png (from rev 7473, trunk/mapbender/http/img/gnome/userMyGroup.png)
===================================================================
(Binary files differ)
Copied: branches/2.7/http/img/gnome/userMyGui.png (from rev 7473, trunk/mapbender/http/img/gnome/userMyGui.png)
===================================================================
(Binary files differ)
Modified: branches/2.7/http/javascripts/geometry.js
===================================================================
--- branches/2.7/http/javascripts/geometry.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/geometry.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -503,13 +503,16 @@
GeometryArray.prototype.importMultiPolygon = function(currentGeometry, featureEpsg){
var coordinates = currentGeometry.coordinates;
-
+
this.addMember(geomType.polygon);
for (var m = 0; m < coordinates.length; m++) {
+
this.get(-1).addGeometry();
var currentPolygon = coordinates[m];
+
for (var n = 0; n < currentPolygon.length; n++) {
var currentRing = currentPolygon[n];
+
if (n === 0) {
for (var p = 0; p < currentRing.length; p++) {
var currentPoint = currentRing[p];
@@ -2458,14 +2461,13 @@
this.add(currentRing.get(k));
}
}
-
}
}
// lines, points, outer rings
- for (var k = 0 ; k < geom.get(i).get(j).count() ; k++){
- if ((geom.get(i).get(j).isComplete() === true && typeof(point) == 'undefined') || (typeof(point) != 'undefined' && !geom.get(i).get(j).get(k).equals(point))){
+ for (var k = 0 ; k < geom.get(i).get(j).count() ; k++) {
+ //if ((geom.get(i).get(j).isComplete() === true && typeof(point) == 'undefined') || (typeof(point) != 'undefined' && !geom.get(i).get(j).get(k).equals(point))){
this.add(geom.getPoint(i, j, k));
- }
+ //}
}
}
else {
Modified: branches/2.7/http/javascripts/initWmcObj.php
===================================================================
--- branches/2.7/http/javascripts/initWmcObj.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/initWmcObj.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -9,6 +9,7 @@
require_once dirname(__FILE__)."/../../lib/class_GetApi.php";
require_once dirname(__FILE__)."/../classes/class_elementVar.php";
require_once(dirname(__FILE__) . "/../classes/class_tou.php");
+require_once(dirname(__FILE__)."/../classes/class_connector.php");
function getConfiguration ($key) {
//check if key param can be found in SESSION,
@@ -62,8 +63,15 @@
$wmc = new wmc();
$app = Mapbender::session()->get("mb_user_gui");
-$wmcDocSession = Mapbender::session()->get("mb_wmc");
+//$wmcDocSession = Mapbender::session()->get("mb_wmc");
+$wmcDocSession = false;
+if(Mapbender::session()->get("mb_wmc")) {
+ $wmc_filename = Mapbender::session()->get("mb_wmc");
+ $wmcDocSession = file_get_contents($wmc_filename);
+}
+
+
try {
$loadFromSession = new ElementVar($app, "loadwmc", "loadFromSession");
if ($wmcDocSession && $loadFromSession->value === "1") {
@@ -119,6 +127,8 @@
// just make it work for a single Wmc
try {
$wmcGetApi = WmcFactory::createFromDb($input["id"]);
+ //increment load count
+ $wmcGetApi->incrementWmcLoadCount();
}
catch (Exception $e) {
new mb_exception("Failed to load WMC from DB. Keeping original WMC.");
@@ -409,8 +419,25 @@
//check if tou has already been read - if not show them in the message
$resultOfCheck = $classTou->check('wms',$WMS['id']);
if ($resultOfCheck['accepted'] == 0) {
- $tou .= $resourceSymbol." <a href='http://".$hostName."/mapbender/php/mod_showMetadata.php?resource=wms&layout=tabs&id=".$WMS['id']."&languageCode=".$languageCode."'>".$WMS['title']."</a><br>";
- $tou .= file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true")."<br>";
+ $tou .= $resourceSymbol." <a href='../php/mod_showMetadata.php?resource=wms&layout=tabs&id=".$WMS['id']."&languageCode=".$languageCode."' target='_blank'>".$WMS['title']."</a><br>";
+
+ if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+ $mapbenderProtocol = "https://";
+ $mapbenderBaseUrl = "https://".$hostName;
+ }
+ else {
+ $mapbenderProtocol = "http://";
+ $mapbenderBaseUrl = "http://".$hostName;
+ }
+
+
+
+
+
+
+
+ $touServiceConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../../php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
+ $tou .= $touServiceConnector->file;
//set the tou to be accepted - TODO maybe do this after the button which deletes the message window - from a ajax request.
$classTou->set('wms',$WMS['id']);
}
Modified: branches/2.7/http/javascripts/mod_addWMSfromfilteredList_ajax.php
===================================================================
--- branches/2.7/http/javascripts/mod_addWMSfromfilteredList_ajax.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/mod_addWMSfromfilteredList_ajax.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -1,28 +1,58 @@
<?php
/**
- * Package: <Application element name>
+ * Package: AddWMSfromfilteredList_ajax
*
* Description:
- * <A description>
+ * Shows all WMS services contained in an authorized GUI
+ * Shows list of all available WMS with abstract description
+ * Adds selected WMS to current application
+ * checkbox to ctivate layer on load, checkbox to zoom to WMS extent on load
*
* Files:
- * - <path and filename, like http/javascripts/mod_zoomIn1.php>
+ * - http/javascripts/mod_addWMSfromfilteredList_ajax.php
*
* SQL:
- * > <SQL for element>
+ * > INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public,
+ * > e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top,
+ * > e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag,
+ * > e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES(
+ * > '<app_id>','addWMSfromfilteredList_ajax',2,1,'add a WMS to the running application from a filtered list',
+ * > 'Adding WMS from filtered list','img','../img/button_gray/add_filtered_list_off.png',
+ * > '',620,60,24,24,1,'','','','mod_addWmsFromFilteredList_button.php',
+ * > 'mod_addWMSgeneralFunctions.js,popup.js','treeGDE,mapframe1','loadData',
+ * > 'http://www.mapbender.org/index.php/Add_WMS_from_filtered_list');
+ * >
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value,
+ * > context, var_type) VALUES('<app_id>', 'addWMSfromfilteredList_ajax', 'capabilitiesInput',
+ * > '1', 'load wms by capabilities url' ,'var');
+ * >
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value,
+ * > context, var_type) VALUES('<app_id>', 'addWMSfromfilteredList_ajax', 'option_dball',
+ * > '1', '1 enables option "load all configured wms from db"' ,'var');
+ * >
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value,
+ * > context, var_type) VALUES('<app_id>', 'addWMSfromfilteredList_ajax', 'option_dbgroup',
+ * > '0', '1 enables option "load configured wms by group"' ,'var');
+ * >
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value,
+ * > context, var_type) VALUES('<app_id>', 'addWMSfromfilteredList_ajax', 'option_dbgui',
+ * > '0', '1 enables option "load configured wms by application"' ,'var');
* >
- * > <SQL for element var>
+ * > INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES
+ * > ('<app_id>', 'addWMSfromfilteredList_ajax', 'addwms_showWMS', '4', '' ,'var');
*
* Help:
- * http://www.mapbender.org/<wiki site name>
+ * http://www.mapbender.org/Add_WMS_from_filtered_list_%28AJAX%29
*
* Maintainer:
- * http://www.mapbender.org/User:<user>
+ * http://www.mapbender.org/User:Christoph_Baudson
*
* Parameters:
- * <normal element var name> - <type and description>
- * <optional element var name> - *[optional]* <type and description>
- * <deprecated element var name> - *[deprecated]* <type and description>
+ * addwms_showWMS - x
+ * capabilitiesInput - show input field to load wms by capabilities url
+ * option_dball - load all configured wms from db
+ * option_dbgroup - load configured wms by group
+ * option_dbgui - load configured wms by application
*
* License:
* Copyright (c) 2009, Open Source Geospatial Foundation
@@ -63,7 +93,7 @@
<?php printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />",CHARSET); ?>
<title>Add WMS</title>
<link rel="stylesheet" type="text/css" href="<?php echo $theme;?>" />
- <script type='text/javascript' src='../extensions/jquery-ui-1.8.1.custom/js/jquery-1.4.2.min'></script>
+ <script type='text/javascript' src='../extensions/jquery-ui-1.8.1.custom/js/jquery-1.4.2.min.js'></script>
<script type='text/javascript' src='../extensions/jquery-ui-1.8.1.custom/js/jquery-ui-1.8.1.custom.min.js'></script>
<script type="text/javascript">
<?php
Property changes on: branches/2.7/http/javascripts/mod_sandclock.js
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/mapbender/http/javascripts/mod_sandclock.js:7363-7474
Modified: branches/2.7/http/javascripts/mod_savewmc.js
===================================================================
--- branches/2.7/http/javascripts/mod_savewmc.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/mod_savewmc.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -57,6 +57,29 @@
var overwrite = options.overwrite || false;
var saveInSession = typeof options.saveInSession === "undefined" ?
0 : options.saveInSession;
+
+var browserCompatibilityMode = typeof options.browserCompatibilityMode === "undefined" ?
+ 0 : options.browserCompatibilityMode;
+
+var userAgent = navigator.userAgent;
+
+var pattern1=/Chrome/gi;
+var pattern2=/Konqueror/gi;
+var pattern3=/Opera/gi;
+//alert(userAgent.match(pattern));
+if (userAgent.match(pattern1) || userAgent.match(pattern2) || userAgent.match(pattern3)) {
+ //alert("Identified Browser don't support beforeunload sufficiently - the application will be slower than normal!");
+ browserCompatibilityMode = 1;
+}
+
+function pausecomp(millis) { //http://www.sean.co.uk/a/webdesign/javascriptdelay.shtm
+ var date = new Date();
+ var curDate = null;
+ do { curDate = new Date(); }
+ while(curDate-date < millis);
+}
+
+
if (typeof originalI18nObj !== "object") {
var originalI18nObj = {};
}
@@ -312,16 +335,71 @@
}
});
- Mapbender.events.init.register(function () {
+ Mapbender.events.afterInit.register(function(){
if (saveInSession === 1) {
- options.$target.each(function () {
- $(this).mapbender().events.afterMapRequest.register(function () {
- that.save({
- session : true
+ if (browserCompatibilityMode === 0) {
+ options.$target.each(function () {
+ var supportsOnbeforeunload = true; //TODO: The problem is the time for a job on onunload - there is not much. Therefor only simple things work - not saving a huge amount of data thru ajax
+ /*for (var prop in window) {
+ if (prop === 'onbeforeunload') {
+ supportsOnbeforeunload = true;
+
+ break;
+ }
+ }*/
+ //alert("Support of onBeforeUnload: "+supportsOnbeforeunload+" Browser:"+navigator.userAgent);
+ if (supportsOnbeforeunload) {
+ //$(window).bind('beforeunload', function(){//after hint in web http://stackoverflow.com/questions/4376596/jquery-unload-or-beforeunload
+ window.onbeforeunload = function(e){//after hint in web http://stackoverflow.com/questions/4376596/jquery-unload-or-beforeunload
+ var e = e || window.event;
+ //alert("Write WMC to session - onBeforeUnload!");
+ if (!window.resetSession) {
+ that.save({
+ session : true
+ });
+ //alert("Save Context!");
+ }
+ pausecomp(1000); //hope that fix the synro problem
+ /*// For IE and Firefox
+ if (e) {
+ e.returnValue = 'Any string';
+ }
+ // For Safari
+ return 'Any string';*/
+ };
+ } else {
+ $(window).bind('unload', function(){
+ //alert("Write WMC to session - onUnload!");
+ if (!window.resetSession) {
+ that.save({
+ session : true
+ });
+ //alert("no reset of session stored wmc requested - wmc will be saved into session!");
+ }
+ });
+ }
+ });
+ } else {
+ //alert("Your are in a browser compatibility mode - this make the application slow!");
+ // hack to attach the eventhandler after all initial wms have been added to the map
+ setTimeout(function(){
+ options.$target.each(function () {
+ $(this).mapbender().events.afterMapRequest.register(function () {
+ if (!window.resetSession) {
+ that.save({
+ session : true
+ });
+ //alert("no reset of session stored wmc requested - wmc will be saved into session!");
+ }
+ });
});
- });
- });
+ },5000);
+ }
+
}
+
+ });
+ Mapbender.events.init.register(function () {
var t = translatedI18nObj;
var savewmcHtml = '<div id="' + options.id + '_saveWMCForm" ' +
Modified: branches/2.7/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- branches/2.7/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -1,48 +1,48 @@
-<?php
-# $Id: mod_wfsGazetteerEditor_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"];
-$target = $_REQUEST["e_target"];
-$e_id_css = $_REQUEST["e_id_css"];
-$isLoaded = $_REQUEST["isLoaded"];
-
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+<?php
+# $Id: mod_wfsGazetteerEditor_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"];
+$target = $_REQUEST["e_target"];
+$e_id_css = $_REQUEST["e_id_css"];
+$isLoaded = $_REQUEST["isLoaded"];
+
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+
+$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_wfsGazetteerEditor</title>
-<STYLE TYPE="text/css">
-<!--
-div.mainDiv {
- width: 330px;
+<STYLE TYPE="text/css">
+<!--
+div.mainDiv {
+ width: 330px;
}
-
-input.op {
- width: 32px;
+
+input.op {
+ width: 32px;
}
div.helptext {
@@ -72,109 +72,110 @@
a img {
vertical-align: middle;
border: 0;
-}
--->
-</STYLE>
-<?php
-include '../include/dyn_css.php';
-?>
-<script type="text/javascript">
-<?php
- include '../include/dyn_js.php';
- include '../include/dyn_php.php';
- //include("../../conf/" . $wfs_spatial_request_conf_filename);
-
- echo "var targetString = '" . $target . "';";
- echo "var e_id_css = '" . $e_id_css . "';";
-
- require(dirname(__FILE__)."/../javascripts/wfsFilter.js");
-
-?>
-// Element var maxHighlightedPoints
-try{
- if (maxHighlightedPoints){
- maxHighlightedPoints = Number(maxHighlightedPoints);
-
- if (isNaN(maxHighlightedPoints)) {
- var e = new parent.Mb_warning("mod_wfsGazetteerEditor_client.php: Element var maxHighlightedPoints must be a number.");
- }
- }
-}
-catch(e){
- maxHighlightedPoints = 0;
- var e = new parent.Mb_warning("mod_wfsGazetteerEditor_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
-}
-
-var otherFrame = parent.window.frames[e_id_css];
+}
+-->
+</STYLE>
+<?php
+include '../include/dyn_css.php';
+?>
+<script type="text/javascript">
<?php
+ include '../include/dyn_js.php';
+ include '../include/dyn_php.php';
+ include("../../conf/" . $wfs_spatial_request_conf_filename);
-//var global_selectedWfsConfId = otherFrame.global_selectedWfsConfId;
-$wfsConfId = $_GET['wfsConfId'];
-echo "var global_selectedWfsConfId = $wfsConfId;\n";
+ echo "var targetString = '" . $target . "';";
+ echo "var e_id_css = '" . $e_id_css . "';";
+
+ require(dirname(__FILE__)."/../javascripts/wfsFilter.js");
+
?>
-parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConf",wfsConfIdString: global_selectedWfsConfId }, function(json,status){
- global_wfsConfObj = json['0'];
-});
-//var global_wfsConfObj = otherFrame.global_wfsConfObj;
-
-var targetArray = targetString.split(",");
-var global_resultHighlight;
-var requestGeometryHighlight;
-var point_px = 10;
-var resultGeom = null;
-var cw_fillcolor = "#cc33cc";
-var frameName = e_id_css + "_";
-var inputNotEnough = [];
-
-var button_point = "point";
-var button_polygon = "polygon";
-var button_rectangle = "rectangle";
-var button_extent = "extent";
-var mb_wfs_tolerance = 8;
-var activeButton = null;
-var mod_wfs_spatialRequest_geometry = null;
-var mod_wfs_spatialRequest_frameName = "";
-var mod_wfs_spatialRequest_epsg;
-var mod_wfs_spatialRequest_width;
-var mod_wfs_spatialRequest_height;
-var buttonWfs_id = [];
-var buttonWfs_on = [];
-var buttonWfs_src = [];
-var buttonWfs_title_off = [];
-var buttonWfs_title_on = [];
-var buttonWfs_x = [];
-var buttonWfs_y = [];
-
-
-/**
- * This Geometry contains the geometry of the optinal spatial constraint
- */
-var spatialRequestGeom = null;
-
-/**
- * Something like box, polygon, point, extent
- */
-var spatialRequestType = null;
-
-/**
- * This Geometry contains the result from the WFS request
- */
-var geomArray = null;
-
-var frameIsReady = function () {
- init_wfsSpatialRequest();
- appendWfsForm();
- appendStyles();
-
- setWfsInfo();
-
- // creates a Highlight object for the request geometry
- var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
- requestGeometryHighlight = new parent.Highlight(targetArray, "requestGeometryHighlight", styleProperties, 2);
- parent.mb_registerSubFunctions("window.frames['" + frameName +"'].requestGeometryHighlight.paint()");
-
+// Element var maxHighlightedPoints
+try{
+ if (maxHighlightedPoints){
+ maxHighlightedPoints = Number(maxHighlightedPoints);
+
+ if (isNaN(maxHighlightedPoints)) {
+ var e = new parent.Mb_warning("mod_wfsGazetteerEditor_client.php: Element var maxHighlightedPoints must be a number.");
+ }
+ }
}
+catch(e){
+ maxHighlightedPoints = 0;
+ var e = new parent.Mb_warning("mod_wfsGazetteerEditor_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
+}
+var otherFrame = parent.window.frames[e_id_css];
+<?php
+
+//var global_selectedWfsConfId = otherFrame.global_selectedWfsConfId;
+$wfsConfId = $_REQUEST['wfsConfId'];
+echo "var global_selectedWfsConfId = '$wfsConfId';\n";
+?>
+//var global_wfsConfObj = otherFrame.global_wfsConfObj;
+
+var targetArray = targetString.split(",");
+var global_resultHighlight;
+var requestGeometryHighlight;
+var point_px = 10;
+var resultGeom = null;
+var cw_fillcolor = "#cc33cc";
+var frameName = e_id_css + "_";
+var inputNotEnough = [];
+
+var button_point = "point";
+var button_polygon = "polygon";
+var button_rectangle = "rectangle";
+var button_extent = "extent";
+var mb_wfs_tolerance = 8;
+var activeButton = null;
+var mod_wfs_spatialRequest_geometry = null;
+var mod_wfs_spatialRequest_frameName = "";
+var mod_wfs_spatialRequest_epsg;
+var mod_wfs_spatialRequest_width;
+var mod_wfs_spatialRequest_height;
+var buttonWfs_id = [];
+var buttonWfs_on = [];
+var buttonWfs_src = [];
+var buttonWfs_title_off = [];
+var buttonWfs_title_on = [];
+var buttonWfs_x = [];
+var buttonWfs_y = [];
+
+
+/**
+ * This Geometry contains the geometry of the optinal spatial constraint
+ */
+var spatialRequestGeom = null;
+
+/**
+ * Something like box, polygon, point, extent
+ */
+var spatialRequestType = null;
+
+/**
+ * This Geometry contains the result from the WFS request
+ */
+var geomArray = null;
+
+var frameIsReady = function () {
+
+ parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConf",wfsConfIdString: global_selectedWfsConfId }, function(json,status){
+ global_wfsConfObj = json;
+ init_wfsSpatialRequest();
+ appendWfsForm();
+ appendStyles();
+
+ setWfsInfo();
+
+ // creates a Highlight object for the request geometry
+ var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
+ requestGeometryHighlight = new parent.Highlight(targetArray, "requestGeometryHighlight", styleProperties, 2);
+ parent.mb_registerSubFunctions("window.frames['" + frameName +"'].requestGeometryHighlight.paint()");
+ });
+
+}
+
function showHelptext(helptextId) {
hideHelptext();
document.getElementById('helptext' + helptextId).style.visibility = 'visible';
@@ -195,352 +196,350 @@
helptext[i].style.display = 'none';
}
}
-}
-
-function trim(string) {
- return string.replace(/^\s+/, '').replace(/\s+$/, '');
-}
-
-function removeChildNodes(node) {
- if (node) {
- while (node.childNodes.length > 0) {
- var childNode = node.firstChild;
- node.removeChild(childNode);
- }
- }
-}
-
-/**
- * removes whitespaces and endlines before and after a string
- *
- */
-function trimString (str) {
- return str.replace(/^\s+|\s+|\n+$/g, '');
-}
-
-function openwindow(Adresse) {
- Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
- Fenster1.focus();
-}
-
-function setWfsInfo() {
- //
- // append bulb image
- //
- var bulbNode = document.getElementById("wfsInfo");
- 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.");
- }
-}
-/*
- * ---------------------------------------------------
- * BUTTON HANDLING
- * ---------------------------------------------------
- */
-function addButtonWfs(id, isOn, src, title, x, y) {
- buttonWfs_id.push(id);
- buttonWfs_on.push(isOn);
- buttonWfs_src.push(src);
- buttonWfs_title_off.push(title);
- buttonWfs_title_on.push(title);
- buttonWfs_x.push(x);
- buttonWfs_y.push(y);
-}
-
-function init_wfsSpatialRequest() {
- buttonWfs_id = [];
- buttonWfs_on = [];
- buttonWfs_src = [];
- buttonWfs_title_off = [];
- buttonWfs_title_on = [];
- buttonWfs_x = [];
- buttonWfs_y = [];
- addButtonWfs("rectangle", buttonRectangle.status, buttonRectangle.img, buttonRectangle.title, buttonRectangle.x, buttonRectangle.y);
- addButtonWfs("polygon", buttonPolygon.status, buttonPolygon.img, buttonPolygon.title, buttonPolygon.x, buttonPolygon.y);
- addButtonWfs("point", buttonPoint.status, buttonPoint.img, buttonPoint.title, buttonPoint.x, buttonPoint.y);
- addButtonWfs("extent", buttonExtent.status, buttonExtent.img, buttonExtent.title, buttonExtent.x, buttonExtent.y);
- displayButtons();
-}
-
-function wfsInitFunction (j) {
- var functionCall = "parent.mb_regButton_frame('initWfsButton', '"+frameName+"', "+j+")";
- var x = new Function ("", functionCall);
- x();
-}
-
-function initWfsButton(ind, pos) {
- parent.mb_button[ind] = document.getElementById(buttonWfs_id[pos]);
- parent.mb_button[ind].img_over = buttonWfs_imgdir + buttonWfs_src[pos].replace(/_off/,"_over");
- parent.mb_button[ind].img_on = buttonWfs_imgdir + buttonWfs_src[pos].replace(/_off/,"_on");
- parent.mb_button[ind].img_off = buttonWfs_imgdir + buttonWfs_src[pos];
- parent.mb_button[ind].status = 0;
- parent.mb_button[ind].elName = buttonWfs_id[pos];
- parent.mb_button[ind].frameName = frameName;
- parent.mb_button[ind].go = new Function ("requestGeometryHighlight.clean();wfsEnable(parent.mb_button["+ind+"], " + pos + ")");
- parent.mb_button[ind].stop = new Function ("wfsDisable(parent.mb_button["+ind+"], " + pos + ")");
- var ind = parent.getMapObjIndexByName("mapframe1");
- mod_wfs_spatialRequest_width = parent.mb_mapObj[ind].width;
- mod_wfs_spatialRequest_height = parent.mb_mapObj[ind].height;
- mod_wfs_spatialRequest_epsg = parent.mb_mapObj[ind].epsg;
- parent.mb_registerPanSubElement("measuring");
-}
-
-function displayButtons() {
- for (var i = 0 ; i < buttonWfs_id.length ; i ++) {
- if (parseInt(buttonWfs_on[i])==1) {
- var currentImg = document.createElement("img");
- currentImg.id = buttonWfs_id[i];
- currentImg.name = buttonWfs_id[i];
- currentImg.title = buttonWfs_title_off[i];
- currentImg.src = buttonWfs_imgdir+buttonWfs_src[i];
- currentImg.style.position = "absolute";
- currentImg.style.top = buttonWfs_y[i];
- currentImg.style.left = buttonWfs_x[i];
- currentImg.onmouseover = new Function("wfsInitFunction("+i+")");
-
- document.getElementById("displaySpatialButtons").appendChild(currentImg);
- }
- }
-}
-
-function disableButtons() {
- removeChildNodes(document.getElementById("displaySpatialButtons"));
-}
-
-function wfsEnable(obj) {
- var el = parent.window.frames["mapframe1"].document;
- el.onmouseover = null;
- el.onmousedown = null;
- el.onmouseup = null;
- el.onmousemove = null;
-
- if (obj.id == button_point) {
- if (activeButton == null) {
- activeButton = obj;
- }
- }
- if (obj.id == button_polygon) {
- if (activeButton == null) {
- activeButton = obj;
- }
- }
- else if (obj.id == button_rectangle){
- if (activeButton == null) {
- activeButton = obj;
- }
- }
- else if (obj.id == button_extent){
- if (activeButton == null) {
- activeButton = obj;
- }
- }
- callRequestGeometryConstructor(obj, "mapframe1");
-}
-
-
-function wfsDisable(obj) {
- var el = parent.window.frames["mapframe1"].document;
- el.onmousedown = null;
- el.ondblclick = null;
- el.onmousemove = null;
- parent.writeTag("mapframe1","measure_display","");
- parent.writeTag("mapframe1","measure_sub","");
- activeButton = null;
-}
-
-/*
- * ---------------------------------------------------
- * Request geometry
- * ---------------------------------------------------
- */
-
-function callRequestGeometryConstructor(pressedButton,target){
- var selectedType = pressedButton.id;
-
- spatialRequestType = selectedType;
- var geometryConstructor = new parent.RequestGeometryConstructor(target);
- geometryConstructor.getGeometry(selectedType,function(target,queryGeom){
- //
- // callback function; called when query geometry has been
- // constructed by user.
- //
- if (queryGeom !='') {
- spatialRequestGeom = queryGeom;
-
- // disable the selected button
- parent.mb_disableThisButton(pressedButton.elName);
-
- // spatialRequestGeom is a Geometry, but for the highlight
- // a MultiGeometry is needed.
- var multiGeom;
- // a line represents a bbox...but highlight must be a polyon
- // (extent or box selection)
- if (spatialRequestGeom.geomType == parent.geomType.line) {
- multiGeom = new parent.MultiGeometry(parent.geomType.polygon);
- newGeom = new parent.Geometry(parent.geomType.polygon);
- var p1 = spatialRequestGeom.get(0);
- var p2 = spatialRequestGeom.get(1);
- newGeom.addPoint(p1);
- newGeom.addPointByCoordinates(p1.x, p2.y);
- newGeom.addPoint(p2);
- newGeom.addPointByCoordinates(p2.x, p1.y);
- newGeom.close();
- multiGeom.add(newGeom);
- }
- // standard case
- // (polygon and point selection)
- else {
- multiGeom = new parent.MultiGeometry(spatialRequestGeom.geomType);
- multiGeom.add(spatialRequestGeom);
- }
-
- // add highlight of geometry
- requestGeometryHighlight.add(multiGeom);
- requestGeometryHighlight.paint();
-
- // add button for geometry deletion
- var deleteGeomButton = document.getElementById("deleteRequestGeometry");
- deleteGeomButton.style.display = "block";
- deleteGeomButton.onclick = function () {
- spatialRequestGeom = null;
- this.style.display = "none";
- requestGeometryHighlight.clean();
- requestGeometryHighlight.paint();
- }
- }
- });
-}
-
-//----------------------------------------------------------------------------------
-
-
-/*
- * Appends styles to the pre-configured WFS form
- */
-function appendStyles() {
- var styleObj;
- var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
- if (parent.ie) {
- var styleSheetObj=document.createStyleSheet();
- styleObj=styleSheetObj.owningElement || styleSheetObj.ownerNode;
- styleObj.setAttribute("type","text/css");
- ruleArray = rule.split("}");
- for (var i=0; i < ruleArray.length - 1; i++) {
- var currentRule = trimString(ruleArray[i]);
- var nameValueArray = currentRule.split("{");
- var name = nameValueArray[0];
- var value = nameValueArray[1];
- styleSheetObj.addRule(name,value);
- }
- }
- else {
- styleObj=document.createElement("style");
- styleObj.setAttribute("type","text/css");
- document.getElementsByTagName("head")[0].appendChild(styleObj);
- styleObj.appendChild(document.createTextNode(rule+"\n"));
- }
-}
-
-function isSearchPreconfigured () {
- var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
- for (var i = 0; i < wfsConfElementArray.length; i++){
- if (parseInt(wfsConfElementArray[i].f_search)) {
- return true;
- }
- }
- return false;
-}
-
-function appendWfsForm() {
- var form = document.getElementById("wfsForm");
- removeChildNodes(form);
-
- if(!isSearchPreconfigured()){
- /*
- * Appends the WFS editor
- */
- document.getElementById("mainDiv").style.display = "block";
- fillLeftList();
- }
- else{
-
- /*
- * Appends the pre-configured WFS form
- */
- var divContainer = document.createElement("div");
- divContainer.className = global_wfsConfObj[global_selectedWfsConfId].g_label_id;
- divContainer.innerHTML = global_wfsConfObj[global_selectedWfsConfId].g_label;
-
- form.appendChild(divContainer);
-
- var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
-
- for (var i = 0; i < wfsConfElementArray.length; i++){
- if (parseInt(wfsConfElementArray[i].f_search)) {
- var spanNode = document.createElement("span");
- spanNode.setAttribute("id", "ttttt");
- spanNode.className = wfsConfElementArray[i].f_label_id;
- spanNode.innerHTML = wfsConfElementArray[i].f_label;
- var inputNode = document.createElement("input");
- inputNode.type = "text";
- inputNode.className = wfsConfElementArray[i].f_style_id;
+}
+
+function trim(string) {
+ return string.replace(/^\s+/, '').replace(/\s+$/, '');
+}
+
+function removeChildNodes(node) {
+ if (node) {
+ while (node.childNodes.length > 0) {
+ var childNode = node.firstChild;
+ node.removeChild(childNode);
+ }
+ }
+}
+
+/**
+ * removes whitespaces and endlines before and after a string
+ *
+ */
+function trimString (str) {
+ return str.replace(/^\s+|\s+|\n+$/g, '');
+}
+
+function openwindow(Adresse) {
+ Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
+ Fenster1.focus();
+}
+
+function setWfsInfo() {
+ //
+ // append bulb image
+ //
+ var bulbNode = document.getElementById("wfsInfo");
+ 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.");
+ }
+}
+/*
+ * ---------------------------------------------------
+ * BUTTON HANDLING
+ * ---------------------------------------------------
+ */
+function addButtonWfs(id, isOn, src, title, x, y) {
+ buttonWfs_id.push(id);
+ buttonWfs_on.push(isOn);
+ buttonWfs_src.push(src);
+ buttonWfs_title_off.push(title);
+ buttonWfs_title_on.push(title);
+ buttonWfs_x.push(x);
+ buttonWfs_y.push(y);
+}
+
+function init_wfsSpatialRequest() {
+ buttonWfs_id = [];
+ buttonWfs_on = [];
+ buttonWfs_src = [];
+ buttonWfs_title_off = [];
+ buttonWfs_title_on = [];
+ buttonWfs_x = [];
+ buttonWfs_y = [];
+ addButtonWfs("rectangle", buttonRectangle.status, buttonRectangle.img, buttonRectangle.title, buttonRectangle.x, buttonRectangle.y);
+ addButtonWfs("polygon", buttonPolygon.status, buttonPolygon.img, buttonPolygon.title, buttonPolygon.x, buttonPolygon.y);
+ addButtonWfs("point", buttonPoint.status, buttonPoint.img, buttonPoint.title, buttonPoint.x, buttonPoint.y);
+ addButtonWfs("extent", buttonExtent.status, buttonExtent.img, buttonExtent.title, buttonExtent.x, buttonExtent.y);
+ displayButtons();
+}
+
+function wfsInitFunction (j) {
+ parent.mb_regButton_frame('initWfsButton',frameName,j);
+}
+
+function initWfsButton(ind, pos) {
+ parent.mb_button[ind] = document.getElementById(buttonWfs_id[pos]);
+ parent.mb_button[ind].img_over = buttonWfs_imgdir + buttonWfs_src[pos].replace(/_off/,"_over");
+ parent.mb_button[ind].img_on = buttonWfs_imgdir + buttonWfs_src[pos].replace(/_off/,"_on");
+ parent.mb_button[ind].img_off = buttonWfs_imgdir + buttonWfs_src[pos];
+ parent.mb_button[ind].status = 0;
+ parent.mb_button[ind].elName = buttonWfs_id[pos];
+ parent.mb_button[ind].frameName = frameName;
+ parent.mb_button[ind].go = new Function ("requestGeometryHighlight.clean();wfsEnable(parent.mb_button["+ind+"], " + pos + ")");
+ parent.mb_button[ind].stop = new Function ("wfsDisable(parent.mb_button["+ind+"], " + pos + ")");
+ var ind = parent.getMapObjIndexByName("mapframe1");
+ mod_wfs_spatialRequest_width = parent.mb_mapObj[ind].width;
+ mod_wfs_spatialRequest_height = parent.mb_mapObj[ind].height;
+ mod_wfs_spatialRequest_epsg = parent.mb_mapObj[ind].epsg;
+ parent.mb_registerPanSubElement("measuring");
+}
+
+function displayButtons() {
+ for (var i = 0 ; i < buttonWfs_id.length ; i ++) {
+ if (parseInt(buttonWfs_on[i])==1) {
+ var currentImg = document.createElement("img");
+ currentImg.id = buttonWfs_id[i];
+ currentImg.name = buttonWfs_id[i];
+ currentImg.title = buttonWfs_title_off[i];
+ currentImg.src = buttonWfs_imgdir+buttonWfs_src[i];
+ currentImg.style.position = "absolute";
+ currentImg.style.top = buttonWfs_y[i];
+ currentImg.style.left = buttonWfs_x[i];
+ currentImg.onmouseover = new Function("wfsInitFunction("+i+")");
+
+ document.getElementById("displaySpatialButtons").appendChild(currentImg);
+ }
+ }
+}
+
+function disableButtons() {
+ removeChildNodes(document.getElementById("displaySpatialButtons"));
+}
+
+function wfsEnable(obj) {
+ var el = parent.window.document;
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+
+ if (obj.id == button_point) {
+ if (activeButton == null) {
+ activeButton = obj;
+ }
+ }
+ if (obj.id == button_polygon) {
+ if (activeButton == null) {
+ activeButton = obj;
+ }
+ }
+ else if (obj.id == button_rectangle){
+ if (activeButton == null) {
+ activeButton = obj;
+ }
+ }
+ else if (obj.id == button_extent){
+ if (activeButton == null) {
+ activeButton = obj;
+ }
+ }
+ callRequestGeometryConstructor(obj, "mapframe1");
+}
+
+
+function wfsDisable(obj) {
+ var el = parent.window.document;
+ el.onmousedown = null;
+ el.ondblclick = null;
+ el.onmousemove = null;
+ parent.writeTag("mapframe1","measure_display","");
+ parent.writeTag("mapframe1","measure_sub","");
+ activeButton = null;
+}
+
+/*
+ * ---------------------------------------------------
+ * Request geometry
+ * ---------------------------------------------------
+ */
+
+function callRequestGeometryConstructor(pressedButton,target){
+ var selectedType = pressedButton.id;
+
+ spatialRequestType = selectedType;
+ var geometryConstructor = new parent.RequestGeometryConstructor(target);
+ geometryConstructor.getGeometry(selectedType,function(target,queryGeom){
+ //
+ // callback function; called when query geometry has been
+ // constructed by user.
+ //
+ if (queryGeom !='') {
+ spatialRequestGeom = queryGeom;
+
+ // disable the selected button
+ parent.mb_disableThisButton(pressedButton.elName);
+
+ // spatialRequestGeom is a Geometry, but for the highlight
+ // a MultiGeometry is needed.
+ var multiGeom;
+ // a line represents a bbox...but highlight must be a polyon
+ // (extent or box selection)
+ if (spatialRequestGeom.geomType == parent.geomType.line) {
+ multiGeom = new parent.MultiGeometry(parent.geomType.polygon);
+ newGeom = new parent.Geometry(parent.geomType.polygon);
+ var p1 = spatialRequestGeom.get(0);
+ var p2 = spatialRequestGeom.get(1);
+ newGeom.addPoint(p1);
+ newGeom.addPointByCoordinates(p1.x, p2.y);
+ newGeom.addPoint(p2);
+ newGeom.addPointByCoordinates(p2.x, p1.y);
+ newGeom.close();
+ multiGeom.add(newGeom);
+ }
+ // standard case
+ // (polygon and point selection)
+ else {
+ multiGeom = new parent.MultiGeometry(spatialRequestGeom.geomType);
+ multiGeom.add(spatialRequestGeom);
+ }
+
+ // add highlight of geometry
+ requestGeometryHighlight.add(multiGeom);
+ requestGeometryHighlight.paint();
+
+ // add button for geometry deletion
+ var deleteGeomButton = document.getElementById("deleteRequestGeometry");
+ deleteGeomButton.style.display = "block";
+ deleteGeomButton.onclick = function () {
+ spatialRequestGeom = null;
+ this.style.display = "none";
+ requestGeometryHighlight.clean();
+ requestGeometryHighlight.paint();
+ }
+ }
+ });
+}
+
+//----------------------------------------------------------------------------------
+
+
+/*
+ * Appends styles to the pre-configured WFS form
+ */
+function appendStyles() {
+ var styleObj;
+ var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
+ if (parent.ie) {
+ var styleSheetObj=document.createStyleSheet();
+ styleObj=styleSheetObj.owningElement || styleSheetObj.ownerNode;
+ styleObj.setAttribute("type","text/css");
+ ruleArray = rule.split("}");
+ for (var i=0; i < ruleArray.length - 1; i++) {
+ var currentRule = trimString(ruleArray[i]);
+ var nameValueArray = currentRule.split("{");
+ var name = nameValueArray[0];
+ var value = nameValueArray[1];
+ styleSheetObj.addRule(name,value);
+ }
+ }
+ else {
+ styleObj=document.createElement("style");
+ styleObj.setAttribute("type","text/css");
+ document.getElementsByTagName("head")[0].appendChild(styleObj);
+ styleObj.appendChild(document.createTextNode(rule+"\n"));
+ }
+}
+
+function isSearchPreconfigured () {
+ var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
+ for (var i = 0; i < wfsConfElementArray.length; i++){
+ if (parseInt(wfsConfElementArray[i].f_search)) {
+ return true;
+ }
+ }
+ return false;
+}
+
+function appendWfsForm() {
+ var form = document.getElementById("wfsForm");
+ removeChildNodes(form);
+
+ if(!isSearchPreconfigured()){
+ /*
+ * Appends the WFS editor
+ */
+ document.getElementById("mainDiv").style.display = "block";
+ fillLeftList();
+ }
+ else{
+
+ /*
+ * Appends the pre-configured WFS form
+ */
+ var divContainer = document.createElement("div");
+ divContainer.className = global_wfsConfObj[global_selectedWfsConfId].g_label_id;
+ divContainer.innerHTML = global_wfsConfObj[global_selectedWfsConfId].g_label;
+
+ form.appendChild(divContainer);
+
+ var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
+
+ for (var i = 0; i < wfsConfElementArray.length; i++){
+ if (parseInt(wfsConfElementArray[i].f_search)) {
+ var spanNode = document.createElement("span");
+ spanNode.setAttribute("id", "ttttt");
+ spanNode.className = wfsConfElementArray[i].f_label_id;
+ spanNode.innerHTML = wfsConfElementArray[i].f_label;
+ var inputNode = document.createElement("input");
+ inputNode.type = "text";
+ inputNode.className = wfsConfElementArray[i].f_style_id;
inputNode.id = wfsConfElementArray[i].element_name;
- if(wfsConfElementArray[i].f_helptext.length > 0) {
+ if(wfsConfElementArray[i].f_helptext && wfsConfElementArray[i].f_helptext.length > 0) {
var helptextNode = document.createElement('span');
var helptextDisplay = document.createElement('div');
@@ -557,668 +556,683 @@
form.appendChild(spanNode);
form.appendChild(inputNode);
- if(wfsConfElementArray[i].f_helptext.length > 0) { form.appendChild(helptextNode); }
- if(wfsConfElementArray[i].f_helptext.length > 0) { form.appendChild(helptextDisplay); }
- form.appendChild(document.createElement("br"));
- }
- }
-
- var submitButton = document.createElement("input");
- submitButton.type = "submit";
- submitButton.id = "wfsForm_Submit";
- submitButton.className = global_wfsConfObj[global_selectedWfsConfId].g_button_id;
- submitButton.value = global_wfsConfObj[global_selectedWfsConfId].g_button;
-
- form.appendChild(submitButton);
- }
-
- checkSrs();
-}
-function checkSrs(){
- //check SRS
- var ind = parent.getMapObjIndexByName("mapframe1");
- var submit = document.getElementById("wfsForm_Submit");
- var submit_attr = document.getElementById("attrPanel_Submit");
- if(global_wfsConfObj[global_selectedWfsConfId].featuretype_srs!=parent.mb_mapObj[ind].getSRS()){
- var msg = "Das Projektionssystem von Karte und WFS-Featuretype ist unterschiedlich, Abfrage nicht moeglich!\n";
- msg += parent.mb_mapObj[ind].getSRS()+" und "+global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
- alert(msg);
-
- //disable Submit Button
- if(submit)submit.disabled = true;
- if(submit_attr)submit_attr.disabled = true;
-
- }
- else{
- //disable Submit Button
- if(submit)submit.disabled = false;
- if(submit_attr)submit_attr.disabled = false;
- }
-}
-
-
-//------------------------------------------------- start Editor functions
-
-
-
-function fillLeftList() {
- deleteSelectOptions(document.attrPanel.leftList);
- deleteSelectOptions(document.attrPanel.rightList);
- deleteFilterText();
-
- var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
- for (var i = 0 ; i < wfsConf.element.length ; i++) {
- // do not include geometry column
- if (wfsConf.element[i].f_geom != 1) {
- var lLOption = document.createElement("option");
- lLOption.id = "lLOPtion"+i+"_"+wfsConf.element[i].element_type;
- lLOption.value = i;
- lLOption.innerHTML = wfsConf.element[i].element_name;
- document.getElementById("leftList").appendChild(lLOption);
- }
- }
-}
-
- function fillRightList() {
- var chosenLayer = global_wfsConfObj[global_selectedWfsConfId].featuretype_name;
- var layerAttr=document.getElementById("leftList");
- var chosenAttr =layerAttr.options[layerAttr.selectedIndex].text;
- var wfs_getfeature = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature;
-
- deleteSelectOptions(document.attrPanel.rightList);
-
- document.getElementById("progressWheel").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Get features...</td></tr></table>";
-
- var properties = {"command":"getFeature", "wfsFeatureTypeName":chosenLayer, "wfsGetFeatureAttr":chosenAttr, "wfsGetFeature":wfs_getfeature};
- parent.$.post("../x_geoportal/mod_wfsGazetteerEditor_server.php", properties, function (result, status) {
- if (status == "success") {
- var arrFeatureColumnValues = eval('(' + result + ')');
- var i = 0;
- for( var i=0; i<arrFeatureColumnValues.length; i++){
- removeChildNodes(document.getElementById("progressWheel"));
- if(arrFeatureColumnValues[i]!=''){
- var rLOption = document.createElement("option");
- rLOption.id = "rLOption"+i;
- rLOption.value = i;
- rLOption.innerHTML = arrFeatureColumnValues[i];
- document.getElementById("rightList").appendChild(rLOption);
- }
- }
- }
- });
- }
-
-/**
- * writeLeftValueInString()
- * @param {}
- * Doppelklick auf Listeneintrag (Links) => Listenwert wir in Textarea geschrieben
- */
-function writeLeftValueInString(){
- var layerAttr=document.getElementById("leftList");
- var chosenAttr = layerAttr.options[layerAttr.selectedIndex].text;
- if(layerAttr.options[layerAttr.selectedIndex].id.match("int") || layerAttr.options[layerAttr.selectedIndex].id.match("float")){
- controlOperators("int");
- }
- else if(layerAttr.options[layerAttr.selectedIndex].id.match("string")){
- controlOperators("string");
- }
- else if(layerAttr.options[layerAttr.selectedIndex].id.match("date")){
- controlOperators("date");
- }
- else{
- controlOperators("all");
- }
- var attrTxt = "[" + chosenAttr + "]";
- insertAtCursor(document.attrPanel.attrRequestText, attrTxt);
-
-}
-
-function hideOperators(){
- document.getElementById('greaterThan').style.visibility = "hidden";
- document.getElementById('lessThan').style.visibility = "hidden";
- document.getElementById('lessThanOrEqualTo').style.visibility = "hidden";
- document.getElementById('greaterThanOrEqualTo').style.visibility = "hidden";
- document.getElementById('and').style.visibility = "hidden";
- document.getElementById('like').style.visibility = "hidden";
- document.getElementById('equal').style.visibility = "hidden";
- document.getElementById('notEqual').style.visibility = "hidden";
-}
-
-function controlOperators(opType){
- document.getElementById('greaterThan').style.visibility = "visible";
- document.getElementById('lessThan').style.visibility = "visible";
- document.getElementById('lessThanOrEqualTo').style.visibility = "visible";
- document.getElementById('greaterThanOrEqualTo').style.visibility = "visible";
- document.getElementById('and').style.visibility = "visible";
- document.getElementById('like').style.visibility = "visible";
- document.getElementById('equal').style.visibility = "visible";
- document.getElementById('notEqual').style.visibility = "visible";
- if(opType=='int'){
- document.getElementById('like').style.visibility = "hidden";
- }
- else if(opType=='string'){
- document.getElementById('greaterThan').style.visibility = "hidden";
- document.getElementById('lessThan').style.visibility = "hidden";
- document.getElementById('lessThanOrEqualTo').style.visibility = "hidden";
- document.getElementById('greaterThanOrEqualTo').style.visibility = "hidden";
- }
- else if(opType=='date'){
- // do something
- }
- else{
- // do something
- }
-}
-
-/**
- * writeRightValueInString()
- * @param {}
- * Doppelklick auf Listeneintrag (Rechts) => Listenwert wir in Textarea geschrieben
- */
-function writeRightValueInString(){
- var chosenVal =document.getElementById("rightList").options[document.getElementById("rightList").selectedIndex].text;
- insertAtCursor(document.attrPanel.attrRequestText,chosenVal);
-}
-
-
-/**
-* insertOperator
-* @param {type} param
-*/
- function insertOperator(value) {
- var wert = value;
- insertAtCursor(document.attrPanel.attrRequestText, wert);
- }
-
-/**
- * insertAtCursor
- * @param {Textfeld, String} param
- * Fuegt an die Cursorstelle einen Text(String) ein
- */
-function insertAtCursor(myField, myValue) {
-//IE support
- if (document.selection) {
- myField.focus();
- sel = document.selection.createRange();
- sel.text = myValue;
- }
-//MOZILLA/NETSCAPE support
- else if (myField.selectionStart || myField.selectionStart == '0') {
- var startPos = myField.selectionStart;
- var endPos = myField.selectionEnd;
- myField.value = myField.value.substring(0, startPos)
- + myValue
- + myField.value.substring(endPos, myField.value.length);
- } else {
- myField.value += myValue;
- }
-}
-
-/**
- * deleteSelectOptions()
- * @param {}
- *
- */
-
-function deleteSelectOptions(field){
- var numOfOpt = field.length;
- for (i=0; i <numOfOpt; i++){
- field.options[field.length-1] = null;
- }
-}
-
-/**
- * deleteFilterText()
- * @param {type}
- * Button loescht Eintrag im Textfeld (attrRequestText)
- */
- function deleteFilterText() {
- document.attrPanel.attrRequestText.value="";
- }
-
-
- //-------------------------------------------------------------------------
-
-function createWfsFilter () {
- var wfsFilter = new WfsFilter();
-
- /*
- * Add filter from WFS editor
- */
-
- if (!isSearchPreconfigured()) {
- var filter = document.attrPanel.attrRequestText.value;
-
- if (!wfsFilter.parse(filter)) {
- alert("Keine gültige Filterbedingung gesetzt.");
- return false;
- }
- }
-
-
- /*
- * Add filter from pre configured searches
- */
- var filterParameterCount = getNumberOfFilterParameters();
- var el = global_wfsConfObj[global_selectedWfsConfId].element;
-
- if (filterParameterCount != 0) {
- for (var i = 0; i < el.length; i++) {
- if (el[i]['f_search'] == 1) {
-
- var a = document.getElementById(el[i]['element_name']).value.split(",");
- wfsFilter.addPreConfigured(el[i]['element_name'], a, el[i]['f_toupper'], el[i]['f_operator']);
- }
- }
- }
- /*
- * Add filter from request geometry
- */
- if (spatialRequestGeom != null) {
-
- // get SRS
- var srs = global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
-
- // get geometry column name
- var geometryColumnName = "";
- for (var j = 0; j < el.length; j++) {
- if (el[j].f_geom == 1) {
- geometryColumnName = el[j].element_name;
- }
- }
-
- // get filter option
- var filterOption = "";
- var selectedButton;
- if (spatialRequestGeom.geomType == parent.geomType.polygon) {
- selectedButton = buttonPolygon;
- }
- else
- if (spatialRequestGeom.geomType == parent.geomType.line) {
- selectedButton = buttonRectangle;
- }
-
- if (selectedButton.filteroption == 'within') {
- filterOption = "Within";
- }
- else
- if (selectedButton.filteroption == 'intersects') {
- filterOption = "Intersects";
- }
-
- // add spatial filter
- wfsFilter.addSpatial(spatialRequestGeom, geometryColumnName, filterOption, srs);
- }
- return wfsFilter.toString();
-}
-
-/**
- * The filter is calculated from the WFS editor or the pre-comfigured
- * search form, with optional request geometry
- */
- function makeRequest() {
- // hide the result and detail popup
- if (typeof(resultGeometryPopup) != "undefined") {
- resultGeometryPopup.hide();
- }
- if (typeof(wfsPopup) != "undefined") {
- wfsPopup.hide();
- }
-
- // empty the result geometry
- if(geomArray != null && geomArray.count()>0){
- geomArray.empty();
- }
-
- // set the Highlight object for the result geometry
- var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
- global_resultHighlight = new parent.Highlight(targetArray, "wfsGazetteerEditorHighlight", styleProperties, 2);
-
- /*
- * Send WFS request
- */
- document.getElementById("progressWheel").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Searching...</td></tr></table>";
-
- var u = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature + parent.mb_getConjunctionCharacter(global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature);
- u += "REQUEST=getFeature&Typename="+global_wfsConfObj[global_selectedWfsConfId].featuretype_name+"&Version=1.0.0&service=WFS";
- u += "&filter=";
-
- var exportToShape = document.getElementById("exportToShape").checked;
-
- var parameters = {
- command:"getSearchResults",
- "wfs_conf_id":global_selectedWfsConfId,
- "frame":this.name,
- "url":u,
- "filter":createWfsFilter(),
- "backlink":"",
- "exportToShape":exportToShape
- };
-
- if (!isSearchPreconfigured()) {
- parent.mb_ajax_get("../x_geoportal/mod_wfsGazetteerEditor_server.php", parameters, function (jsCode, status) {
- if(status=='success'){
- for (var i=0; i < parent.wms.length; i++) {
- for (var j=0; j < parent.wms[i].objLayer.length; j++) {
- var currentLayer = parent.wms[i].objLayer[j];
- var wms_id = parent.wms[i].wms_id;
- if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
- var layer_name = currentLayer.layer_name;
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
- }
- }
- }
- var geoObj = eval('(' + jsCode + ')');
- if (!exportToShape) {
- if (jsCode) {
- if (typeof(geoObj) == 'object') {
- geomArray = new parent.GeometryArray();
- geomArray.importGeoJSON(geoObj);
- displayPopup(geomArray);
- }
- else {
- displayPopup();
- }
- }
- else {
- alert("Kein Ergebnis.");
- }
- }
- else {
- if (jsCode) {
- var htmlCodeDownload = "<iframe style='visibility:visible' src='../x_geoportal/download.php?download=" + geoObj.filename + "'></iframe>";
- var downloadPopup = new parent.mb_popup("Download", htmlCodeDownload, 1, 1, -10, 1);
- downloadPopup.show();
- //downloadPopup.hide();
- }
- else {
- alert("Beim Export ist ein Fehler aufgetreten.");
- }
- }
- document.getElementById("progressWheel").innerHTML = "";
- }
- });
- }
- else{
- if(inputNotEnough.length==0){
- parent.mb_ajax_get("../x_geoportal/mod_wfsGazetteerEditor_server.php", parameters, function (jsCode, status) {
- if(status=='success'){
- for (var i=0; i < parent.wms.length; i++) {
- for (var j=0; j < parent.wms[i].objLayer.length; j++) {
- var currentLayer = parent.wms[i].objLayer[j];
- var wms_id = parent.wms[i].wms_id;
- if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
- var layer_name = currentLayer.layer_name;
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
- }
- }
- }
- var geoObj = eval('(' + jsCode + ')');
- if (!exportToShape) {
- if (jsCode) {
- if (typeof(geoObj) == 'object') {
- geomArray = new parent.GeometryArray();
- geomArray.importGeoJSON(geoObj);
- displayPopup(geomArray);
- }
- else {
- displayPopup();
- }
- }
- else {
- alert("Kein Ergebnis.");
- }
- }
- else {
- if (jsCode) {
- var htmlCodeDownload = "<iframe style='visibility:visible' src='../x_geoportal/download.php?download=" + geoObj.filename + "'></iframe>";
- var downloadPopup = new parent.mb_popup("Download", htmlCodeDownload, 1, 1, -10, 1);
- downloadPopup.show();
- //downloadPopup.hide();
- }
- else {
- alert("Beim Export ist ein Fehler aufgetreten.");
- }
- }
- document.getElementById("progressWheel").innerHTML = "";
- }
- });
- }
- else{
- return false;
- }
- }
- return false;
- }
-
-
-function getListTitle(geom){
- var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
- var resultObj = {};
- for (var i = 0 ; i < wfsConf.element.length ; i++) {
- var currentElement = wfsConf.element[i];
- if (currentElement.f_show == 1 && geom.e.getElementValueByName(currentElement.element_name) != false) {
- var pos = currentElement.f_respos;
- if (pos > 0) {
- resultObj[pos] = geom.e.getElementValueByName(currentElement.element_name);
- }
- }
- }
- return resultObj;
-}
-
-function createListOfGeometries(){
- var listOfGeom = "<table style='background-color:#EEEEEE;'>\n";
- if (geomArray != null && geomArray.count() > 0) {
- for (var i = 0 ; i < geomArray.count(); i ++) {
- if (geomArray.get(i).get(-1).isComplete()) {
- listOfGeom += "\t<tr>\n\t\t ";
- var resultElObj = getListTitle(geomArray.get(i));
- for (var wfsConfEl in resultElObj) {
- if(resultElObj[wfsConfEl]!=''){
- listOfGeom += "<td style='cursor:pointer;\n";
- if ((i % 2) === 0) {
- listOfGeom += "color:black'";
- }
- else {
- listOfGeom += "color:black'";
- }
- listOfGeom += "\t\t\t onmouseover=\"window.frames['"+frameName+"'].setResult('over',"+i+")\" ";
- listOfGeom += " onmouseout=\"window.frames['"+frameName+"'].setResult('out',"+i+")\" ";
- listOfGeom += " onclick=\"window.frames['"+frameName+"'].setResult('click',"+i+"); window.frames['"+frameName+"'].showWfs("+i+");\" ";
- listOfGeom += ">"+ resultElObj[wfsConfEl] +"</td>";
- }
- }
- listOfGeom += "\t\t</tr>\n";
- }
- }
- }
- listOfGeom += "</table>\n";
- return listOfGeom;
-}
-
-function displayPopup(geom){
- geomArray = geom;
-
- var contentHtml = "Kein Ergebnis";
- if (geomArray != null && geomArray.count() > 0){
- contentHtml = createListOfGeometries();
- }
-
- removeChildNodes(document.getElementById("progressWheel"));
-
- if (typeof(resultGeometryPopup) == "undefined") {
- resultGeometryPopup = new parent.mb_popup(searchPopupTitle,contentHtml,searchPopupWidth,searchPopupHeight,searchPopupX,searchPopupY);
- }
- else {
-// resultGeometryPopup.hide();
- resultGeometryPopup.setHtml(contentHtml);
-// resultGeometryPopup = new parent.mb_popup(searchPopupTitle,contentHtml,searchPopupWidth,searchPopupHeight,searchPopupX,searchPopupY);
- }
- resultGeometryPopup.show();
-}
-
-
-function showWfs(geometryIndex) {
- var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
- var wfsElement = geomArray.get(geometryIndex).e;
-
- var resultHtml = "";
- resultHtml += "<table style='background-color:#EEEEEE;'>\n";
- var details = 0;
- for (var i = 0 ; i <wfsConf.element.length; i ++) {
- if(wfsConf.element[i].f_show_detail == 1){
- resultHtml +="<tr><td>\n";
- resultHtml += wfsConf.element[i].element_name;
- resultHtml +="</td>\n";
- resultHtml += "<td>\n";
- var elementVal = wfsElement.getElementValueByName(wfsConf.element[i].element_name);
- resultHtml += elementVal;
- resultHtml += "</td></tr>\n";
- details = 1;
- }
- }
-// if(details != 1){
-// resultHtml +="<tr><td>Keine Informationen</td></tr>\n";
-// }
- resultHtml += "</table>\n";
-
- if(details == 1){
- if (typeof(wfsPopup) == "undefined") {
- wfsPopup = new parent.mb_popup(detailPopupTitle,resultHtml,detailPopupWidth,detailPopupHeight,detailPopupX,detailPopupY);
- }
- else {
- wfsPopup.hide();
- wfsPopup.setHtml(resultHtml);
- }
- wfsPopup.show();
- }
-}
-//------------------------------------------------- end Editor functions
-
-
-function getNumberOfFilterParameters(){
- var cnt = 0;
- var el = global_wfsConfObj[global_selectedWfsConfId].element;
- inputNotEnough = [];
-
- for (var i = 0; i < el.length; i++){
- if( el[i]['f_search'] == 1){
- if (document.getElementById(el[i]['element_name']).value != '') {
- cnt++;
- }
- if(document.getElementById(el[i]['element_name']).value.length < el[i]['f_min_input']){
- inputNotEnough.push(el[i]['element_name']+"("+el[i]['f_min_input']+")");
- }
- }
- }
- if(inputNotEnough.length>0){
- alert("Pflichtfelder: "+inputNotEnough.join(', '));
- document.getElementById("progressWheel").innerHTML = "";
- return false;
- }
-
- return cnt;
-}
-/*
-* event -> {over || out || click}
-* geom -> commaseparated coordinates x1,y1,x2,y2 ...
-*/
-function setResult(event, index){
- var currentGeom = geomArray.get(index);
- if (maxHighlightedPoints > 0 && currentGeom.getTotalPointCount() > maxHighlightedPoints) {
- currentGeom = currentGeom.getBBox4();
- }
- if (event == "over") {
- global_resultHighlight.add(currentGeom, cw_fillcolor);
- global_resultHighlight.paint();
- }
- else if (event == "out"){
- global_resultHighlight.del(currentGeom, cw_fillcolor);
- global_resultHighlight.paint();
- }
- else if (event == "click"){
- global_resultHighlight.del(currentGeom, cw_fillcolor);
- var bbox = currentGeom.getBBox();
- var bufferFloat = parseFloat(global_wfsConfObj[global_selectedWfsConfId].g_buffer);
- var buffer = new parent.Point(bufferFloat,bufferFloat);
- bbox[0] = bbox[0].minus(buffer);
- bbox[1] = bbox[1].plus(buffer);
- parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
- parent.zoom(targetArray[0], 'true', 1.0);
- global_resultHighlight.add(currentGeom, cw_fillcolor);
- global_resultHighlight.paint();
- }
- return true;
-}
-</script>
-</head>
-<body leftmargin='0' topmargin='10' bgcolor='#ffffff' onload='frameIsReady()'> <!-- onload='initModWfsGazetteer();init_wfsSpatialRequest();' -->
- <!-- WFS conf info -->
- <img src = "" name='wfsPreConfiguredOrEditor' id='wfsPreConfiguredOrEditor' style='display:none'>
- <img src = "" name='wfsGeomType' id='wfsGeomType' style='display:none'>
- <a name='wfsInfo' title='Informationen anzeigen' id='wfsInfo' style='display:none'></a><form name='attrPanel' id='attrPanel' onsubmit='return makeRequest();'>
-
-
- <div class='mainDiv' id='mainDiv' style="display:none">
- <b>Räumliche Auswahl</b>
- <div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px'></div>
- <input type="button" id="deleteRequestGeometry" name="deleteRequestGeometry" value="löschen" style="position:absolute;top:70px;left:120px;display:none">
- <br><br>
- <b>Attributauswahl</b>
- <table>
- <tr valign='top'>
- <td width='30%'> </td><td width='35%'> </td><td width='35%' style='font-size:12px;'>Beispielinhalte (erste 20 Einträge)</td>
- </tr>
- <tr valign='top'>
- <td width='30%'>
- <select name='leftList' id='leftList' onChange='fillRightList();' onDblClick='writeLeftValueInString();' size='8' style='width:120px;'></select>
- </td>
- <td width='35%'>
- <input id='greaterThan' class='op' onClick='insertOperator(value);' type='button' value='>>' name='op1'>
- <input id='greaterThanOrEqualTo' class='op' onClick='insertOperator(value);' type='button' value='>=' name='op2'><br>
- <input id='lessThan' class='op' onClick='insertOperator(value);' type='button' value='<<' name='op3'>
- <input id='lessThanOrEqualTo' class='op' onClick='insertOperator(value);' type='button' value='<=' name='op4'><br>
- <input id='equal' class='op' onClick='insertOperator(value);' type='button' value='==' name='op5'>
- <input id='notEqual' class='op' onClick='insertOperator(value);' type='button' value='<>' name='op6'><br>
- <input id='like' class='op' onClick='insertOperator(value);' type='button' value=' LIKE ' name='op7'>
- <input id='and' class='op' onClick='insertOperator(value);' type='button' value=' AND ' name='op8'><br>
- </td>
- <td width='35%'>
- <select name='rightList' id='rightList' onDblClick='writeRightValueInString();' size='8' style='width:120px;'>
- </select>
- </td>
- </tr>
- </table>
-
- <br>
- <table>
- <tr>
- <td style='width:80%;height:40' colspan=4>
- <textarea cols='48' rows='5' name='attrRequestText' id='attrRequestText' ></textarea>
- </td>
- </tr>
- <tr >
- <td>
- <input type='submit' id='attrPanel_Submit' value='Anfrage
-starten'>
- </td>
- <td>
- <input onClick='deleteFilterText();' type='button' value='Filter
-zurücksetzen'>
- </td>
- <td>
- <div name='displayCheckbox' id='displayCheckbox' style='width:180px'>
- <input type='checkbox' name='exportToShape' id='exportToShape'>Daten exportieren
- </div>
- </td>
- </tr>
- </table>
- </div>
-</form>
-<form name='wfsForm' id='wfsForm' onsubmit='return makeRequest()'></form>
-<div name='progressWheel' id='progressWheel' style='width:180px'></div>
-</body>
-</html>
+ //if(wfsConfElementArray[i].f_helptext.length > 0) { form.appendChild(helptextNode); }
+ //if(wfsConfElementArray[i].f_helptext.length > 0) { form.appendChild(helptextDisplay); }
+ form.appendChild(document.createElement("br"));
+ }
+ }
+
+ var submitButton = document.createElement("input");
+ submitButton.type = "submit";
+ submitButton.id = "wfsForm_Submit";
+ submitButton.className = global_wfsConfObj[global_selectedWfsConfId].g_button_id;
+ submitButton.value = global_wfsConfObj[global_selectedWfsConfId].g_button;
+
+ form.appendChild(submitButton);
+ }
+
+ checkSrs();
+}
+function checkSrs(){
+ //check SRS
+ var ind = parent.getMapObjIndexByName("mapframe1");
+ var submit = document.getElementById("wfsForm_Submit");
+ var submit_attr = document.getElementById("attrPanel_Submit");
+ if(global_wfsConfObj[global_selectedWfsConfId].featuretype_srs!=parent.mb_mapObj[ind].getSRS()){
+ var msg = "Das Projektionssystem von Karte und WFS-Featuretype ist unterschiedlich, Abfrage nicht moeglich!\n";
+ msg += parent.mb_mapObj[ind].getSRS()+" und "+global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
+ alert(msg);
+
+ //disable Submit Button
+ if(submit)submit.disabled = true;
+ if(submit_attr)submit_attr.disabled = true;
+
+ }
+ else{
+ //disable Submit Button
+ if(submit)submit.disabled = false;
+ if(submit_attr)submit_attr.disabled = false;
+ }
+}
+
+
+//------------------------------------------------- start Editor functions
+
+
+
+function fillLeftList() {
+ deleteSelectOptions(document.attrPanel.leftList);
+ deleteSelectOptions(document.attrPanel.rightList);
+ deleteFilterText();
+
+ var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
+ for (var i = 0 ; i < wfsConf.element.length ; i++) {
+ // do not include geometry column
+ if (wfsConf.element[i].f_geom != 1) {
+ var lLOption = document.createElement("option");
+ lLOption.id = "lLOPtion"+i+"_"+wfsConf.element[i].element_type;
+ lLOption.value = i;
+ lLOption.innerHTML = wfsConf.element[i].element_name;
+ document.getElementById("leftList").appendChild(lLOption);
+ }
+ }
+}
+
+ function fillRightList() {
+ var chosenLayer = global_wfsConfObj[global_selectedWfsConfId].featuretype_name;
+ var layerAttr=document.getElementById("leftList");
+ var chosenAttr =layerAttr.options[layerAttr.selectedIndex].text;
+ var wfs_getfeature = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature;
+
+ deleteSelectOptions(document.attrPanel.rightList);
+
+ document.getElementById("progressWheel").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Get features...</td></tr></table>";
+
+ var properties = {"command":"getFeature", "wfsFeatureTypeName":chosenLayer, "wfsGetFeatureAttr":chosenAttr, "wfsGetFeature":wfs_getfeature};
+ parent.$.post("../javascripts/mod_wfsGazetteerEditor_server.php", properties, function (result, status) {
+ if (status == "success") {
+ var arrFeatureColumnValues = eval('(' + result + ')');
+ var i = 0;
+ for( var i=0; i<arrFeatureColumnValues.length; i++){
+ removeChildNodes(document.getElementById("progressWheel"));
+ if(arrFeatureColumnValues[i]!=''){
+ var rLOption = document.createElement("option");
+ rLOption.id = "rLOption"+i;
+ rLOption.value = i;
+ rLOption.innerHTML = arrFeatureColumnValues[i];
+ document.getElementById("rightList").appendChild(rLOption);
+ }
+ }
+ }
+ });
+ }
+
+/**
+ * writeLeftValueInString()
+ * @param {}
+ * Doppelklick auf Listeneintrag (Links) => Listenwert wir in Textarea geschrieben
+ */
+function writeLeftValueInString(){
+ var layerAttr=document.getElementById("leftList");
+ var chosenAttr = layerAttr.options[layerAttr.selectedIndex].text;
+ if(layerAttr.options[layerAttr.selectedIndex].id.match("int") || layerAttr.options[layerAttr.selectedIndex].id.match("float")){
+ controlOperators("int");
+ }
+ else if(layerAttr.options[layerAttr.selectedIndex].id.match("string")){
+ controlOperators("string");
+ }
+ else if(layerAttr.options[layerAttr.selectedIndex].id.match("date")){
+ controlOperators("date");
+ }
+ else{
+ controlOperators("all");
+ }
+ var attrTxt = "[" + chosenAttr + "]";
+ insertAtCursor(document.attrPanel.attrRequestText, attrTxt);
+
+}
+
+function hideOperators(){
+ document.getElementById('greaterThan').style.visibility = "hidden";
+ document.getElementById('lessThan').style.visibility = "hidden";
+ document.getElementById('lessThanOrEqualTo').style.visibility = "hidden";
+ document.getElementById('greaterThanOrEqualTo').style.visibility = "hidden";
+ document.getElementById('and').style.visibility = "hidden";
+ document.getElementById('like').style.visibility = "hidden";
+ document.getElementById('equal').style.visibility = "hidden";
+ document.getElementById('notEqual').style.visibility = "hidden";
+}
+
+function controlOperators(opType){
+ document.getElementById('greaterThan').style.visibility = "visible";
+ document.getElementById('lessThan').style.visibility = "visible";
+ document.getElementById('lessThanOrEqualTo').style.visibility = "visible";
+ document.getElementById('greaterThanOrEqualTo').style.visibility = "visible";
+ document.getElementById('and').style.visibility = "visible";
+ document.getElementById('like').style.visibility = "visible";
+ document.getElementById('equal').style.visibility = "visible";
+ document.getElementById('notEqual').style.visibility = "visible";
+ if(opType=='int'){
+ document.getElementById('like').style.visibility = "hidden";
+ }
+ else if(opType=='string'){
+ document.getElementById('greaterThan').style.visibility = "hidden";
+ document.getElementById('lessThan').style.visibility = "hidden";
+ document.getElementById('lessThanOrEqualTo').style.visibility = "hidden";
+ document.getElementById('greaterThanOrEqualTo').style.visibility = "hidden";
+ }
+ else if(opType=='date'){
+ // do something
+ }
+ else{
+ // do something
+ }
+}
+
+/**
+ * writeRightValueInString()
+ * @param {}
+ * Doppelklick auf Listeneintrag (Rechts) => Listenwert wir in Textarea geschrieben
+ */
+function writeRightValueInString(){
+ var chosenVal =document.getElementById("rightList").options[document.getElementById("rightList").selectedIndex].text;
+ insertAtCursor(document.attrPanel.attrRequestText,chosenVal);
+}
+
+
+/**
+* insertOperator
+* @param {type} param
+*/
+ function insertOperator(value) {
+ var wert = value;
+ insertAtCursor(document.attrPanel.attrRequestText, wert);
+ }
+
+/**
+ * insertAtCursor
+ * @param {Textfeld, String} param
+ * Fuegt an die Cursorstelle einen Text(String) ein
+ */
+function insertAtCursor(myField, myValue) {
+//IE support
+ if (document.selection) {
+ myField.focus();
+ sel = document.selection.createRange();
+ sel.text = myValue;
+ }
+//MOZILLA/NETSCAPE support
+ else if (myField.selectionStart || myField.selectionStart == '0') {
+ var startPos = myField.selectionStart;
+ var endPos = myField.selectionEnd;
+ myField.value = myField.value.substring(0, startPos)
+ + myValue
+ + myField.value.substring(endPos, myField.value.length);
+ } else {
+ myField.value += myValue;
+ }
+}
+
+/**
+ * deleteSelectOptions()
+ * @param {}
+ *
+ */
+
+function deleteSelectOptions(field){
+ var numOfOpt = field.length;
+ for (i=0; i <numOfOpt; i++){
+ field.options[field.length-1] = null;
+ }
+}
+
+/**
+ * deleteFilterText()
+ * @param {type}
+ * Button loescht Eintrag im Textfeld (attrRequestText)
+ */
+ function deleteFilterText() {
+ document.attrPanel.attrRequestText.value="";
+ }
+
+
+ //-------------------------------------------------------------------------
+
+function createWfsFilter () {
+ var wfsFilter = new WfsFilter();
+
+ /*
+ * Add filter from WFS editor
+ */
+
+ if (!isSearchPreconfigured()) {
+ var filter = document.attrPanel.attrRequestText.value;
+
+ if (!wfsFilter.parse(filter)) {
+ alert("Keine gültige Filterbedingung gesetzt.");
+ return false;
+ }
+ }
+
+
+ /*
+ * Add filter from pre configured searches
+ */
+ var filterParameterCount = getNumberOfFilterParameters();
+ var el = global_wfsConfObj[global_selectedWfsConfId].element;
+
+ if (filterParameterCount != 0) {
+ for (var i = 0; i < el.length; i++) {
+ if (el[i]['f_search'] == 1) {
+
+ var a = document.getElementById(el[i]['element_name']).value.split(",");
+ wfsFilter.addPreConfigured(el[i]['element_name'], a, el[i]['f_toupper'], el[i]['f_operator']);
+ }
+ }
+ }
+ /*
+ * Add filter from request geometry
+ */
+ if (spatialRequestGeom != null) {
+
+ // get SRS
+ var srs = global_wfsConfObj[global_selectedWfsConfId].featuretype_srs;
+
+ // get geometry column name
+ var geometryColumnName = "";
+ for (var j = 0; j < el.length; j++) {
+ if (el[j].f_geom == 1) {
+ geometryColumnName = el[j].element_name;
+ }
+ }
+
+ // get filter option
+ var filterOption = "";
+ var selectedButton;
+ if (spatialRequestGeom.geomType == parent.geomType.polygon) {
+ selectedButton = buttonPolygon;
+ }
+ else
+ if (spatialRequestGeom.geomType == parent.geomType.line) {
+ selectedButton = buttonRectangle;
+ }
+
+ if (selectedButton.filteroption == 'within') {
+ filterOption = "Within";
+ }
+ else
+ if (selectedButton.filteroption == 'intersects') {
+ filterOption = "Intersects";
+ }
+
+ // add spatial filter
+ wfsFilter.addSpatial(spatialRequestGeom, geometryColumnName, filterOption, srs);
+ }
+ return wfsFilter.toString();
+}
+
+/**
+ * The filter is calculated from the WFS editor or the pre-comfigured
+ * search form, with optional request geometry
+ */
+ function makeRequest() {
+ // hide the result and detail popup
+ if (typeof(resultGeometryPopup) != "undefined") {
+ resultGeometryPopup.dialog('close');
+ }
+ if (typeof(wfsPopup) != "undefined") {
+ wfsPopup.dialog('close');
+ }
+
+ // empty the result geometry
+// geomArray not used any more
+// if(geomArray != null && geomArray.count()>0){
+// geomArray.empty();
+// }
+
+ // set the Highlight object for the result geometry
+ var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":100};
+ global_resultHighlight = new parent.Highlight(targetArray, "wfsGazetteerEditorHighlight", styleProperties, 2);
+
+ /*
+ * Send WFS request
+ */
+ document.getElementById("progressWheel").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Searching...</td></tr></table>";
+
+ var u = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature + parent.mb_getConjunctionCharacter(global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature);
+ u += "REQUEST=getFeature&Typename="+global_wfsConfObj[global_selectedWfsConfId].featuretype_name+"&Version=1.0.0&service=WFS";
+ u += "&filter=";
+
+ var exportToShape = document.getElementById("exportToShape").checked;
+
+ var parameters = {
+ command:"getSearchResults",
+ "wfs_conf_id":global_selectedWfsConfId,
+ "frame":this.name,
+ "url":u,
+ "filter":createWfsFilter(),
+ "backlink":"",
+ "exportToShape":exportToShape
+ };
+
+ if (!isSearchPreconfigured()) {
+ parent.mb_ajax_get("../javascripts/mod_wfsGazetteerEditor_server.php", parameters, function (jsCode, status) {
+ if(status=='success'){
+ for (var i=0; i < parent.wms.length; i++) {
+ for (var j=0; j < parent.wms[i].objLayer.length; j++) {
+ var currentLayer = parent.wms[i].objLayer[j];
+ var wms_id = parent.wms[i].wms_id;
+ if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
+ var layer_name = currentLayer.layer_name;
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
+ }
+ }
+ }
+ var geoObj = jsCode; //eval('(' + jsCode + ')');
+ if (!exportToShape) {
+ if (jsCode) {
+ if (typeof(geoObj) == 'object') {
+ displayPopup(geoObj);
+ }
+ else {
+ displayPopup();
+ }
+ }
+ else {
+ alert("Kein Ergebnis.");
+ }
+ }
+ else {
+ if (geoObj) {
+ var htmlCodeDownload = "<iframe style='visibility:visible' src='../tmp/"+geoObj.filename + "'></iframe>";
+ var downloadPopup = new parent.mb_popup("Download", htmlCodeDownload, 1, 1, -10, 1);
+ downloadPopup.show();
+ downloadPopup.hide();
+ }
+ else {
+ alert("Beim Export ist ein Fehler aufgetreten.");
+ }
+ }
+ document.getElementById("progressWheel").innerHTML = "";
+ }
+ });
+ }
+ else{
+ if(inputNotEnough.length==0){
+ parent.mb_ajax_get("../javascripts/mod_wfsGazetteerEditor_server.php", parameters, function (jsCode, status) {
+ if(status=='success'){
+ for (var i=0; i < parent.wms.length; i++) {
+ for (var j=0; j < parent.wms[i].objLayer.length; j++) {
+ var currentLayer = parent.wms[i].objLayer[j];
+ var wms_id = parent.wms[i].wms_id;
+ if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
+ var layer_name = currentLayer.layer_name;
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
+ }
+ }
+ }
+ var geoObj = jsCode; //eval('(' + jsCode + ')');
+ if (!exportToShape) {
+ if (jsCode) {
+ if (typeof(geoObj) == 'object') {
+ displayPopup(geoObj);
+ }
+ else {
+ displayPopup();
+ }
+ }
+ else {
+ alert("Kein Ergebnis.");
+ }
+ }
+ else {
+ if (jsCode) {
+ var htmlCodeDownload = "<iframe style='visibility:visible' src='../x_geoportal/download.php?download=" + geoObj.filename + "'></iframe>";
+ var downloadPopup = new parent.mb_popup("Download", htmlCodeDownload, 1, 1, -10, 1);
+ downloadPopup.show();
+ //downloadPopup.hide();
+ }
+ else {
+ alert("Beim Export ist ein Fehler aufgetreten.");
+ }
+ }
+ document.getElementById("progressWheel").innerHTML = "";
+ }
+ });
+ }
+ else{
+ return false;
+ }
+ }
+ return false;
+ }
+
+
+function getListTitle(geom){
+ var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
+ var resultObj = {};
+ for (var i = 0 ; i < wfsConf.element.length ; i++) {
+ var currentElement = wfsConf.element[i];
+ if (currentElement.f_show == 1 && geom.e.getElementValueByName(currentElement.element_name) != false) {
+ var pos = currentElement.f_respos;
+ if (pos > 0) {
+ resultObj[pos] = geom.e.getElementValueByName(currentElement.element_name);
+ }
+ }
+ }
+ return resultObj;
+}
+
+function createListOfGeometries(){
+ var listOfGeom = "<table style='background-color:#EEEEEE;'>\n";
+ if (geomArray != null && geomArray.count() > 0) {
+ for (var i = 0 ; i < geomArray.count(); i ++) {
+ if (geomArray.get(i).get(-1).isComplete()) {
+ listOfGeom += "\t<tr>\n\t\t ";
+ var resultElObj = getListTitle(geomArray.get(i));
+ for (var wfsConfEl in resultElObj) {
+ if(resultElObj[wfsConfEl]!=''){
+ listOfGeom += "<td style='cursor:pointer;\n";
+ if ((i % 2) === 0) {
+ listOfGeom += "color:black'";
+ }
+ else {
+ listOfGeom += "color:black'";
+ }
+ listOfGeom += "\t\t\t onmouseover=\"window.frames['"+frameName+"'].setResult('over',"+i+")\" ";
+ listOfGeom += " onmouseout=\"window.frames['"+frameName+"'].setResult('out',"+i+")\" ";
+ listOfGeom += " onclick=\"window.frames['"+frameName+"'].setResult('click',"+i+"); window.frames['"+frameName+"'].showWfs("+i+");\" ";
+ listOfGeom += ">"+ resultElObj[wfsConfEl] +"</td>";
+ }
+ }
+ listOfGeom += "\t\t</tr>\n";
+ }
+ }
+ }
+ listOfGeom += "</table>\n";
+ return listOfGeom;
+}
+
+function displayPopup(geom){
+ geomArray = geom;
+
+ if(!parent.$("#resultList")){
+ return;
+ }
+ var resultList = parent.$('#resultList').mapbender();
+ resultList.clear();
+ resultList.setTitle(global_wfsConfObj[global_selectedWfsConfId].wfs_conf_abstract);
+ resultList.setWFSconf(global_wfsConfObj[global_selectedWfsConfId]);
+ resultList.addFeatureCollection(geom);
+ resultList.show();
+ return;
+
+ var contentHtml = "Kein Ergebnis";
+ if (geomArray != null && geomArray.count() > 0){
+ contentHtml = createListOfGeometries();
+ }
+
+ removeChildNodes(document.getElementById("progressWheel"));
+
+ if (typeof(resultGeometryPopup) == "undefined") {
+ resultGeometryPopup = parent.$("<div>"+ contentHtml +"</div>").dialog({
+ title: searchPopupTitle,
+ width:searchPopupWidth,
+ height: searchPopupHeight,
+ position: [ searchPopupX,searchPopupY]
+ });
+ }
+ else {
+ resultGeometryPopup.html(contentHtml);
+ }
+ resultGeometryPopup.dialog('open');
+}
+
+
+function showWfs(geometryIndex) {
+ var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
+ var wfsElement = geomArray.get(geometryIndex).e;
+
+ var resultHtml = "";
+ resultHtml += "<table style='background-color:#EEEEEE;'>\n";
+ var details = 0;
+ for (var i = 0 ; i <wfsConf.element.length; i ++) {
+ if(wfsConf.element[i].f_show_detail == 1){
+ resultHtml +="<tr><td>\n";
+ resultHtml += wfsConf.element[i].element_name;
+ resultHtml +="</td>\n";
+ resultHtml += "<td>\n";
+ var elementVal = wfsElement.getElementValueByName(wfsConf.element[i].element_name);
+ resultHtml += elementVal;
+ resultHtml += "</td></tr>\n";
+ details = 1;
+ }
+ }
+// if(details != 1){
+// resultHtml +="<tr><td>Keine Informationen</td></tr>\n";
+// }
+ resultHtml += "</table>\n";
+
+ if(details == 1){
+ if (typeof(wfsPopup) == "undefined") {
+ wfsPopup = parent.$("<div>"+resultHtml+"</div>").dialog({
+ title: detailPopupTitle,
+ width: detailPopupWidth,
+ height: detailPopupWidth,
+ position: [detailPopupX,detailPopupY]
+ });
+ }
+ else {
+ wfsPopup.html(resultHtml);
+ }
+ wfsPopup.dialog('open');
+ }
+}
+//------------------------------------------------- end Editor functions
+
+
+function getNumberOfFilterParameters(){
+ var cnt = 0;
+ var el = global_wfsConfObj[global_selectedWfsConfId].element;
+ inputNotEnough = [];
+
+ for (var i = 0; i < el.length; i++){
+ if( el[i]['f_search'] == 1){
+ if (document.getElementById(el[i]['element_name']).value != '') {
+ cnt++;
+ }
+ if(document.getElementById(el[i]['element_name']).value.length < el[i]['f_min_input']){
+ inputNotEnough.push(el[i]['element_name']+"("+el[i]['f_min_input']+")");
+ }
+ }
+ }
+ if(inputNotEnough.length>0){
+ alert("Pflichtfelder: "+inputNotEnough.join(', '));
+ document.getElementById("progressWheel").innerHTML = "";
+ return false;
+ }
+
+ return cnt;
+}
+/*
+* event -> {over || out || click}
+* geom -> commaseparated coordinates x1,y1,x2,y2 ...
+*/
+function setResult(event, index){
+ var currentGeom = geomArray.get(index);
+ if (maxHighlightedPoints > 0 && currentGeom.getTotalPointCount() > maxHighlightedPoints) {
+ currentGeom = currentGeom.getBBox4();
+ }
+ if (event == "over") {
+ global_resultHighlight.add(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ else if (event == "out"){
+ global_resultHighlight.del(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ else if (event == "click"){
+ global_resultHighlight.del(currentGeom, cw_fillcolor);
+ var bbox = currentGeom.getBBox();
+ var bufferFloat = parseFloat(global_wfsConfObj[global_selectedWfsConfId].g_buffer);
+ var buffer = new parent.Point(bufferFloat,bufferFloat);
+ bbox[0] = bbox[0].minus(buffer);
+ bbox[1] = bbox[1].plus(buffer);
+ parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
+ parent.zoom(targetArray[0], 'true', 1.0);
+ global_resultHighlight.add(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ return true;
+}
+</script>
+</head>
+<body leftmargin='0' topmargin='10' bgcolor='#ffffff' onload='frameIsReady()'> <!-- onload='initModWfsGazetteer();init_wfsSpatialRequest();' -->
+ <!-- WFS conf info -->
+ <img src = "" name='wfsPreConfiguredOrEditor' id='wfsPreConfiguredOrEditor' style='display:none'>
+ <img src = "" name='wfsGeomType' id='wfsGeomType' style='display:none'>
+ <a name='wfsInfo' title='Informationen anzeigen' id='wfsInfo' style='display:none'></a><form name='attrPanel' id='attrPanel' onsubmit='return makeRequest();'>
+
+
+ <div class='mainDiv' id='mainDiv' style="display:none">
+ <b>Räumliche Auswahl</b>
+ <div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px'></div>
+ <input type="button" id="deleteRequestGeometry" name="deleteRequestGeometry" value="löschen" style="position:absolute;top:70px;left:120px;display:none">
+ <br><br>
+ <b>Attributauswahl</b>
+ <table>
+ <tr valign='top'>
+ <td width='30%'> </td><td width='35%'> </td><td width='35%' style='font-size:12px;'>Beispielinhalte (erste 20 Einträge)</td>
+ </tr>
+ <tr valign='top'>
+ <td width='30%'>
+ <select name='leftList' id='leftList' onChange='fillRightList();' onDblClick='writeLeftValueInString();' size='8' style='width:120px;'></select>
+ </td>
+ <td width='35%'>
+ <input id='greaterThan' class='op' onClick='insertOperator(value);' type='button' value='>>' name='op1'>
+ <input id='greaterThanOrEqualTo' class='op' onClick='insertOperator(value);' type='button' value='>=' name='op2'><br>
+ <input id='lessThan' class='op' onClick='insertOperator(value);' type='button' value='<<' name='op3'>
+ <input id='lessThanOrEqualTo' class='op' onClick='insertOperator(value);' type='button' value='<=' name='op4'><br>
+ <input id='equal' class='op' onClick='insertOperator(value);' type='button' value='==' name='op5'>
+ <input id='notEqual' class='op' onClick='insertOperator(value);' type='button' value='<>' name='op6'><br>
+ <input id='like' class='op' onClick='insertOperator(value);' type='button' value=' LIKE ' name='op7'>
+ <input id='and' class='op' onClick='insertOperator(value);' type='button' value=' AND ' name='op8'><br>
+ </td>
+ <td width='35%'>
+ <select name='rightList' id='rightList' onDblClick='writeRightValueInString();' size='8' style='width:120px;'>
+ </select>
+ </td>
+ </tr>
+ </table>
+
+ <br>
+ <table>
+ <tr>
+ <td style='width:80%;height:40' colspan=4>
+ <textarea cols='48' rows='5' name='attrRequestText' id='attrRequestText' ></textarea>
+ </td>
+ </tr>
+ <tr >
+ <td>
+ <input type='submit' id='attrPanel_Submit' value='Anfrage
+starten'>
+ </td>
+ <td>
+ <input onClick='deleteFilterText();' type='button' value='Filter
+zurücksetzen'>
+ </td>
+ <td>
+ <div name='displayCheckbox' id='displayCheckbox' style='width:180px'>
+ <input type='checkbox' name='exportToShape' id='exportToShape'>Daten exportieren
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+</form>
+<form name='wfsForm' id='wfsForm' onsubmit='return makeRequest()'></form>
+<div name='progressWheel' id='progressWheel' style='width:180px'></div>
+</body>
+</html>
Modified: branches/2.7/http/javascripts/mod_wfsGazetteerEditor_server.php
===================================================================
--- branches/2.7/http/javascripts/mod_wfsGazetteerEditor_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/mod_wfsGazetteerEditor_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -162,12 +162,12 @@
if (!empty($exportToShape)) {
$filenamePrefix = md5(microtime());
$mygml->toShape($filenamePrefix);
- header("Content-type:application/x-json; charset=utf-8");
- echo "{'filename':'" . $filenamePrefix . ".zip'}";
+ header("Content-Type: application/json; charset=utf-8");
+ echo '{"filename": "' . $filenamePrefix . '.zip"}';
}
else {
- header("Content-type:application/x-json; charset=utf-8");
+ header("Content-Type: application/json; charset=utf-8");
echo $mygml->toGeoJSON();
}
}
Modified: branches/2.7/http/javascripts/mod_zoomIn1.js
===================================================================
--- branches/2.7/http/javascripts/mod_zoomIn1.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/javascripts/mod_zoomIn1.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -17,6 +17,9 @@
* > '','','','mod_zoomIn1.js','','mapframe1','',
* > 'http://www.mapbender.org/index.php/ZoomIn');
*
+ * Help:
+ * http://www.mapbender.org/ZoomIn
+ *
* Maintainer:
* http://www.mapbender.org/User:Christoph_Baudson
*
@@ -41,4 +44,4 @@
if (options.src) {
this.src = options.src;
}
-});
\ No newline at end of file
+});
Modified: branches/2.7/http/php/mod_abo_show.php
===================================================================
--- branches/2.7/http/php/mod_abo_show.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_abo_show.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$e_id = "monitor_abo_show";
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+#require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_user.php");
?>
@@ -250,19 +250,19 @@
$mail_header .
"</span><hr><br>\n" .
"<form name = 'form1' method='post' action='" . $_SERVER["SCRIPT_NAME"] . "?sortby=" .
- $_GET['sortby']."'>\n\t" .
+ $_GET['sortby']."&elementID=monitor_abo_show'>\n\t" .
"\n\t<input type=submit value='" . $email_create_text .
"'>\n<br/><br/>\n" .
"<table cellpadding=10 cellspacing=0 border=0>" .
"<tr bgcolor='#dddddd'>" .
"<th align='left'>" . $notify_text . "</a></th>" .
- "<th align='left'><a href='" . $_SERVER["SCRIPT_NAME"] . "?sortby=wms'>wms</a></th>" .
+ "<th align='left'><a href='" . $_SERVER["SCRIPT_NAME"] . "?sortby=wms&elementID=monitor_abo_show'>wms</a></th>" .
"<th align='left' colspan = 2><a href='" . $_SERVER["SCRIPT_NAME"] .
- "?sortby=status'>current status</a></th>" .
+ "?sortby=status&elementID=monitor_abo_show'>current status</a></th>" .
"<th align='left'><a href='" . $_SERVER["SCRIPT_NAME"] .
- "?sortby=avgresp'>avg. response time</a></th>" .
+ "?sortby=avgresp&elementID=monitor_abo_show'>avg. response time</a></th>" .
"<th align='left'><a href='" . $_SERVER["SCRIPT_NAME"] .
- "?sortby=avail'>overall availability</a></th>" .
+ "?sortby=avail&elementID=monitor_abo_show'>overall availability</a></th>" .
"<th align='left'>" . $number_of_subscribers_text . "</th><th></th>" .
"</tr>";
Modified: branches/2.7/http/php/mod_callMetadata.php
===================================================================
--- branches/2.7/http/php/mod_callMetadata.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_callMetadata.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -42,6 +42,7 @@
#$searchResources = "wms";
$searchPages = "1";
$resultTarget = "debug";
+$preDefinedMaxResults = array(5,10,15,20,25,30);
$searchEPSG = "EPSG:31466";
$classJSON = new Mapbender_JSON;
#$tempFolder = "/tmp";
@@ -559,11 +560,13 @@
$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';
+ $maxResultsTitle['header'] = 'Treffer pro Seite:';
+
break;
case 'en':
@@ -582,11 +585,13 @@
$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';
+ $maxResultsTitle['header'] = 'Results per page:';
+
break;
case 'fr':
$classificationElements[0]['name2show'] = 'Suchbegriff(e):';
@@ -604,11 +609,13 @@
$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';
+ $maxResultsTitle['header'] = 'Results per page:';
+
break;
default:
$classificationElements[0]['name2show'] = 'Suchbegriff(e):';
@@ -631,6 +638,8 @@
$orderByTitle['rank'] = 'Relevanz';
$orderByTitle['date'] = 'Letzte Änderung';
+ $maxResultsTitle['header'] = 'Results per page:';
+
}
$queryJSON = new stdClass;
@@ -704,15 +713,47 @@
}
}
+//generate filter for different maxResults entries
+//$preDefinedMaxResults
+if ($_REQUEST["maxResults"] == '') {
+ $queryJSON->searchFilter->maxResults->header = $maxResultsTitle['header'];
+ $queryJSON->searchFilter->maxResults->title = $preDefinedMaxResults[0];
+ for ($i=0; $i<(count($preDefinedMaxResults)-1); $i++) {
+ $queryJSON->searchFilter->maxResults->item[$i]->title = $preDefinedMaxResults[$i+1];
+ $queryJSON->searchFilter->maxResults->item[$i]->url = $searchURL."&maxResults=".$preDefinedMaxResults[$i+1];
+ }
+} else {
+ if (in_array($maxResults, $preDefinedMaxResults)) { //is part of preDefined array
+ $queryJSON->searchFilter->maxResults->header = $maxResultsTitle['header'];
+ $queryJSON->searchFilter->maxResults->title = $maxResults;
+ //delete entry from array
+ //$preDefinedMaxResultsRed = deleteEntry($preDefinedMaxResults, $maxResults);
+ for ($i=0; $i<(count($preDefinedMaxResults)); $i++) {
+ $queryJSON->searchFilter->maxResults->item[$i]->title = $preDefinedMaxResults[$i];
+ $queryJSON->searchFilter->maxResults->item[$i]->url = $searchURL."&maxResults=".$preDefinedMaxResults[$i];
+ }
+ } else { // is some other value
+ $queryJSON->searchFilter->maxResults->header = $maxResultsTitle['header'];
+ $queryJSON->searchFilter->maxResults->title = $maxResults;
+ for ($i=0; $i<(count($preDefinedMaxResults)); $i++) {
+ $queryJSON->searchFilter->maxResults->item[$i]->title = $preDefinedMaxResults[$i];
+ $queryJSON->searchFilter->maxResults->item[$i]->url = $searchURL."&maxResults=".$preDefinedMaxResults[$i];
+ }
+ }
+}
+
+
+
+
+
//generate filter for different order possibilities
//$queryJSON->searchFilter = (object) array();
if ($_REQUEST["orderBy"] == '') {
//echo "<br>orderBy:>".$_REQUEST["orderBy"]."<<br>";
+ $queryJSON->searchFilter->orderFilter->header = $orderByTitle['header'];
$queryJSON->searchFilter->orderFilter->title = $orderByTitle['rank'];
-
-
$queryJSON->searchFilter->orderFilter->item[0]->title = $orderByTitle['title'];
$queryJSON->searchFilter->orderFilter->item[0]->url = $searchURL."&orderBy=title";
$queryJSON->searchFilter->orderFilter->item[1]->title = $orderByTitle['id'];
@@ -723,6 +764,7 @@
} else {
//read out actual order filter
+ $queryJSON->searchFilter->orderFilter->header = $orderByTitle['header'];
switch ($orderBy) {
case "rank":
$queryJSON->searchFilter->orderFilter->title = $orderByTitle['rank'];
@@ -852,9 +894,17 @@
$queryStringNew = rtrim($queryStringNew,'&');
return $queryStringNew;
}
+//delete all string entries from array
+function deleteEntry($arrayname, $entry) {
+ $n = $arrayname.length;
+ for($i=0; $i<($n+1); $i++){
+ if ($arrayname[$i] == $entry) {
+ $arrayname.splice($i, 1);
+ }
+ }
+ return $arrayname;
+}
-
-
//call class_metadata - in case of file for all requested resources, in case of web only for one resource - cause there are different result files
Modified: branches/2.7/http/php/mod_deleteWFS.php
===================================================================
--- branches/2.7/http/php/mod_deleteWFS.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_deleteWFS.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -19,11 +19,10 @@
#session_start();
-$e_id="deleteWFS";
-$gui_id = Mapbender::session()->get("mb_user_gui");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-
+$e_id="deleteWFS";
+$gui_id = Mapbender::session()->get("mb_user_gui");
/*
* @security_patch irv done
*/
Modified: branches/2.7/http/php/mod_deleteWMS.php
===================================================================
--- branches/2.7/http/php/mod_deleteWMS.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_deleteWMS.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -203,9 +203,13 @@
$geoRssFactory = new GeoRssFactory();
$geoRss = $geoRssFactory->loadOrCreate(GEO_RSS_FILE);
$geoRssItem = new GeoRssItem();
- $geoRssItem->setTitle("DELETED WMS: " . $wms_title);
+ $geoRssItem->setTitle("DELETED WMS: ".$wms_title." (".$wmsList.")");
$geoRssItem->setDescription($wms_abstract);
- $geoRss->append($geoRssItem);
+ //$geoRssItem->setUrl("");
+ //$timestamp = ($timestamp==null) ? time() : $timestamp;
+ $timestamp = date(DATE_RSS,time());
+ $geoRssItem->setPubDate($timestamp);
+ $geoRss->appendTop($geoRssItem);
$geoRss->saveAsFile();
}
}
Modified: branches/2.7/http/php/mod_getWmcDisclaimer.php
===================================================================
--- branches/2.7/http/php/mod_getWmcDisclaimer.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_getWmcDisclaimer.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -2,6 +2,7 @@
require_once(dirname(__FILE__)."/../classes/class_json.php");
require_once dirname(__FILE__) . "/../classes/class_wmc_factory.php";
require_once(dirname(__FILE__) . "/../classes/class_user.php");
+require_once(dirname(__FILE__)."/../classes/class_connector.php");
//following is needed cause sometimes the service is invoked as a localhost service and then no userId is known but the userId in the session is needed for class_wmc to read from database!!! TODO: check if needed in this class.
$userId = Mapbender::session()->get("mb_user_id");
@@ -93,9 +94,21 @@
$resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_map.png' alt='".$translation['wms']." - picture' title='".$translation['wms']."'>";
//read out all wms id's
$validWMS = $wmcObj->getValidWms();
+if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+ $mapbenderBaseUrl = "https://".$hostName;
+ $mapbenderProtocol = "https://";
+ }
+ else {
+ $mapbenderBaseUrl = "http://".$hostName;
+ $mapbenderProtocol = "http://";
+}
+
foreach($validWMS as $WMS) {
- echo $resourceSymbol." <a href='http://".$hostName."/mapbender/php/mod_showMetadata.php?resource=wms&layout=tabs&id=".$WMS['id']."&languageCode=".$languageCode."'>".$WMS['title']."</a><br>";
- $wmstou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
+
+ echo $resourceSymbol." <a href='".$mapbenderBaseUrl.$_SERVER['SCRIPT_NAME']."/../mod_showMetadata.php?resource=wms&layout=tabs&id=".$WMS['id']."&languageCode=".$languageCode."'>".$WMS['title']."</a><br>";
+ $touServiceConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../mod_getServiceDisclaimer.php?type=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
+ $wmstou = $touServiceConnector->file;
+ #$wmstou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?resource=wms&id=".$WMS['id']."&languageCode=".$languageCode."&asTable=true");
echo $wmstou."<br>";
}
//var_dump($validWMS);
Modified: branches/2.7/http/php/mod_layerISOMetadata.php
===================================================================
--- branches/2.7/http/php/mod_layerISOMetadata.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_layerISOMetadata.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -647,7 +647,7 @@
#to the things which have to be done for integrating the service into a client like portalu ... they have defined another location to put the GetCap URL than INSPIRE does it
- $containsOperation=$iso19139->createElement("srv:containsOperation");
+ $containsOperation=$iso19139->createElement("srv:containsOperations");
$SV_OperationMetadata=$iso19139->createElement("srv:SV_OperationMetadata");
@@ -686,29 +686,22 @@
$gmd_linkage->appendChild($gmd_URL);
$CI_OnlineResource->appendChild($gmd_linkage);
$connectPoint->appendChild($CI_OnlineResource);
-//connectPoint END *****************************
+ $SV_OperationMetadata->appendChild($operationName);
+ $SV_OperationMetadata->appendChild($DCP);
+ $SV_OperationMetadata->appendChild($connectPoint);
+ $containsOperation->appendChild($SV_OperationMetadata);
-$SV_OperationMetadata->appendChild($operationName);
-$SV_OperationMetadata->appendChild($DCP);
-$SV_OperationMetadata->appendChild($connectPoint);
-
-$SV_ServiceIdentification->appendChild($SV_OperationMetadata);
+ $SV_ServiceIdentification->appendChild($containsOperation);
-
/*
-
$serviceTypeVersion_cs->appendChild($serviceTypeVersionText);
$serviceTypeVersion->appendChild($serviceTypeVersion_cs);
$SV_ServiceIdentification->appendChild($serviceTypeVersion);
*/
-
-
-
$identificationInfo->appendChild($SV_ServiceIdentification);
-
- //distributionInfo
+//distributionInfo
$gmd_distributionInfo=$iso19139->createElement("gmd:distributionInfo");
$MD_Distribution=$iso19139->createElement("gmd:MD_Distribution");
$gmd_distributionFormat=$iso19139->createElement("gmd:distributionFormat");
@@ -727,10 +720,10 @@
$gmd_URL=$iso19139->createElement("gmd:URL");
//Check if anonymous user has rights to access this layer - if not ? which resource should be advertised? TODO
if ($hasPermission) {
- $gmd_URLText=$iso19139->createTextNode("http://www.geoportal.rlp.de/mapbender/php/wms.php?layer_id=".$mapbenderMetadata['layer_id']."");
+ $gmd_URLText=$iso19139->createTextNode("http://".$_SERVER['HTTP_HOST']."/mapbender/php/wms.php?layer_id=".$mapbenderMetadata['layer_id']."");
}
else {
- $gmd_URLText=$iso19139->createTextNode("https://www.geoportal.rlp.de/http_auth/".$mapbenderMetadata['layer_id']."?");
+ $gmd_URLText=$iso19139->createTextNode("https://".$_SERVER['HTTP_HOST']."/http_auth/".$mapbenderMetadata['layer_id']."?");
}
$gmd_URL->appendChild($gmd_URLText);
$gmd_linkage->appendChild($gmd_URL);
Modified: branches/2.7/http/php/mod_loadwmc_server.php
===================================================================
--- branches/2.7/http/php/mod_loadwmc_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_loadwmc_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -57,7 +57,7 @@
$wmcId = $ajaxResponse->getParameter("id");
if ($wmc->createFromDb($wmcId)) {
$updatedWMC = $wmc->updateUrlsFromDb();
- $wmc->createFromXml($updatedWMC);
+ $wmc->createFromXml($updatedWMC);
$skipWms = $ajaxResponse->getParameter("skipWms");
if (is_array($skipWms)) {
@@ -68,6 +68,8 @@
}
if ($jsArray) {
$resultObj["javascript"] = $jsArray;
+ //increment load_count
+ $wmc->incrementWmcLoadCount();
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
@@ -88,8 +90,8 @@
$wmc->createFromXml($wmcDoc);
$updatedWMC = $wmc->updateUrlsFromDb();
- $wmc->createFromXml($updatedWMC);
- $jsArray = $wmc->toJavaScript();
+ $wmc->createFromXml($updatedWMC);
+ $jsArray = $wmc->toJavaScript();
if ($jsArray) {
$resultObj["javascript"] = $jsArray;
$ajaxResponse->setResult($resultObj);
Modified: branches/2.7/http/php/mod_monitorCapabilities_read.php
===================================================================
--- branches/2.7/http/php/mod_monitorCapabilities_read.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_monitorCapabilities_read.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -18,10 +18,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$e_id = "monitor_results";
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+#require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_user.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -94,15 +95,18 @@
}
echo "<br>Please note: The updated services need to be monitored again in order to update the database.<br><br>";
}
-
+$e = new mb_exception("mod_monitorCapabilities_read.php: userId: ".$_SESSION["mb_user_id"]);
$sql = "SELECT DISTINCT mb_monitor.fkey_wms_id FROM mb_monitor, wms " .
"WHERE mb_monitor.fkey_wms_id = wms.wms_id AND wms.wms_owner = $1";
+
$res = db_prep_query($sql, array($_SESSION["mb_user_id"]), array("i"));
+
$wms = array();
+
while($row = db_fetch_array($res)){
$wms[] = $row["fkey_wms_id"];
+ $e = new mb_exception("mod_monitorCapabilities_read.php: wmsId: ".$row["fkey_wms_id"]);
}
-
$wms_id = array();
$status = array();
$upload_id = array();
@@ -137,7 +141,7 @@
}
$sql = "SELECT status, status_comment, timestamp_begin, timestamp_end, " .
- "upload_url, updated, image, map_url, caps_diff FROM mb_monitor, wms " .
+ "upload_url, updated, image, map_url, cap_diff FROM mb_monitor, wms " .
"WHERE upload_id = $1 AND fkey_wms_id = $2 AND wms_owner = $3 ORDER BY status, " .
"status_comment, timestamp_end, fkey_wms_id";
$v = array($upload_id[$wms[$i]], $wms_id[$wms[$i]], $user->id);
@@ -152,7 +156,7 @@
$updated[$wms[$i]] = db_result($res,0,"updated");
$mapurl[$wms[$i]] = db_result($res,0,"map_url");
$image[$wms[$i]] = db_result($res,0,"image");
- $caps_diff[$wms[$i]] = db_result($res,0,"caps_diff");
+ $cap_diff[$wms[$i]] = db_result($res,0,"cap_diff");
if ($status[$wms[$i]] == -2 &&
intval(time())-intval($timestamp_begin[$wms[$i]]) > intval(TIME_LIMIT))
@@ -291,10 +295,11 @@
# $str .= "\n\t\t\t<td><a href='output_".$wms_id[$k]."_".$max.".txt' target=_blank>log</a></td>";
- $str .= "\n\t\t<td><input type=button value='details' onclick=\"var newWindow = window.open('../php/mod_monitorCapabilities_read_single.php?wmsid=".$wms_id[$k]."','wms','width=500,height=700,scrollbars');newWindow.href.location='test.php'\"></td>";
+ $str .= "\n\t\t<td><input type=button value='details' onclick=\"var newWindow = window.open('../php/mod_monitorCapabilities_read_single.php?wmsid=".$wms_id[$k]."','wms','width=500,height=700,scrollbars');newWindow.focus();\"></td>";
$str .= "\n\t\t\t<td>";
- if ($caps_diff[$k] != "")
- $str .= "<a href='mod_monitorCapabilities_read_single_diff.php?wmsid=".$wms_id[$k]."&upload_id=".$upload_id[$k]."' target=_blank>view</a>";
+ if ($cap_diff[$k] != "")
+ #$str .= "<a href='mod_monitorCapabilities_read_single_diff.php?wmsid=".$wms_id[$k]."&upload_id=".$upload_id[$k]."' target=_blank>view</a>";
+ $str .= "<input type=button value='show' onclick=\"var newWindow = window.open('../php/mod_showCapDiff.php?wmsid=".$wms_id[$k]."','Caps Diff','width=700,height=300,scrollbars');newWindow.focus();\">";
$str .= "</td></tr>";
Modified: branches/2.7/http/php/mod_monitorCapabilities_read_single_diff.php
===================================================================
--- branches/2.7/http/php/mod_monitorCapabilities_read_single_diff.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_monitorCapabilities_read_single_diff.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -64,14 +64,14 @@
die;
}
-$sql = "SELECT caps_diff FROM mb_monitor ";
+$sql = "SELECT cap_diff FROM mb_monitor ";
$sql .= "WHERE fkey_wms_id = $1 AND upload_id = $2";
$v = array($wms_id,$upload_id);
$t = array('i','i');
$res = db_prep_query($sql,$v,$t);
while ($row = db_fetch_array($res)) {
- $caps_diff = db_result($res,0,"caps_diff");
+ $cap_diff = db_result($res,0,"cap_diff");
}
@@ -80,7 +80,7 @@
$str .= "<table cellpadding=3 cellspacing=0 border=0>";
$str .= "<tr><td align='center' colspan='2'>Local</td><td align='center' colspan='2'>Remote</td></tr>";
-$str .= $caps_diff;
+$str .= $cap_diff;
$str .= "\n\t</table>\n\t";
echo $str;
Modified: branches/2.7/http/php/mod_savewmc_server.php
===================================================================
--- branches/2.7/http/php/mod_savewmc_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_savewmc_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -43,8 +43,30 @@
}
if ($saveInSession === 1) {
+ // CLEAN SESSION WMC FILES
+ $tmp = scandir(TMPDIR);
+ // get all files from tmp folder
+ for($p = 0; $p < count($tmp); $p++) {
+ // match timestamp on begin of the filename
+ if(preg_match("/^([\d]+).*$/i", $tmp[$p],$timestamp)) {
+ // if file older than 24h, remove it.
+ if((time() - $timestamp[1]) >= 86400) { // 86400 = 24h
+ unlink(TMPDIR."/".$tmp[$p]);
+ }
+ }
+ }
+
+ // store XML in tmp folder
+ if(Mapbender::session()->get("mb_wmc")) {
+ $filename = Mapbender::session()->get("mb_wmc");
+ } else {
+ $filename = TMPDIR."/".time()."_".uniqid();
+ }
+ file_put_contents($filename, $wmc->xml);
+ Mapbender::session()->set("mb_wmc",$filename);
+
// store XML in session
- Mapbender::session()->set("mb_wmc",$wmc->xml);
+ //Mapbender::session()->set("mb_wmc",$wmc->xml);
Mapbender::session()->set("epsg",$mapObject->epsg);
Mapbender::session()->set("previous_gui", Mapbender::session()->get("mb_user_gui"));
Modified: branches/2.7/http/php/mod_sessionWmc_server.php
===================================================================
--- branches/2.7/http/php/mod_sessionWmc_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_sessionWmc_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -21,6 +21,17 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
+ case 'deleteWmc':
+ if (Mapbender::session()->exists("mb_wmc")) {
+ Mapbender::session()->delete("mb_wmc");
+ $ajaxResponse->setMessage(_mb("WMC in session reset."));
+ $ajaxResponse->setSuccess(true);
+ } else {
+ $ajaxResponse->setMessage(_mb("No WMC in session found."));
+ $ajaxResponse->setResult($resultObj);
+ $ajaxResponse->setSuccess(false);
+ }
+ break;
case 'updateWmc':
if (
!Mapbender::session()->exists("wmcGetApi") ||
Copied: branches/2.7/http/php/mod_showCapDiff.php (from rev 7473, trunk/mapbender/http/php/mod_showCapDiff.php)
===================================================================
--- branches/2.7/http/php/mod_showCapDiff.php (rev 0)
+++ branches/2.7/http/php/mod_showCapDiff.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,44 @@
+<?php
+# $Id: mod_showCapDiff.php 3342 2008-12-16 12:31:26Z mschulz $
+# http://www.mapbender.org/index.php/Monitor_Capabilities
+# 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.
+
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+$wms_id = intval($_REQUEST["wmsid"]);
+if (isset($wms_id)){
+ if (!is_int($wms_id)) {
+ echo 'Error: wms_id is no integer<br>';
+ die();
+ }
+ } else {
+ echo 'Error: wms_id not requested<br>';
+ die();
+}
+$sql = "SELECT cap_diff FROM mb_wms_availability WHERE fkey_wms_id = $1";
+$v = array($wms_id);
+$t = array('i');
+$res = db_prep_query($sql,$v,$t);
+
+$cap_diff_row = db_fetch_row($res);
+$html = urldecode($cap_diff_row[0]);
+
+echo $html;
+
+
+?>
Modified: branches/2.7/http/php/mod_showMetadata.php
===================================================================
--- branches/2.7/http/php/mod_showMetadata.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_showMetadata.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -18,6 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once dirname(__FILE__) . "/../../core/globalSettings.php";
+require_once dirname(__FILE__)."/../classes/class_connector.php";
require_once dirname(__FILE__) . "/../classes/class_user.php";
require_once dirname(__FILE__) . "/../../tools/wms_extent/extent_service.conf";
@@ -26,6 +27,17 @@
//id: integer
//outputFormat: html, xml, georss,
//languageCode: de, en, fr
+//get language parameter out of mapbender session if it is set else set default language to de_DE
+if (isset($_SESSION['mb_lang']) && ($_SESSION['mb_lang']!='')) {
+ $e = new mb_exception("mod_showMetadata.php: language found in session: ".$_SESSION['mb_lang']);
+ $language = $_SESSION["mb_lang"];
+ $langCode = explode("_", $language);
+ $langCode = $langCode[0]; # Hopefully de or s.th. else
+ $languageCode = $langCode; #overwrite the GET Parameter with the SESSION information
+}
+$e = new mb_exception("mod_showMetadata.php: language in SESSION: ".$_SESSION['mb_lang']);
+$e = new mb_exception("mod_showMetadata.php: new language: ".$languageCode);
+
$layout = 'tabs';
//Parse REQUEST Parameters
if (isset($_REQUEST["resource"]) & $_REQUEST["resource"] != "") {
@@ -80,27 +92,19 @@
$testMatch = NULL;
}
$subscribe = intval($_GET["subscribe"]);
-/*
-//get language parameter out of mapbender session if it is set else set default language to de_DE
-if (isset($_SESSION['mb_lang']) and $_SESSION['mb_lang']!='') {
- $e = new mb_exception("mod_showMetadata.php: language in session: ".$_SESSION['mb_lang']);
- $language = $_SESSION["mb_lang"];
-} else {
- $language = "de_DE";//use locale for compatibility with later mapbender version
-}
-//extract language code out of locale
+$hostName = $_SERVER['HTTP_HOST'];
-$langCode = explode("_", $language);
-
-$langCode = $langCode[0];
-if ($languageCode == 'de' or $languageCode == 'en' or $languageCode == 'fr') {
- $langCode = $language;
+if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+ $mapbenderBaseUrl = "https://".$hostName;
+ $mapbenderProtocol = "https://";
+ }
+ else {
+ $mapbenderBaseUrl = "http://".$hostName;
+ $mapbenderProtocol = "http://";
}
-#$langCode="de";
-*/
-$e = new mb_exception("mod_showMetadata.php: language: ".$languageCode);
+
//Array with translations:
switch ($languageCode) {
case "de":
@@ -113,8 +117,12 @@
$translation['metadata'] = 'Metadaten';
$translation['kindOfResource'] = 'Art der Ressource';
$translation['wms'] = 'Kartendienst';
+ $translation['wfs'] = 'Datendienst';
$translation['layer'] = 'Kartenebene';
+ $translation['featuretype'] = 'Objektart';
+ $translation['geomtype'] = 'Geometrietyp';
$translation['contentId'] = 'Resourcenidentifikator';
+ $translation['contentName'] = 'Name der Ressouce';
$translation['serviceId'] = 'Informationen zum Dienst';
$translation['preview'] = 'Voransicht';
$translation['extent'] = 'Ausdehnung';
@@ -145,6 +153,7 @@
$translation['wgs84BboxGraphic'] = 'Kartenübersicht';
$translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
$translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['describeFeaturetype'] = 'Link zum Datenschema';
$translation['kml'] = 'KML';
$translation['inspireMetadata'] = 'INSPIRE Service Metadaten';
$translation['showInspireMetadata'] = 'Metadatendatei';
@@ -171,8 +180,12 @@
$translation['metadata'] = 'Metadata';
$translation['kindOfResource'] = 'Kind of resource';
$translation['wms'] = 'Map Service';
+ $translation['wfs'] = 'Data Service';
$translation['layer'] = 'Map Layer';
+ $translation['featuretype'] = 'Featuretype';
+ $translation['geomtype'] = 'Type of geometry';
$translation['contentId'] = 'Resourceidentifier';
+ $translation['contentName'] = 'Name of the resource';
$translation['serviceId'] = 'Information about the service';
$translation['preview'] = 'Preview';
$translation['extent'] = 'Extent';
@@ -203,6 +216,7 @@
$translation['wgs84BboxGraphic'] = 'Map View';
$translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
$translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['describeFeaturetype'] = 'Dataschema';
$translation['kml'] = 'KML';
$translation['inspireMetadata'] = 'INSPIRE Service Metadata';
$translation['showInspireMetadata'] = 'Metadatendatei';
@@ -229,8 +243,12 @@
$translation['metadata'] = 'Metadata';
$translation['kindOfResource'] = 'Kind of resource';
$translation['wms'] = 'Map Service';
+ $translation['wfs'] = 'Data Service';
$translation['layer'] = 'Map Layer';
+ $translation['featuretype'] = 'Featuretype';
+ $translation['geomtype'] = 'Type of geometry';
$translation['contentId'] = 'Resourceidentifier';
+ $translation['contentName'] = 'Name of the resource';
$translation['serviceId'] = 'Information about the service';
$translation['preview'] = 'Preview';
$translation['extent'] = 'Extent';
@@ -261,6 +279,7 @@
$translation['wgs84BboxGraphic'] = 'Map View';
$translation['mapbenderCapabilities'] = 'Geoportal Capabilities';
$translation['originalCapabilities'] = 'Original Capabilities';
+ $translation['describeFeaturetype'] = 'Dataschema';
$translation['kml'] = 'KML';
$translation['inspireMetadata'] = 'INSPIRE Service Metadata';
$translation['showInspireMetadata'] = 'Metadatendatei';
@@ -312,7 +331,7 @@
case "layer":
$layerId = $id;
$sql = "SELECT ";
- $sql .= "layer.layer_id as contentid, layer.layer_title as contenttitle, layer.layer_abstract as contentabstract, layer.layer_pos as contentpos, layer.layer_parent as contentparent, ";
+ $sql .= "layer.layer_id as contentid, layer.layer_title as contenttitle, layer.layer_abstract as contentabstract, layer.layer_pos as contentpos, layer.layer_parent as contentparent,layer.layer_name as contentname, ";
$sql .= "layer.layer_minscale as contentminscale, layer.layer_maxscale as contentmaxscale, layer.layer_queryable,";
$sql .= "wms.wms_title as servicetitle, wms.wms_abstract as serviceabstract, wms.wms_id as serviceid, wms.fees, wms.accessconstraints, wms.contactperson, wms.wms_getcapabilities,";
$sql .= "wms.contactposition, wms.contactorganization, wms.address, wms.city, wms_timestamp as timestamp, wms_owner as owner, wms.wms_owsproxy as owsproxy, wms.fkey_mb_group_id,";
@@ -325,14 +344,32 @@
$resourceSymbol = "<img src='../img/osgeo_graphics/Layer.png' alt='".$translation['layer']." - Bild' title='".$translation['layer']."'> - ".$translation['layer'];
break;
case "wfs":
- echo 'Not yet implemented!';
+ $wfsId = $id;
+ $sql = "SELECT ";
+ $sql .= "wfs.wfs_title as servicetitle, wfs.wfs_abstract as serviceabstract, wfs.wfs_id as serviceid, wfs.wfs_id as contentid,wfs.fees, wfs.accessconstraints, wfs.individualname as contactperson, wfs.wfs_getcapabilities,";
+ $sql .= "wfs.positionname as contactposition, wfs.providername as contactorganization, wfs.deliverypoint as address, wfs.city, wfs_timestamp as timestamp, wfs_owner as owner, wfs.wfs_owsproxy as owsproxy, wfs.fkey_mb_group_id,";
+ $sql .= "wfs.administrativearea as stateorprovince, wfs.postalcode as postcode, wfs.voice as contactvoicetelephone, wfs.facsimile as contactfacsimiletelephone, ";
+ $sql .= "wfs.electronicmailaddress as contactelectronicmailaddress, wfs.country ";
+ $sql .= "FROM wfs WHERE wfs_id = $1";
+ $v = array($wfsId);
+ $t = array('i');
+ $resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/server_vector.png' alt='".$translation['wfs']." - Bild' title='".$translation['wfs']."'> - ".$translation['wfs'];
$serviceType = 'wfs';
- die();
break;
case "featuretype":
- echo 'Not yet implemented!';
+ $featuretypeId = $id;
+ $sql = "SELECT ";
+ $sql .= "wfs_featuretype.featuretype_id as contentid, wfs_featuretype.featuretype_title as contenttitle, wfs_featuretype.featuretype_abstract as contentabstract, wfs_featuretype.featuretype_name as contentname,wfs_featuretype.featuretype_srs, ";
+ $sql .= "wfs.wfs_title as servicetitle, wfs.wfs_abstract as serviceabstract, wfs.wfs_id as serviceid, wfs.fees, wfs.accessconstraints, wfs.individualname as contactperson, wfs.wfs_getcapabilities, wfs.wfs_describefeaturetype, ";
+ $sql .= "wfs.positionname as contactposition, wfs.providername as contactorganization, wfs.deliverypoint as address, wfs.city, wfs_timestamp as timestamp, wfs_owner as owner, wfs.wfs_owsproxy as owsproxy, wfs.fkey_mb_group_id,";
+ $sql .= "wfs.administrativearea as stateorprovince, wfs.postalcode as postcode, wfs.voice as contactvoicetelephone, wfs.facsimile as contactfacsimiletelephone, ";
+ $sql .= "wfs.electronicmailaddress as contactelectronicmailaddress, wfs.country ";
+ $sql .= "FROM wfs_featuretype, wfs WHERE wfs_featuretype.featuretype_id = $1 AND wfs_featuretype.fkey_wfs_id = wfs.wfs_id LIMIT 1";
+ $v = array($featuretypeId);
+ $t = array('i');
$serviceType = 'wfs';
- die();
+ $resourceSymbol = "<img src='../img/osgeo_graphics/geosilk/vector.png' alt='".$translation['featuretype']." - Bild' title='".$translation['featuretype']."'> - ".$translation['featuretype'];
+ $serviceType = 'wfs';
break;
case "wfs-conf":
echo 'Not yet implemented!';
@@ -354,12 +391,17 @@
break;
}
//read resource information from database
+//$e = new mb_exception("mod_showMetadata: sql: ".$sql);
$res = db_prep_query($sql,$v,$t);
+
$resourceMetadata = db_fetch_array($res);
+
+
if (!isset($resourceMetadata['contentid']) or ($resourceMetadata['contentid'] == '')) {
echo 'No result for the requested id found in the registry!';
die();
}
+
if($resourceMetadata['owsproxy']!='') {
$resourceSecured = true;
}
@@ -414,7 +456,18 @@
$resDep = db_prep_query($sqlDep, $vDep, $tDep);
$metadataContactGroup = db_fetch_array($resDep);
}
+//Get Geometry Type if featuretype info was requested
+if ($resource == 'featuretype') {
+ $getTypeSql = "SELECT element_id, element_type from wfs_element WHERE fkey_featuretype_id = $1 AND element_type LIKE '%PropertyType';";
+ $vgetType = array($resourceMetadata['contentid']);
+ $tgetType = array('i');
+ $resGetType = db_prep_query($getTypeSql,$vgetType,$tgetType);
+ $featuretypeElements = db_fetch_array($resGetType);
+ $resourceMetadata['featuretype_geomType'] = $featuretypeElements['element_type'];
+}
+
+
$e = new mb_exception("mod_showMetadata: mb_group_name: ".$metadataContactGroup['mb_group_name']);
//db select for layer previews
if ($resource == 'wms' or $resource == 'layer') {
@@ -424,11 +477,11 @@
$resP = db_prep_query($sqlP, $vP, $tP);
$rowP = db_fetch_array($resP);
if ($rowP['layer_map_preview_filename'] != "") {
- //$resourceMetadata['preview'] = "<img src = '".PREVIEW_DIR."/".$rowP['layer_map_preview_filename']."'>";
- $resourceMetadata['preview'] = "<img src = 'http://".$_SERVER['HTTP_HOST']."/mapbender/geoportal/mod_showPreview.php?resource=layer&id=".$layerId."'>";
+ $resourceMetadata['preview'] = "<img src = '../geoportal/mod_showPreview.php?resource=layer&id=".$layerId."'>";
+
}
if ($rowP['layer_legend_preview_filename'] != "") {
- $resourceMetadata['legend'] .= "<img src = 'http://".$_SERVER['HTTP_HOST']."/mapbender/geoportal/mod_showPreview.php?resource=layerlegend&id=".$layerId."'>";
+ $resourceMetadata['legend'] .= "<img src = '../geoportal/mod_showPreview.php?resource=layerlegend&id=".$layerId."'>";
}
/* if ($rowP['layer_extent_preview_filename'] != "") {
$resourceMetadata['extent'] .= "<img src = '../x_geoportal/layer_preview/".$rowP['layer_extent_preview_filename']."'>";
@@ -436,7 +489,7 @@
}
if ($resource == 'wmc') {
- $resourceMetadata['preview'] = "<img src = 'http://".$_SERVER['HTTP_HOST']."/mapbender/geoportal/mod_showPreview.php?resource=wmc&id=".$resourceMetadata['contentid']."'>";
+ $resourceMetadata['preview'] = "<img src = '../geoportal/mod_showPreview.php?resource=wmc&id=".$resourceMetadata['contentid']."'>";
}
//db select for service quality
if ($resource == 'wms' or $resource == 'layer') {
@@ -583,7 +636,11 @@
}
$html .= '<p>';
$html .= $tableBegin;
-$html .= $t_a.$translation['resourceTitle'].$t_b."<em>".displayText($resourceMetadata['contenttitle'])."</em>".$t_c;
+if ($resourceMetadata['contenttitle'] !='') {
+ $html .= $t_a.$translation['resourceTitle'].$t_b."<em>".displayText($resourceMetadata['contenttitle'])."</em>".$t_c;
+} else {
+ $html .= $t_a.$translation['resourceTitle'].$t_b."<em>".displayText($resourceMetadata['servicetitle'])."</em>".$t_c;
+}
//decide if a root layer have been found - then the type will be a server
#$html .= "<br>".$resourceMetadata['contentpos']."<br>";
@@ -597,6 +654,12 @@
//identification information:
$html .= $t_a.$translation['contentId'].$t_b.$resourceMetadata['contentid'].$t_c;
+if (isset($resourceMetadata['contentname']) && ($resourceMetadata['contentname'] != '')) {
+ $html .= $t_a.$translation['contentName'].$t_b.$resourceMetadata['contentname'].$t_c;
+}
+
+
+
if ($resource != 'wmc') {
$html .= $t_a.$translation['serviceId'].$t_b."<a href='".$self."?resource=".$serviceType."&id=".$serviceId."&layout=".$layout."&languageCode=".$languageCode."'>".$serviceId."</a>".$t_c;
}
@@ -617,7 +680,11 @@
$html .= $t_a.$translation['contactOrganization'].$t_b."<img src='".$metadataContactGroup['metdatapointofcontactorglogo']."' height='30'>";
}
$html .= displayText($metadataContactGroup['metadatacontactorganization']).$t_c;
-$html .= $t_a.$translation['resourceAbstract'].$t_b.displayText($resourceMetadata['contentabstract']).$t_c;
+if ($resourceMetadata['contentabstract'] != '') {
+ $html .= $t_a.$translation['resourceAbstract'].$t_b.displayText($resourceMetadata['contentabstract']).$t_c;
+} else {
+ $html .= $t_a.$translation['resourceAbstract'].$t_b.displayText($resourceMetadata['serviceabstract']).$t_c;
+}
$user = new User();
//
@@ -680,7 +747,7 @@
}
}
$epsgString = '';
-if ($resource != 'wmc') {
+if (($resource == 'wms') || ($resource == 'layer')) {
for ($j = 0; $j < count($contentBboxes); $j++) {
$epsgString .= $contentBboxes[$j]['epsg']." ";
if ($contentBboxes[$j]['epsg'] == 'EPSG:4326') {
@@ -691,6 +758,17 @@
}
$html .= $t_a.$translation['crs'].$t_b.$epsgString.$t_c;
}
+
+if (($resource == 'featuretype') ) {
+ $epsgString .= $resourceMetadata['featuretype_srs'];
+ $html .= $t_a.$translation['crs'].$t_b.$epsgString.$t_c;
+}
+
+
+
+
+
+
if ($resource == 'wmc') {
$epsgString .= $resourceMetadata['contentcrs']." ";
if ($resourceMetadata['contentcrs'] == 'EPSG:4326') {
@@ -742,7 +820,16 @@
$html .= $t_a.$translation['minscale'].$t_b. "1 : ".$resourceMetadata['contentmaxscale'].$t_c;
}
}
+if (isset($resourceMetadata['wfs_describefeaturetype']) && ($resourceMetadata['wfs_describefeaturetype'] != '')) {
+ $html .= $t_a.$translation['describeFeaturetype'].$t_b."<a href='".$resourceMetadata['wfs_describefeaturetype']."REQUEST=DescribeFeaturetype&typename=".$resourceMetadata['contentname']."' >Link</a>".$t_c;
+}
+
+
+if (isset($resourceMetadata['featuretype_geomType']) && ($resourceMetadata['featuretype_geomType'] != '')) {
+ $html .= $t_a.$translation['geomtype'].$t_b.$resourceMetadata['featuretype_geomType'].$t_c;
+}
+
$html .= $tableEnd;
$html .= '</p>';
$html .= '</div>';
@@ -803,11 +890,13 @@
}
$html .= '<p>';
if ($resource == 'wms' or $resource == 'layer') {
- $tou = file_get_contents("http://localhost/mapbender/php/mod_getServiceDisclaimer.php?type=".$serviceType."&id=".$serviceId."&languageCode=".$languageCode."&asTable=true");
+ $touServiceConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../mod_getServiceDisclaimer.php?resource=wms&id=".$resourceMetadata['serviceid']."&languageCode=".$languageCode."&asTable=true");
+ $tou = $touServiceConnector->file;
}
if ($resource == 'wmc' ) {
$e = new mb_exception("mod_showMetadata: wmcid for disclaimer: ".$resourceMetadata['contentid']);
- $tou = file_get_contents("http://localhost/mapbender/php/mod_getWmcDisclaimer.php?&id=".$resourceMetadata['contentid']."&languageCode=".$languageCode."&hostName=".$_SERVER['HTTP_HOST']);
+ $touWmcConnector = new connector($mapbenderProtocol."localhost".$_SERVER['SCRIPT_NAME']."/../mod_getWmcDisclaimer.php?&id=".$resourceMetadata['contentid']."&languageCode=".$languageCode."&hostName=".$hostName);
+ $tou = $touWmcConnector->file;
}
$html .= $tou;
Modified: branches/2.7/http/php/mod_wfs_conf_interface.js
===================================================================
--- branches/2.7/http/php/mod_wfs_conf_interface.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_wfs_conf_interface.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -134,7 +134,7 @@
"title" : "Download",
"icon" : "someicon.png",
"columns" : [
- "geom", "pos", "show", "respos", "showDetail", "detailPos", "helptext"
+ "geom", "pos", "show", "respos", "showDetail", "detailPos", "helptext", "label","show"
]
},
{
@@ -1119,4 +1119,4 @@
}
}, 0);
});
-};
\ No newline at end of file
+};
Modified: branches/2.7/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- branches/2.7/http/php/mod_wfs_gazetteer_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/mod_wfs_gazetteer_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -89,7 +89,7 @@
if ($wfsConfIdString != "") {
//array_keys(array_flip()) produces an array with unique entries
$wfsConfIdArray = array_keys(array_flip(mb_split(",", $wfsConfIdString)));
- $availableWfsConfIds = $user->getWfsConfByPermission(Mapbender::session()->get("mb_user_gui"));
+ $availableWfsConfIds = $user->getWfsConfByPermission();
$wfsConfIdArray = array_intersect($wfsConfIdArray, $availableWfsConfIds);
if (count($wfsConfIdArray) === 0) {
Modified: branches/2.7/http/php/tagCloud.php
===================================================================
--- branches/2.7/http/php/tagCloud.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/php/tagCloud.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -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));
Copied: branches/2.7/http/plugins/mb_adminpopup.js (from rev 7473, trunk/mapbender/http/plugins/mb_adminpopup.js)
===================================================================
--- branches/2.7/http/plugins/mb_adminpopup.js (rev 0)
+++ branches/2.7/http/plugins/mb_adminpopup.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,59 @@
+/**
+ * Package: mb_adminpopup
+ *
+ * Description:
+ *
+ *
+ *
+ *
+ *
+ *
+ * Files:
+ * - ../plugins/mb_adminpopup.js
+ *
+ * SQL:
+ * > INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
+ * > e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target,
+ * > e_requires, e_url) VALUES ('<gui_id>','mb_adminpopup',7,1,'adminpopup','adminpopup','div',
+ * > '','',NULL ,NULL ,NULL ,NULL ,NULL ,
+ * > '','','div','../plugins/mb_adminpopup.js','','','','');
+ *
+ * Maintainer:
+ * http://www.mapbender.org/User:Karim_Malhas
+ *
+ * Parameters:
+ *
+ * License:
+ * Copyright (c) 2009, Open Source Geospatial Foundation
+ * This program is dual licensed under the GNU General Public License
+ * and Simplified BSD license.
+ * http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
+ */
+
+var $adminpopup = $(this);
+
+var AdminPopup = function(o){
+ // create dialog window
+ $(this).dialog({
+ autoOpen: false,
+ position: 'center',
+ width: 300,
+ height: 300,
+ buttons: {
+ "Schliessen": function(){
+ $adminpopup.dialog('close');
+ }
+ }
+ });
+ // push iframe AdminFrame into dialog
+ $adminpopup.append($('#AdminFrame'));
+
+ // show dialog onClick on anchor
+ $('a').bind('click',function(){ $adminpopup.dialog('open')});
+};
+
+
+Mapbender.events.init.register(function(){
+ $adminpopup.mapbender(new AdminPopup(options));
+});
+
Modified: branches/2.7/http/plugins/mb_extendedSearch_server.php
===================================================================
--- branches/2.7/http/plugins/mb_extendedSearch_server.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/plugins/mb_extendedSearch_server.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -60,10 +60,10 @@
$entries['translations']['searchTypeBboxIntersects'] = 'angeschnitten';
$entries['translations']['searchTypeBboxOutside'] = 'ganz außerhalb';
$entries['translations']['searchTypeBboxInside'] = 'innerhalb';
- $entries['translations']['orderByRelevance'] = 'Relevanz';
- $entries['translations']['orderByTitle'] = 'Titel';
- $entries['translations']['orderById'] = 'ID';
- $entries['translations']['orderByDate'] = 'Datum';
+ $entries['translations']['orderByRelevance'] = 'Nachfrage';
+ $entries['translations']['orderByTitle'] = 'Alphabetisch';
+ $entries['translations']['orderById'] = 'Identifizierungsnummer';
+ $entries['translations']['orderByDate'] = 'Letzte Änderung';
$entries['translations']['legendOrderBy'] = 'Sortieren nach:';
$entries['translations']['legendDepartment'] = 'Anbieter:';
$entries['translations']['legendInspireThemes'] = 'Inspire Themen';
@@ -80,9 +80,9 @@
$entries['translations']['labelOutside'] = 'außerhalb';
$entries['translations']['labelInside'] = 'komplett innerhalb';
$entries['translations']['labelOrderByRank'] = 'Nachfrage';
- $entries['translations']['labelOrderByTitle'] = 'Titel';
- $entries['translations']['labelOrderById'] = 'Identifikation';
- $entries['translations']['labelOrderByDate'] = 'Datum';
+ $entries['translations']['labelOrderByTitle'] = 'Alphabetisch';
+ $entries['translations']['labelOrderById'] = 'Ident. Nummer';
+ $entries['translations']['labelOrderByDate'] = 'Letzte Änderung';
$entries['translations']['labelCheckResourcesWms'] = 'Interaktive Karten';
$entries['translations']['labelCheckResourcesWfs'] = 'Such/Download/Erfassungsmodule';
$entries['translations']['labelCheckResourcesWmc'] = 'Kartensammlungen';
@@ -98,16 +98,17 @@
$entries['translations']['deleteSelection4'] = 'Auswahl löschen';
$entries['translations']['classificationsLegend'] = 'Klassifikationen';
$entries['translations']['legendActuality'] = 'Zeitliche Einschränkung';
- $entries['translations']['helpInspireThemes'] = 'Hilfe zu den Inspire Themenbereichen';
- $entries['translations']['helpSearchText'] = 'Hilfe zur Textsuche. Bitte geben Sie hier kommasepariert eine Liste von Suchbegriffen ein. Die Begriffe werden für eine Volltextsuche über Titel, Beschreibung und Keywords verwendet. Die Verknüpfung der Suchbegriffe geschieht über ein UND. Je mehr Begriffe eingegeben werden, desto weniger Treffer werden gefunden. <a href="http://www.geoportal.rlp.de">testlink</a>';
- $entries['translations']['helpIsoCategories'] = 'Hilfe zu den ISO Kategorien';
- $entries['translations']['helpCustomCategories'] = 'Hilfe zu eigenen Themenkategorien';
- $entries['translations']['helpOrderBy'] = 'Hilfe zu Sortierung der Liste';
- $entries['translations']['helpSpatialFilter'] = 'Hilfe zum räumlichen Filter';
- $entries['translations']['helpProvider'] = 'Hilfe zu den Providern';
- $entries['translations']['helpDateOfPublication'] = 'Hilfe zum Veröffentlichungsdatum';
- $entries['translations']['helpDateOfLastRevision'] = 'Hilfe zum Datum der letzten Änderung';
- $entries['translations']['helpSearchResources'] = 'Hilfe zu den Resourcentypen';
+ $entries['translations']['helpInspireThemes'] = 'Entsprechend der 34 Annex-Themen der EU-INSPIRE-Richtlinie können hier Einzelthemen (auch Mehrfachauswahl) ausgesucht werden.';
+ $entries['translations']['helpSearchText'] = 'Hilfe zur Textsuche. Bitte geben Sie hier ein oder kommasepariert mehrere Suchbegriffe ein. Die Begriffe werden für eine Volltextsuche über Titel, Beschreibung und Keywords verwendet. Die Verknüpfung der Suchbegriffe geschieht über ein UND. Je mehr Begriffe eingegeben werden, desto weniger Treffer werden gefunden.';
+ # <a href="http://www.geoportal.rlp.de">testlink</a> - can be included in the content of a dialog
+ $entries['translations']['helpIsoCategories'] = 'Die 20 Themen, die in der Norm ISO19115 definiert sind, sind weltweit abgestimmt und sollten bei der Beschreibung von Geodaten immer mit angegeben werden um eine eindeutige Identifizierbarkeit zu ermöglichen. Eine entsprechende Auswahl/Ergebniseinschränkung ist hier möglich.';
+ $entries['translations']['helpCustomCategories'] = 'Falls individuelle Themenkategorien angelegt wurden, sind diese hierrüber anwählbar.';
+ $entries['translations']['helpOrderBy'] = 'Hier können Sie angeben, nach welchen Kriterien die Ergebnisse sortiert werden sollen. „Nachfrage“ bedeutet, dass die am häufigsten aufgerufenen Ergebnisse an oberste Stelle kommen. „Alphabetisch“ bedeutet eine alphabetische Sortierung. Die „Ident. Nummer“ ist eine automatisch generierte Zahl, über die eine Ressource eindeutig identifiziert werden kann. In der Trefferanzeige werden dann die Treffer nach Diensten gruppiert. „Letzte Änderung“ bedeutet eine Sortierung nach der Aktualität der Metainformationen wodurch die neuesten Informationen an erster Stelle stehen.';
+ $entries['translations']['helpSpatialFilter'] = 'Hier können Sie eine räumliche Einschränkung festsetzen. Die Einschränkung wird mit Ihrem Suchbegriff verknüpft. Sie bekommen nur Treffer, die sowohl den Suchbegriff beinhalten, als auch in dem von Ihnen definierten Gebiet liegen.';
+ $entries['translations']['helpProvider'] = 'Hier finden Sie eine Auflistung aller Anbieter von GeoWebDiensten. Wenn Sie nur Daten eines Anbieters suchen, dann wählen Sie den oder die entsprechenden aus.';
+ $entries['translations']['helpDateOfPublication'] = 'Geben Sie hier das Datum der Veröffentlichung der beschreibenden Informationen (Metadaten) ein bzw. einen Zeitraum, in dem diese Veröffentlichung stattgefunden haben kann. Das Datum bezeichnet dabei den Zeitpunkt der letztmaligen Aktualisierung der beschreibenden Informationen.';
+ $entries['translations']['helpDateOfLastRevision'] = 'Tragen Sie hier den Zeitraum (bzw. nur das Start- oder das Enddatum) ein, auf denen die Daten stammen bzw. in dem sie aktualisiert wurden. <b>Hinweis: Diese Funktion steht erst ab Mitte 2011 zu Verfügung.</b>';
+ $entries['translations']['helpSearchResources'] = 'Hierbei können Sie sich aussuchen, welche Art von Ressourcen Sie suchen wollen – je nach Auswahl wird dann nur dieser Ressourcentyp in der Trefferanzeige aufgeführt.';
$exceptionGroupTitle = "Es wurde noch kein Titel für die Gruppe eingestellt!";
break;
@@ -119,12 +120,12 @@
$entries['translations']['labelSpatialFilter'] = 'activate spatial filter';
$entries['translations']['labelSpatialFilterType'] = 'how?';
$entries['translations']['searchTypeBboxIntersects'] = 'intersects';
- $entries['translations']['searchTypeBboxOutside'] = 'outside';
+ $entries['translations']['searchTypeBboxOutside'] = 'outside test';
$entries['translations']['searchTypeBboxInside'] = 'fully inside';
- $entries['translations']['orderByRelevance'] = 'relevance';
- $entries['translations']['orderByTitle'] = 'title';
- $entries['translations']['orderById'] = 'identification';
- $entries['translations']['orderByDate'] = 'date';
+ $entries['translations']['orderByRelevance'] = 'demand';
+ $entries['translations']['orderByTitle'] = 'alphabetically';
+ $entries['translations']['orderById'] = 'identification number';
+ $entries['translations']['orderByDate'] = 'last change';
$entries['translations']['legendOrderBy'] = 'Sort by:';
$entries['translations']['legendDepartment'] = 'Provider:';
$entries['translations']['legendInspireThemes'] = 'Inspire themes';
@@ -140,10 +141,10 @@
$entries['translations']['labelIntersects'] = 'intersects';
$entries['translations']['labelOutside'] = 'outside';
$entries['translations']['labelInside'] = 'completely inside';
- $entries['translations']['labelOrderByRank'] = 'relevance';
- $entries['translations']['labelOrderByTitle'] = 'title';
- $entries['translations']['labelOrderById'] = 'identification';
- $entries['translations']['labelOrderByDate'] = 'date';
+ $entries['translations']['labelOrderByRank'] = 'demand';
+ $entries['translations']['labelOrderByTitle'] = 'alphabetically';
+ $entries['translations']['labelOrderById'] = 'identification number';
+ $entries['translations']['labelOrderByDate'] = 'last change';
$entries['translations']['labelCheckResourcesWms'] = 'Viewing Services';
$entries['translations']['labelCheckResourcesWfs'] = 'Search/Download/Digitize modules';
$entries['translations']['labelCheckResourcesWmc'] = 'Map Collections';
@@ -155,16 +156,16 @@
$entries['translations']['deleteSelection4'] = 'Delete current selection';
$entries['translations']['classificationsLegend'] = 'Classifications';
$entries['translations']['legendActuality'] = 'Temporal Filter';
- $entries['translations']['helpInspireThemes'] = 'Help for the Inspire Themes';
- $entries['translations']['helpSearchText'] = 'Help for Fulltextsearch';
- $entries['translations']['helpIsoCategories'] = 'Help for ISO19115 classification';
- $entries['translations']['helpCustomCategories'] = 'Help for own classification';
- $entries['translations']['helpOrderBy'] = 'Help for ordering filter';
- $entries['translations']['helpSpatialFilter'] = 'Help for spatial Filter';
- $entries['translations']['helpProvider'] = 'Help for registrating departments';
- $entries['translations']['helpDateOfPublication'] = 'Help for date of publication';
- $entries['translations']['helpDateOfLastRevision'] = 'Help for date of last revision';
- $entries['translations']['helpSearchResources'] = 'Help for types of resources';
+ $entries['translations']['helpInspireThemes'] = 'According to the EU-INSPIRE Directive one or a few of the 34 ANNEX-themes can be selected.';
+ $entries['translations']['helpSearchText'] = 'Please use one or several search words (separated with a comma). These words will be used for a full text search of title, description and keyword. The more words you use, the less results will be found.';
+ $entries['translations']['helpIsoCategories'] = 'These 20 themes which are defined in norm ISO19115 are adjusted worldwide and should be also given with the description of Geodata to allow for a unique identification. An adequate selection/limitation of outputs is possible.';
+ $entries['translations']['helpCustomCategories'] = 'These categories are common to either the SDI of Rhineland-Palatinate or to the SDI of Germany (GDI-DE).';
+ $entries['translations']['helpOrderBy'] = 'You can select the kind of sorting which will be used for the outputs. „Demand“ puts the most selected outputs first. The „identification number“ is an automaticly generated number which makes a specific identification possible. „Last change“ sort the outputs to actuality so the newest information will come first.';
+ $entries['translations']['helpSpatialFilter'] = 'You can appoint regional constraints. The constraint will be attached with your search word. You will just get outputs, which include the search word and which find oneself in this defined area.';
+ $entries['translations']['helpProvider'] = 'You can find a list of all providers of GeoWebServices. If you ar just looking for Services of one provider, please choose this one or these ones.';
+ $entries['translations']['helpDateOfPublication'] = 'You can enter the date of publication of the describing informations (metadata) or a period in which this publication could have been proceeded. This date constitutes the point of the last update of the describing informations.';
+ $entries['translations']['helpDateOfLastRevision'] = 'Please enter in here the period (or just the first or last date) from which the dates come from or in which they were updated. <b>Attention: This function just works from middle 2011.</b>';
+ $entries['translations']['helpSearchResources'] = 'You can select in this category, which kind of ressource you are looking for. According to this assortment only this type of ressource will be enlisted in the output index.';
$exceptionGroupTitle = "The title for this group have not been defined till now!";
@@ -222,7 +223,7 @@
$entries['custom_cat_id'] = array();
$entries['custom_cat_name'] = array();
$entries['custom_cat_title'] = array();
- $sql_cat= "SELECT * FROM custom_category order by custom_category_code_".$langCode;
+ $sql_cat= "SELECT * FROM custom_category WHERE custom_category_hidden != 1 order by custom_category_code_".$langCode;
$res_cat = pg_query($sql_cat);
while($row_cat = db_fetch_array($res_cat)){
array_push($entries['custom_cat_id'], $row_cat['custom_category_id']);
Copied: branches/2.7/http/plugins/mb_iframepopup.js (from rev 7473, trunk/mapbender/http/plugins/mb_iframepopup.js)
===================================================================
--- branches/2.7/http/plugins/mb_iframepopup.js (rev 0)
+++ branches/2.7/http/plugins/mb_iframepopup.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,61 @@
+/**
+ * Package: mb_iframepopup
+ *
+ * Description:
+ *
+ *
+ *
+ *
+ *
+ *
+ * Files:
+ * - ../plugins/mb_iframepopup.js
+ *
+ * SQL:
+ * > INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
+ * > e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod,
+ * > e_target, e_requires, e_url) VALUES('Administration','mb_iframepopup',7,1,'iframepopup','',
+ * > 'div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','div','../plugins/mb_iframepopup.js','','','','');
+ *
+ * Maintainer:
+ * http://www.mapbender.org/User:Karim_Malhas
+ *
+ * Parameters:
+ *
+ * License:
+ * Copyright (c) 2009, Open Source Geospatial Foundation
+ * This program is dual licensed under the GNU General Public License
+ * and Simplified BSD license.
+ * http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
+ */
+
+var $iframepopup = $(this);
+
+
+var IframePopup = function(o) {
+ $('a').click(function(e) {
+ e.preventDefault();
+ var $this = $(this);
+ var horizontalPadding = 30;
+ var verticalPadding = 30;
+ $('<iframe src="' + this.href + '" />').dialog({
+ title: ($this.attr('title')) ? $this.attr('title') : 'External Site',
+ autoOpen: true,
+ width: 800,
+ height: 500,
+ modal: true,
+ resizable: true,
+ autoResize: true,
+ overlay: {
+ opacity: 0.5,
+ background: "black"
+ }
+ }).width(800 - horizontalPadding).height(500 - verticalPadding);
+ });
+ };
+
+
+Mapbender.events.init.register(function(){
+ $iframepopup.mapbender(new IframePopup(options));
+});
+
Modified: branches/2.7/http/plugins/mb_sessionWmc.js
===================================================================
--- branches/2.7/http/plugins/mb_sessionWmc.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/plugins/mb_sessionWmc.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -82,6 +82,22 @@
req.send();
};
+ this.deleteWmc = function () {
+ var req = new Mapbender.Ajax.Request({
+ url: "../php/mod_sessionWmc_server.php",
+ method: "deleteWmc",
+ parameters: {
+ },
+ callback: function (obj, result, message) {
+ window.resetSession = true;
+ //alert(message);
+ location.reload();
+ //mapbender reload!
+ }
+ });
+ req.send();
+ };
+
var displayConstraints = function (obj) {
var html = "";
var constraintTypeArray = [];
@@ -124,7 +140,7 @@
return;
}
- $dialog = $("<div id='" + o.id + "_constraint_form' title='Warning'>" +
+ $dialog = $("<div id='" + o.id + "_constraint_form' title='Hinweis'>" +
"<style> fieldset label { display: block; }</style>" +
"<form>" + html + "</form></div>").dialog({
bgiframe: true,
Modified: branches/2.7/http/plugins/mb_wfsGazetteer.js
===================================================================
--- branches/2.7/http/plugins/mb_wfsGazetteer.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/plugins/mb_wfsGazetteer.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -34,4 +34,37 @@
});
}
});
+
+ $gazetteer.bind("receivefeaturecollection", function () {
+ if(options.activateLayer) {
+ var activateLayer = options.activateLayer.split(",");
+ var map = $(this + ":maps").mapbender();
+ var wmsArray = map.wms;
+ for(var i = 0; i < activateLayer.length; i++) {
+ activateLayer[i] = $.trim(activateLayer[i]);
+ }
+
+ for (var i in wmsArray) {
+ var currentWms = wmsArray[i];
+
+ if(currentWms.gui_wms_visible == 1) {
+ //first step: deactivate all WMS from tree
+ handleSelectedWms(map.elementName, currentWms.wms_id, "visible", 0);
+ handleSelectedWms(map.elementName, currentWms.wms_id, "querylayer", 0);
+ }
+
+ for (var j in currentWms.objLayer) {
+ var currentLayer = currentWms.objLayer[j];
+
+ //second step: activate all layer from element var activateLayer
+ if($.inArray(currentLayer.layer_name, activateLayer) != -1) {
+ currentWms.handleLayer(currentLayer.layer_name, "visible", 1);
+ currentWms.handleLayer(currentLayer.layer_name, "querylayer", 1);
+ }
+ }
+ }
+ map.setMapRequest();
+ initWmsCheckboxen();
+ }
+ });
});
Modified: branches/2.7/http/plugins/wfsConfTree.js
===================================================================
--- branches/2.7/http/plugins/wfsConfTree.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/http/plugins/wfsConfTree.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -1,6 +1,7 @@
var $confTree = $(this);
var ConfTree = function(o){
+
wfsConfIdString = o.wfsConfIdString || "";
@@ -13,29 +14,12 @@
$confTree.children().remove();
$confTree.addClass('conftree');
- var $WFSConffolder = $('<li class="open wfsconf"><button class="toggle" name="toggle" value="toggle"></button><a href="#">WFSConf</a><ul></ul></li>');
+ var $WFSConffolder = $('<li class="open wfsconf"><ul></ul></li>');
$confTree.append($WFSConffolder);
- /*
- $addButton = $('<button class="add" name="addwfsconf" value="addwfsconf"></button>');
- $addButton.click(function(){
- $('<div ><input class="feedurl" /></div>').dialog({
- "title": "WFSConf feed hinzufügen",
- "buttons":{
- "OK": function(){
- $('#mapframe1').geowfsconf({ url: $(this).find('.feedurl').val()});
- $(this).dialog('destroy');
- }
- }
- });
- });
- $WFSConffolder.find("a").after($addButton);
- */
-
-
var $wfsConfDialog = $("<div></div>").dialog({
- width: 300,
- height: 400,
+ width: 500,
+ height: 600,
autoOpen: false,
buttons:{
"schliessen": function(){
@@ -57,35 +41,37 @@
$featuretypeList = $featuretypeFolder.find("ul");
};
-
-
switch(aWFSConf[i].wfs_conf_type){
/* search */
case "0":
- $wfsconfEntry = $('<li><a href="#">Suche</a></li>');
+ $wfsconfEntry = $('<li class="search" ><img src="../img/gnome/icn_suchmodul.png" /><a href="#" class="meta">metadata</a><button class="remove">remove</button><a href="#" class="dialogopen">'+ aWFSConf[i].g_label +'</a></li>');
+ //$wfsconfEntry = $('<li class="search" ><a href="#" class="meta">metadata</a><button class="remove">remove</button><a href="#" class="dialogopen">'+ aWFSConf[i].g_label +'</a></li>');
break;
/* digitize */
case "1":
- $wfsconfEntry = $('<li><a href="#">Erfassung</a></li>');
+ $wfsconfEntry = $('<li class="digitize" ><img src="../img/gnome/document-save.png" /><a href="#" class="meta">medadata</a><button class="remove">remove</button><a href="#" class="dialogopen">'+ aWFSConf[i].g_label +'</a></li>');
break;
/* download */
case "2":
- $wfsconfEntry = $('<li><a href="#">Download</a></li>');
+ $wfsconfEntry = $('<li class="download" ><img src="../img/gnome/accessories-text-editor.png" /><a href="#" class="meta">metadata</a><button class="remove">remove</button><a href="#" class="dialogopen">'+ aWFSConf[i].g_label +'</a></li>');
break;
}
$featuretypeList.append($wfsconfEntry);
- $wfsconfEntry.find("a").click((function(wfsConf){
+ $wfsconfEntry.find("a.dialogopen").click((function(wfsConf){
return function(){
+ var querystring = 'wfsConfId='+wfsConf.wfs_conf_id+'&e_id_css='+o.id+'&e_target='+o.target;
switch(wfsConf.wfs_conf_type){
/* search */
case "0":
- var $iframe = $('<iframe style="width: 100%; height: 100%;" src="../javascripts/mod_wfsGazetteerEditor_client.php?wfsConfId='+wfsConf.wfs_conf_id +'"></iframe>');
+ /* download */
+ case "2":
+ var $iframe = $('<iframe name="'+o.id+'_" style="width: 100%; height: 100%;" src="../javascripts/mod_wfsGazetteerEditor_client.php?'+querystring+'"></iframe>');
$wfsConfDialog.empty();
$wfsConfDialog.append($iframe);
$wfsConfDialog.dialog("open");
@@ -94,18 +80,22 @@
/* digitize */
case "1":
break;
-
- /* download */
- case "2":
- var $iframe = $('<iframe style="width: 100%; height: 100%;" src="../javascripts/mod_wfsGazetteerEditor_client.php?wfsConfId='+wfsConf.wfs_conf_id +'"></iframe>');
- $wfsConfDialog.empty();
- $wfsConfDialog.append($iframe);
- $wfsConfDialog.dialog("open");
- break;
}
};
})(aWFSConf[i]));
+ $wfsconfEntry.find("button.remove").click(function(){
+
+ // if this was the last entry in the featuregroup, remove it completely ...
+ if($(this).parent().siblings().size() == 0){
+ $(this).parent().parent().parent().remove();
+ }else{
+ //.. otherwise just rmeove the entry
+ $(this).parent().remove();
+ }
+
+
+ });
}
});
Property changes on: branches/2.7/http/print/mapbender_template.json
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/mapbender/http/print/mapbender_template.json:7363-7474
Modified: branches/2.7/lib/class_Monitor.php
===================================================================
--- branches/2.7/lib/class_Monitor.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/lib/class_Monitor.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -64,8 +64,8 @@
$this->wmsId = $this->getTagOutOfXML($this->reportFile,'wms_id');
$this->uploadId = $this->getTagOutOfXML($this->reportFile,'upload_id');
$this->autoUpdate = $autoUpdate;
- $e=new mb_notice("Monitor Report File: ".$this->reportFile);
- $e=new mb_notice("WMS ID: ".$this->wmsId);
+ $e=new mb_exception("Monitor Report File: ".$this->reportFile);
+ $e=new mb_exception("WMS ID: ".$this->wmsId);
$this->capabilitiesURL = urldecode($this->getTagOutOfXML($this->reportFile,'getcapurl'));//read out from xml
$e=new mb_notice("GetCapURL: ".$this->capabilitiesURL);
Modified: branches/2.7/lib/mb.ui.wfsGazetteer.js
===================================================================
--- branches/2.7/lib/mb.ui.wfsGazetteer.js 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/lib/mb.ui.wfsGazetteer.js 2011-01-27 09:48:27 UTC (rev 7475)
@@ -253,6 +253,9 @@
that._trigger('receivefeaturecollection',null,{
featureCollection:json,
wfsConf: that.options.wfsConf});
+ $(that.element).trigger('receivefeaturecollection',null,{
+ featureCollection:json,
+ wfsConf: that.options.wfsConf});
});
Copied: branches/2.7/resources/db/materialize_wms_view.sql (from rev 7473, trunk/mapbender/resources/db/materialize_wms_view.sql)
===================================================================
--- branches/2.7/resources/db/materialize_wms_view.sql (rev 0)
+++ branches/2.7/resources/db/materialize_wms_view.sql 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,70 @@
+select * into wms_search_table_tmp from search_wms_view;
+
+
+DROP TABLE wms_search_table;
+
+ALTER TABLE wms_search_table_tmp RENAME TO wms_search_table;
+
+UPDATE wms_search_table SET load_count=0 WHERE load_count is NULL;
+
+-- Index: gist_wst_the_geom
+
+-- DROP INDEX gist_wst_the_geom;
+
+CREATE INDEX gist_wst_the_geom
+ ON wms_search_table
+ USING gist
+ (the_geom);
+
+-- Index: idx_wst_department
+
+-- DROP INDEX idx_wst_department;
+
+CREATE INDEX idx_wst_department
+ ON wms_search_table
+ USING btree
+ (department);
+-- Index: idx_wst_md_topic_cats
+
+-- DROP INDEX idx_wst_md_topic_cats;
+
+CREATE INDEX idx_wst_md_topic_cats
+ ON wms_search_table
+ USING btree
+ (md_topic_cats);
+-- Index: idx_wst_layer_id
+
+-- DROP INDEX idx_wst_layer_id;
+
+CREATE INDEX idx_wst_layer_id
+ ON wms_search_table
+ USING btree
+ (layer_id);
+
+-- Index: idx_wst_load_count
+
+-- DROP INDEX idx_wst_load_count;
+
+CREATE INDEX idx_wst_load_count
+ ON wms_search_table
+ USING btree
+ (load_count);
+-- Index: idx_wst_searchtext
+
+-- DROP INDEX idx_wst_searchtext;
+
+CREATE INDEX idx_wst_searchtext
+ ON wms_search_table
+ USING btree
+ (searchtext);
+
+-- Index: idx_wst_wms_timestamp
+
+-- DROP INDEX idx_wst_wms_timestamp;
+
+CREATE INDEX idx_wst_wms_timestamp
+ ON wms_search_table
+ USING btree
+ (wms_timestamp);
+--vacuum analyze;
+--VACUUM ANALYZE wms_search_table;
Modified: branches/2.7/resources/db/new_admin_gui.sql
===================================================================
--- branches/2.7/resources/db/new_admin_gui.sql 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/resources/db/new_admin_gui.sql 2011-01-27 09:48:27 UTC (rev 7475)
@@ -1,74 +1,139 @@
INSERT INTO gui (gui_id, gui_name, gui_description, gui_public) VALUES ('Administration','Administration','Dienstadmin',1);
-
-- give root access to admin_wms_metadata
-INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) VALUES ('Admin_Dienste', 1, 'owner');
-
-
+INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) VALUES ('Administration', 1, 'owner');
+-- set category to administration guis
+INSERT into gui_gui_category VALUES ('Administration', 1);
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','i18n',1,1,'Internationalization module, collects data from all elements and sends them to the server in a single POST request. The strings are translated via gettext only.','Internationalization','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_i18n.js','','','','http://www.mapbender.org/Gettext');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_datatables',1,0,'Includes the jQuery plugin datatables, use like this
-$(selector).datatables(options)','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','../plugins/jq_datatables.js','../extensions/dataTables-1.5/media/js/jquery.dataTables.min.js','','','http://www.datatables.net/');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','jq_datatables','defaultCss','../extensions/dataTables-1.5/media/css/demo_table_jui.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui',1,0,'The jQuery UI core','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.core.js','','','');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','jq_ui','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_upload',1,0,'','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../plugins/jq_upload.js','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_widget',1,0,'jQuery UI widget','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.widget.js','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','globalWindowOpener',1,1,'Globel handler for an administration window','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','../javascripts/mod_windowOpener.js','','','','');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','globalWindowOpener','windowHeight','100','','var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','globalWindowOpener','windowWidth','300','','var');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','body',1,1,'Navigation','','body','','',0,0,200,40,NULL ,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','body',1,1,'Navigation','','body','','',0,0,200,40,NULL ,'','','','../geoportal/mod_revertGuiSessionSettings.php','','','','');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','favicon','../img/favicon.png','favicon','php_var');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','includeWhileLoading','','show splash screen while the application is loading','php_var');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','popupcss','../css/popup.css','file css','file/css');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','tablesortercss','../css/tablesorter.css','file css','file/css');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','use_load_message','true','show splash screen while the application is loading','php_var');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','owsproxy,owsproxy_icon','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','jq_ui_theme','../extensions/jquery-ui-1.7.2.custom/css/smoothness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','body','jq_ui_effects_transfer','.ui-effects-transfer { z-index:1003; border: 2px dotted gray; } ','','text/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_widget',1,1,'jQuery UI widget','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.widget.js','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui',1,1,'jQuery UI core','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.core.js','','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','jq_ui','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WMS_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWMS,deleteWMS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_icon',2,1,'icon','','img','../img/gnome/emblem-readonly.png','',0,0,NULL ,NULL,2,'','','','','','','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wms_metadata,wms_metadata_icon','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWMSs',2,1,'edit the elements of the gui','','a','','href="../php/mod_updateWMS.php?sessionID"''
-target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','UPDATE WMS','a','','','','','http://www.mapbender.org/index.php/UpdateWMS');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWMSs_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','updateWMSs,updateWMSs_icon','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wmc_metadata',2,1,'wmc metadata editor','','a','','href = "../frames/index.php?guiID=admin_wmc_metadata"
-target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','METADATA EDITOR','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wmc_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wmc_metadata,wmc_metadata_icon','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_wmc',2,1,'WMC admin menu','Admin WMC','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','wmc_metadata_collection','','');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','menu_wmc','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_wfs',2,1,'WFS admin menu','Admin WFS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWFS_collection','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWFS',2,1,'load capabilities in a gui','','a','','href = "../php/mod_loadWFSCapabilities.php?sessionID" target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','LOAD WFS','a','','','','','http://www.mapbender.org/index.php/WFS_Konfiguration');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_user',2,1,'User admin menu','Admin User','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','monitor_results_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,200,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','monitor_results,monitor_results_icon','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','monitor_results_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-remote-desktop.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWMS',2,1,'delete wms','','a','','href = "../php/mod_deleteWMS.php?sessionID"
-target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE WMS','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWMS',2,1,'load capabilities in a gui','','a','','href = "../php/mod_loadCapabilities.php?sessionID" target="Mapbender Administration"
-onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','LOAD WMS','a','','','','','http://www.mapbender.org/index.php/Add_new_maps_to_Mapbender');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WMS',2,1,'edit the elements of the gui','','a','','href="../php/mod_editGuiWms.php?sessionID"''
-target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT GUI-WMS','a','','','','','http://www.mapbender.org/index.php/Edit_GUI_WMS');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','editGUI_WMS','file_css','../css/edit_gui.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','monitor_results',2,1,'','Monitoring results','a','','href = "../php/mod_monitorCapabilities_read.php?sessionID" target="Mapbender Administration"
-onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,2,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','MONITORING RESULTS','a','','','','','http://www.mapbender.org/');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy',2,1,'secure services','','a','','href="../php/mod_owsproxy_conf.php?sessionID"'' target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','OWSPROXY','a','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wmc_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWFS_icon',2,1,'icon','','img','../img/gnome/document-save.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWMSs_icon',2,1,'icon','','img','../img/gnome/view-refresh.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wfs_metadata,wfs_metadata_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWMS',2,1,'load capabilities in a gui','Load WMS','a','','href = "../php/mod_loadCapabilities.php?sessionID"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','LOAD WMS','a','','','','','http://www.mapbender.org/index.php/Add_new_maps_to_Mapbender');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_metadata',2,1,'wms metadata editor','','a','','href = "../frames/index.php?guiID=admin_wms_metadata"
-target="Mapbender Administration" onclick="windowOpen(this.href,''Mapbender Administration'')"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','METADATA EDITOR','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_wms',2,1,'WMS admin menu','Admin WMS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS_collection,updateWMSs_collection,deleteWMS_collection,editGUI_WMS_collection,owsproxy_collection,monitor_results_collection,wms_metadata_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_mail_abo_icon',2,1,'icon','','img','../img/gnome/mail-message-new.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','category_filteredGUI',2,1,'add Gui to Category','Category -> myGUI','a','','href = "../php/mod_category_filteredGUI.php?sessionID&e_id_css=filteredUser_filteredGroup"',80,15,190,20,10,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','add GUI to Category','a','','','','','http://www.mapbender.org/GUI_Category');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','category_filteredGUI','cssfile','../css/administration_alloc.css','css file for admin module','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteGui',2,0,'delete gui','Delete GUI','a','','href = "../php/mod_deleteGUI.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE GUI','a','','','','','http://www.mapbender.org/index.php/DeleteGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFS',2,1,'delete wfs','Delete WFS','a','','href = "../php/mod_deleteWFS.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE WFS','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFSConf',2,1,'delete wfs conf','Delete WFS-Conf','a','','href = "../javascripts/mod_deleteWfsConf_client.html" ',80,15,250,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE FEATURETYPE-CONF','a','','','','AdminFrame','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_wms',2,1,'WMS admin menu','Admin WMS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS_collection,updateWMSs_collection,deleteWMS_collection,editGUI_WMS_collection,owsproxy_collection,monitor_results_collection,wms_metadata_collection,wms_mail_abo_collection','','');
INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','menu_wms','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wmc_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWMS',2,1,'delete wms','Delete WMS','a','','href = "../php/mod_deleteWMS.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE WMS','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','delete_filteredGui',2,1,'delete guis of this admin','Delete myGUI','a','','href = "../php/mod_deleteFilteredGUI.php?sessionID"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE myGUI','a','','','','','http://www.mapbender.org/index.php/DeleteGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editElements',2,1,'edit gui elements','Edit GUI Elements','a','','href = "../php/mod_editElements.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none;color: #808080;','EDIT GUI-ELEMENTS','a','','','','','http://www.mapbender.org/index.php/Edit_GUI_Elements');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredGroup',2,1,'edit group of this admin','Edit myGroup','a','','href = "../php/mod_editFilteredGroup.php?sessionID"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT myGROUP','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredUser',2,0,'save, edit, delete user where this admin is owner','Edit myUser','a','','href = "../php/mod_editFilteredUser.php?sessionID" target="AdminFrame"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT myUSER','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','editFilteredUser','withPasswordInsertion','true','define if admin can set the new user','php_var');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_filteredGroup',2,1,'allocate guis of this admin to groups where this admin is owner','myGui -> myGroup','a','','href = "../php/mod_filteredGui_filteredGroup.php?sessionID&e_id_css=filteredGui_filteredGroup" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','myGUI -> myGROUP','a','','','','AdminFrame','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','filteredGui_filteredGroup','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_Group',2,1,'allocate guis to groups','myGui -> Group','a','','href = "../php/mod_filteredGui_group.php?sessionID&e_id_css=filteredGui_Group" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','myGUI -> GROUP ','a','','','','AdminFrame','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','filteredGui_Group','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGroup_User',2,1,'allocate groups of this admin to user','myGroup -> User','a','','href = "../php/mod_filteredGroup_User.php?sessionID&e_id_css=filteredGroup_User" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','myGROUP -> USER','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','filteredGroup_User','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WMS',2,1,'edit the elements of the gui','Edit GUI <-> WMS','a','','href="../php/mod_editGuiWms.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT GUI-WMS','a','','','','','http://www.mapbender.org/index.php/Edit_GUI_WMS');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','editGUI_WMS','file_css','../css/edit_gui.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WFS',2,1,'edit the elements of the gui','Edit GUI <-> WFS','a','','href="../javascripts/mod_wfs_client.html"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT GUI-WFS','a','','','','AdminFrame','http://www.mapbender.org/index.php/Edit_GUI_WMS');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','editGUI_WFS','file_css','../css/edit_gui.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_user',2,1,'allocate the guis of this admin to a user','myGui -> User','a','','href = "../php/mod_filteredGui_User.php?sessionID&e_id_css=filteredGui_user" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','myGUI -> USER ','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','filteredGui_user','file css','../css/administration_alloc.css','a file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWFS_icon',2,1,'icon','','img','../img/gnome/view-refresh.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWFS',2,1,'load capabilities in a gui','Load WFS','a','','href = "../php/mod_loadWFSCapabilities.php?sessionID" target="AdminFrame"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','LOAD WFS','a','','','','','http://www.mapbender.org/index.php/WFS_Konfiguration');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','monitor_results',2,1,'','Monitoring results','a','','href = "../php/mod_monitorCapabilities_read.php?sessionID" ',80,15,NULL ,NULL,2,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','MONITORING RESULTS','a','','','','','http://www.mapbender.org/');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','newGui',2,1,'create a new gui','Create Gui','a','','href = "../php/mod_newGui.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none;color: #808080;','NEW GUI','a','','','','','http://www.mapbender.org/index.php/newGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','updateWFS,updateWFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy',2,1,'secure services','OWSProxy WMS','a','','href="../php/mod_owsproxy_conf.php?sessionID"'' ',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','OWSPROXY','a','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFS_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_wfs',2,1,'secure services','OWSProxy WFS','a','','href="../javascripts/mod_wfs_client.html" ',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','OWSPROXY WFS','a','','','','AdminFrame','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','rename_copy_Gui',2,1,'rename and copy gui','Rename/Copy Gui','a','','href = "../php/mod_renameGUI.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','RENAME COPY GUI','a','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWFS,deleteWFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWFS',2,1,'edit the elements of the gui','Update WFS','a','','href="../javascripts/mod_wfs_client.html"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','UPDATE WFS','a','','','','AdminFrame','http://www.mapbender.org/index.php/UpdateWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWMSs',2,1,'edit the elements of the gui','Update WMS','a','','href="../php/mod_updateWMS.php?sessionID"''
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','UPDATE WMS','a','','','','','http://www.mapbender.org/index.php/UpdateWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_conf',2,1,'configure wfs','Configure Featuretype','a','','href = "../php/mod_wfs_conf_client.php"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','FEATURETYPE-CONF','a','','','','AdminFrame','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_metadata',2,1,'wfs metadata editor','Metadataeditor WFS','a','','href = "../frames/index.php?guiID=admin_wfs_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','METADATA EDITOR','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WFS_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wmc_metadata',2,1,'wmc metadata editor','Metadataeditor WMC','a','','href = "../frames/index.php?guiID=admin_wmc_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','METADATA EDITOR','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_metadata',2,1,'wms metadata editor','Metadataeditor WMS','a','','href = "../frames/index.php?guiID=admin_wms_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','METADATA EDITOR','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editGUI_WFS,editGUI_WFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_auth',2,1,'GUI admin menu','Authorization','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_user_collection,filteredGui_group_collection,filteredGui_filteredGroup_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','monitor_abo_show',2,1,'send mail to user which have abos','Mail Abo WMS','a','','href = "../php/mod_abo_show.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','MAIL ABO','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wms_mail_abo_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','monitor_abo_show,wms_mail_abo_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','owsproxy,owsproxy_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_wfs_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','owsproxy_wfs,owsproxy_wfs_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_wfs_icon',2,1,'icon','','img','../img/gnome/emblem-readonly.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_conf_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','wfs_conf_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wfs_conf,wfs_conf_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFSConf_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWFSConf,deleteWFSConf_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_wfs',2,1,'WFS admin menu','Admin WFS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWFS_collection,updateWFS_collection,editGUI_WFS_collection,deleteWFS_collection,wfs_metadata_collection,owsproxy_wfs_collection,wfs_conf_collection,deleteWFSConf_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredGroup_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredGroup,editFilteredGroup_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_user',2,1,'User admin menu','Admin User','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredUser_collection,editFilteredGroup_collection,filteredGroup_User_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGroup_User_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGroup_User,filteredGroup_User_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredGroup_icon',2,1,'icon','','img','../img/gnome/editMyGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','newGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','newGui,newGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS,loadWMS_icon','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWFS,loadWFS_icon','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWFS_icon',2,1,'icon','','img','../img/gnome/document-save.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_gui',2,1,'GUI admin menu','Admin GUI','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS,loadWMS_icon','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','updateWMSs_icon',2,1,'icon','','img','../img/gnome/view-refresh.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','mb_horizontal_accordion',2,1,'Put existing divs in new horizontal accordion div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,NULL ,NULL,NULL ,'','<dl></dl>','div','../plugins/mb_horizontal_accordion.js','../../extensions/jqueryEasyAccordion/jquery.easyAccordion.js','menu_wms,menu_wfs,menu_wmc,menu_user,menu_gui','','');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','mb_horizontal_accordion','Accordion css file','../extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css','','file/css');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_position',2,0,'jQuery UI position','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.position.js','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_mouse',2,0,'jQuery UI mouse','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.mouse.js','','jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','newGui_icon',2,1,'icon','','img','../img/gnome/newGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','rename_copy_gui_icon',2,1,'icon','','img','../img/gnome/edit-copy.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','rename_copy_gui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','rename_copy_Gui,rename_copy_gui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWFSConf_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editElements_icon',2,1,'icon','','img','../img/gnome/editGuiElements.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editElements_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editElements,editElements_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','delete_filteredGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','delete_filteredGui,delete_filteredGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','delete_filteredGui_icon',2,1,'icon','','img','../img/gnome/deleteGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteGui_icon',2,0,'icon','','img','../img/gnome/deleteGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','menu_gui',2,1,'GUI admin menu','Admin GUI','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','newGui_collection,rename_copy_gui_collection,delete_filteredGui_collection,editElements_collection,category_filteredGui_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','category_filteredGui_icon',2,1,'icon','','img','../img/gnome/myGuiCategories.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','category_filteredGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','category_filteredGUI,category_filteredGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_user_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_user,filteredGui_user_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_user_icon',2,1,'icon','','img','../img/gnome/myGuiUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_group_icon',2,1,'icon','','img','../img/gnome/myGuiGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_group_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_Group,filteredGui_group_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredUser_icon',2,0,'icon','','img','../img/gnome/editMyUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editFilteredUser_collection',2,0,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredUser,editFilteredUser_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGroup_User_icon',2,1,'icon','','img','../img/gnome/myGroupUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_filteredGroup_icon',2,1,'icon','','img','../img/gnome/myGuiMyGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','filteredGui_filteredGroup_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_filteredGroup,filteredGui_filteredGroup_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_mouse',2,1,'jQuery UI mouse','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.mouse.js','','jq_ui_widget','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','loadWMS_icon',2,1,'icon','','img','../img/gnome/document-save.png','',0,0,NULL ,NULL,2,'','','','','','','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editGUI_WMS,editGUI_WMS_icon','','');
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWMS_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','editGUI_WMS_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','deleteWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWMS,deleteWMS_icon','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','owsproxy_icon',2,1,'icon','','img','../img/gnome/emblem-readonly.png','',0,0,NULL ,NULL,2,'','','','','','','','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_droppable',4,0,'jQuery UI droppable','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.droppable.js','','jq_ui,jq_ui_widget,jq_ui_mouse,jq_ui_draggable','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_resizable',5,0,'Resizable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','../plugins/jq_ui_resizable.js','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.resizable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','http://jqueryui.com/demos/resizable/');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_tabs',5,0,'horizontal tabs from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.tabs.js','','jq_ui,jq_ui_widget','');
-INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_draggable',5,0,'Draggable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.draggable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','http://jqueryui.com/demos/draggable/');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_position',2,1,'jQuery UI position','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.position.js','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_button',4,1,'jQuery UI button','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.button.js','','jq_ui,jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_draggable',5,1,'Draggable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.draggable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','http://jqueryui.com/demos/draggable/');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_resizable',5,1,'Resizable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','../plugins/jq_ui_resizable.js','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.resizable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','jq_ui_dialog',5,1,'Dialog from jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.dialog.js','','jq_ui,jq_ui_widget,jq_ui_button,jq_ui_draggable,jq_ui_mouse,jq_ui_position,jq_ui_resizable','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','mb_iframepopup',7,1,'iframepopup','','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_iframepopup.js','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration','mb_horizontal_accordion',10,1,'Put existing divs in new horizontal accordion div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,NULL ,NULL,NULL ,'','<dl></dl>','div','../plugins/mb_horizontal_accordion.js','../../extensions/jqueryEasyAccordion/jquery.easyAccordion.js','menu_wms,menu_wfs,menu_wmc,menu_user,menu_gui,menu_auth','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration','mb_horizontal_accordion','Accordion css file','../extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css','','file/css');
+
Copied: branches/2.7/resources/db/new_admin_gui_de.sql (from rev 7473, trunk/mapbender/resources/db/new_admin_gui_de.sql)
===================================================================
--- branches/2.7/resources/db/new_admin_gui_de.sql (rev 0)
+++ branches/2.7/resources/db/new_admin_gui_de.sql 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,138 @@
+INSERT INTO gui (gui_id, gui_name, gui_description, gui_public) VALUES ('Administration_DE','Administration_DE','Administrationsoberfläche',1);
+-- give root access to admin_wms_metadata
+INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) VALUES ('Administration_DE', 1, 'owner');
+-- set category to administration guis
+INSERT into gui_gui_category VALUES ('Administration DE', 1);
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','i18n',1,1,'Internationalization module, collects data from all elements and sends them to the server in a single POST request. The strings are translated via gettext only.','Internationalization','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_i18n.js','','','','http://www.mapbender.org/Gettext');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','body',1,1,'Navigation','','body','','',0,0,200,40,NULL ,'','','','../geoportal/mod_revertGuiSessionSettings.php','','','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','body','favicon','../img/favicon.png','favicon','php_var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','body','includeWhileLoading','','show splash screen while the application is loading','php_var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','body','use_load_message','true','show splash screen while the application is loading','php_var');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','body','jq_ui_theme','../extensions/jquery-ui-1.7.2.custom/css/smoothness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','body','jq_ui_effects_transfer','.ui-effects-transfer { z-index:1003; border: 2px dotted gray; } ','','text/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_widget',1,1,'jQuery UI widget','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.widget.js','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui',1,1,'jQuery UI core','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.core.js','','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','jq_ui','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WMS_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWMS,deleteWMS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy_icon',2,1,'icon','','img','../img/gnome/emblem-readonly.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wms_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wms_metadata,wms_metadata_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWMSs_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','updateWMSs,updateWMSs_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wmc_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wmc_metadata,wmc_metadata_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_wmc',2,1,'WMC admin menu','Admin WMC','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','wmc_metadata_collection','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','menu_wmc','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','monitor_results_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,200,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','monitor_results,monitor_results_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','monitor_results_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-remote-desktop.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wmc_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWFS_icon',2,1,'icon','','img','../img/gnome/document-save.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWMSs_icon',2,1,'icon','','img','../img/gnome/view-refresh.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_metadata_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wfs_metadata,wfs_metadata_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wms_metadata_icon',2,1,'icon','','img','../img/gnome/preferences-desktop-personal.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wms_mail_abo_icon',2,1,'icon','','img','../img/gnome/mail-message-new.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteGui',2,0,'delete gui','Delete GUI','a','','href = "../php/mod_deleteGUI.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','DELETE GUI','a','','','','','http://www.mapbender.org/index.php/DeleteGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_wms',2,1,'WMS admin menu','Admin WMS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS_collection,updateWMSs_collection,deleteWMS_collection,editGUI_WMS_collection,owsproxy_collection,monitor_results_collection,wms_metadata_collection,wms_mail_abo_collection','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','menu_wms','css','../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredUser',2,0,'save, edit, delete user where this admin is owner','Edit myUser','a','','href = "../php/mod_editFilteredUser.php?sessionID" target="AdminFrame"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','EDIT myUSER','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','editFilteredUser','withPasswordInsertion','true','define if admin can set the new user','php_var');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWFS_icon',2,1,'icon','','img','../img/gnome/view-refresh.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','updateWFS,updateWFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFS_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWFS,deleteWFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WFS_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editGUI_WFS,editGUI_WFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wms_mail_abo_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','monitor_abo_show,wms_mail_abo_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','owsproxy,owsproxy_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy_wfs_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','owsproxy_wfs,owsproxy_wfs_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy_wfs_icon',2,1,'icon','','img','../img/gnome/emblem-readonly.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_conf_icon',2,1,'icon','','img','../img/gnome/preferences-other.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_conf_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','wfs_conf,wfs_conf_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFSConf_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',150,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','deleteWFSConf,deleteWFSConf_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_wfs',2,1,'WFS admin menu','Admin WFS','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWFS_collection,updateWFS_collection,editGUI_WFS_collection,deleteWFS_collection,wfs_metadata_collection,owsproxy_wfs_collection,wfs_conf_collection,deleteWFSConf_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredGroup_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredGroup,editFilteredGroup_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGroup_User_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGroup_User,filteredGroup_User_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredGroup_icon',2,1,'icon','','img','../img/gnome/editMyGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','newGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','newGui,newGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWMS,loadWMS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWFS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','loadWFS,loadWFS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','newGui_icon',2,1,'icon','','img','../img/gnome/newGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','rename_copy_gui_icon',2,1,'icon','','img','../img/gnome/edit-copy.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','rename_copy_gui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','rename_copy_Gui,rename_copy_gui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFSConf_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editElements_icon',2,1,'icon','','img','../img/gnome/editGuiElements.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editElements_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editElements,editElements_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','delete_filteredGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','delete_filteredGui,delete_filteredGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','delete_filteredGui_icon',2,1,'icon','','img','../img/gnome/deleteGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteGui_icon',2,0,'icon','','img','../img/gnome/deleteGui.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_gui',2,1,'GUI admin menu','Admin GUI','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','newGui_collection,rename_copy_gui_collection,delete_filteredGui_collection,editElements_collection,category_filteredGui_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','category_filteredGui_icon',2,1,'icon','','img','../img/gnome/myGuiCategories.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','category_filteredGui_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,160,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','category_filteredGUI,category_filteredGui_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_user_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_user,filteredGui_user_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_user_icon',2,1,'icon','','img','../img/gnome/myGuiUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_group_icon',2,1,'icon','','img','../img/gnome/myGuiGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_group_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,40,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_Group,filteredGui_group_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredUser_icon',2,0,'icon','','img','../img/gnome/editMyUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredUser_collection',2,0,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredUser,editFilteredUser_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGroup_User_icon',2,1,'icon','','img','../img/gnome/myGroupUser.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_filteredGroup_icon',2,1,'icon','','img','../img/gnome/myGuiMyGroup.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_filteredGroup_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,80,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_filteredGroup,filteredGui_filteredGroup_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_user',2,1,'User admin menu','Admin Nutzer','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','editFilteredUser_collection,editFilteredGroup_collection,filteredGroup_User_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWMS_icon',2,1,'icon','','img','../img/gnome/document-save.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WMS_collection',2,1,'Put existing divs in new div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,120,200,30,NULL ,'','','div','../plugins/mb_div_collection.js','','editGUI_WMS,editGUI_WMS_icon','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWMS_icon',2,1,'icon','','img','../img/gnome/edit-delete.png','',0,0,NULL ,NULL,2,'','','','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','rename_copy_Gui',2,1,'rename and copy gui','Rename/Copy Gui','a','','href = "../php/mod_renameGUI.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Oberfläche umbenennen/kopieren','a','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWFS',2,1,'edit the elements of the gui','Update WFS','a','','href="../javascripts/mod_wfs_client.html"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Aktualisieren','a','','','','AdminFrame','http://www.mapbender.org/index.php/UpdateWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_conf',2,1,'configure wfs','Configure Featuretype','a','','href = "../php/mod_wfs_conf_client.php"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Featuretype Modul einrichten','a','','','','AdminFrame','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wfs_metadata',2,1,'wfs metadata editor','Metadataeditor WFS','a','','href = "../frames/index.php?guiID=admin_wfs_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Metadaten Editor','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wmc_metadata',2,1,'wmc metadata editor','Metadataeditor WMC','a','','href = "../frames/index.php?guiID=admin_wmc_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Metadaten Editor','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','menu_auth',2,1,'GUI admin menu','Autorisierung','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_div_collection.js','','filteredGui_user_collection,filteredGui_group_collection,filteredGui_filteredGroup_collection','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_position',2,1,'jQuery UI position','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.position.js','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_mouse',2,1,'jQuery UI mouse','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.mouse.js','','jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WMS',2,1,'edit the elements of the gui','Edit GUI <-> WMS','a','','href="../php/mod_editGuiWms.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','GUI-WMS Konf.','a','','','','','http://www.mapbender.org/index.php/Edit_GUI_WMS');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','editGUI_WMS','file_css','../css/edit_gui.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','monitor_results',2,1,'','Monitoring results','a','','href = "../php/mod_monitorCapabilities_read.php?sessionID" ',80,15,NULL ,NULL,2,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Monitoring Ergebnisse','a','','','','','http://www.mapbender.org/');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy',2,1,'secure services','OWSProxy WMS','a','','href="../php/mod_owsproxy_conf.php?sessionID"'' ',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Sicherheits Proxy','a','','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','wms_metadata',2,1,'wms metadata editor','Metadataeditor WMS','a','','href = "../frames/index.php?guiID=admin_wms_metadata"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Metadaten - Editor','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWMS',2,1,'delete wms','Delete WMS','a','','href = "../php/mod_deleteWMS.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Löschen','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','updateWMSs',2,1,'edit the elements of the gui','Update WMS','a','','href="../php/mod_updateWMS.php?sessionID"''
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Aktualisieren','a','','','','','http://www.mapbender.org/index.php/UpdateWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWMS',2,1,'load capabilities in a gui','Load WMS','a','','href = "../php/mod_loadCapabilities.php?sessionID"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Registrieren','a','','','','','http://www.mapbender.org/index.php/Add_new_maps_to_Mapbender');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','monitor_abo_show',2,1,'send mail to user which have abos','Mail Abo WMS','a','','href = "../php/mod_abo_show.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Abonnenten benachrichtigen','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','category_filteredGUI',2,1,'add Gui to Category','Category -> myGUI','a','','href = "../php/mod_category_filteredGUI.php?sessionID&e_id_css=filteredUser_filteredGroup"',80,15,190,20,10,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Kategorisierung Oberflächen','a','','','','','http://www.mapbender.org/GUI_Category');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','category_filteredGUI','cssfile','../css/administration_alloc.css','css file for admin module','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFS',2,1,'delete wfs','Delete WFS','a','','href = "../php/mod_deleteWFS.php?sessionID"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Löschen','a','','','','','http://www.mapbender.org/index.php/DeleteWMS');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','deleteWFSConf',2,1,'delete wfs conf','Delete WFS-Conf','a','','href = "../javascripts/mod_deleteWfsConf_client.html" ',80,15,250,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Löschen von WFS Modulen','a','','','','AdminFrame','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','delete_filteredGui',2,1,'delete guis of this admin','Delete myGUI','a','','href = "../php/mod_deleteFilteredGUI.php?sessionID"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Eigene Oberfläche löschen','a','','','','','http://www.mapbender.org/index.php/DeleteGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editElements',2,1,'edit gui elements','Edit GUI Elements','a','','href = "../php/mod_editElements.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none;color: #808080;','Oberfläche einrichten','a','','','','','http://www.mapbender.org/index.php/Edit_GUI_Elements');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editFilteredGroup',2,1,'edit group of this admin','Edit myGroup','a','','href = "../php/mod_editFilteredGroup.php?sessionID"',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Eigene Gruppe verwalten','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','editGUI_WFS',2,1,'edit the elements of the gui','Edit GUI <-> WFS','a','','href="../javascripts/mod_wfs_client.html"
+',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','GUI-WFS Konf.','a','','','','AdminFrame','http://www.mapbender.org/index.php/Edit_GUI_WMS');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','editGUI_WFS','file_css','../css/edit_gui.css','','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGroup_User',2,1,'allocate groups of this admin to user','myGroup -> User','a','','href = "../php/mod_filteredGroup_User.php?sessionID&e_id_css=filteredGroup_User" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Nutzer in eigene Gruppe übernehmen','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','filteredGroup_User','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_Group',2,1,'allocate guis to groups','myGui -> Group','a','','href = "../php/mod_filteredGui_group.php?sessionID&e_id_css=filteredGui_Group" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Eigene Oberfläche externer Gruppe zuordnen','a','','','','AdminFrame','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','filteredGui_Group','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_filteredGroup',2,1,'allocate guis of this admin to groups where this admin is owner','myGui -> myGroup','a','','href = "../php/mod_filteredGui_filteredGroup.php?sessionID&e_id_css=filteredGui_filteredGroup" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Eigene Oberfläche eigener Gruppe zuordnen','a','','','','AdminFrame','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','filteredGui_filteredGroup','file css','../css/administration_alloc.css','file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','filteredGui_user',2,1,'allocate the guis of this admin to a user','myGui -> User','a','','href = "../php/mod_filteredGui_User.php?sessionID&e_id_css=filteredGui_user" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Eigene Oberfläche externem Nutzer zuordnen','a','','','','','http://www.mapbender.org/index.php/user');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','filteredGui_user','file css','../css/administration_alloc.css','a file css','file/css');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','loadWFS',2,1,'load capabilities in a gui','Load WFS','a','','href = "../php/mod_loadWFSCapabilities.php?sessionID" target="AdminFrame"',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Laden','a','','','','','http://www.mapbender.org/index.php/WFS_Konfiguration');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','newGui',2,1,'create a new gui','Create Gui','a','','href = "../php/mod_newGui.php?sessionID" ',80,15,200,20,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none;color: #808080;','Oberfläche/Container erzeugen','a','','','','','http://www.mapbender.org/index.php/newGUI');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','owsproxy_wfs',2,1,'secure services','OWSProxy WFS','a','','href="../javascripts/mod_wfs_client.html" ',80,15,NULL ,NULL,NULL ,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Sicherheits - Proxy','a','','','','AdminFrame','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_button',4,1,'jQuery UI button','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.button.js','','jq_ui,jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_dialog',5,1,'Dialog from jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.dialog.js','','jq_ui,jq_ui_widget,jq_ui_button,jq_ui_draggable,jq_ui_mouse,jq_ui_position,jq_ui_resizable','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_draggable',5,1,'Draggable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.draggable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','http://jqueryui.com/demos/draggable/');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','jq_ui_resizable',5,1,'Resizable from the jQuery UI framework','','','','',NULL ,NULL,NULL ,NULL,NULL ,'','','','../plugins/jq_ui_resizable.js','../extensions/jquery-ui-1.8.1.custom/development-bundle/ui/jquery.ui.resizable.js','','jq_ui,jq_ui_mouse,jq_ui_widget','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','mb_iframepopup',7,1,'iframepopup','','div','','',NULL ,NULL,NULL ,NULL,NULL ,'','','div','../plugins/mb_iframepopup.js','','','','');
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('Administration_DE','mb_horizontal_accordion',10,1,'Put existing divs in new horizontal accordion div object. List the elements comma-separated under target, and make sure they have a title.','','div','','',0,0,NULL ,NULL,NULL ,'','<dl></dl>','div','../plugins/mb_horizontal_accordion.js','../../extensions/jqueryEasyAccordion/jquery.easyAccordion.js','menu_wms,menu_wfs,menu_wmc,menu_user,menu_gui,menu_auth','','');
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES ('Administration_DE','mb_horizontal_accordion','Accordion css file','../extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css','','file/css');
+
Modified: branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6.2_to_2.7rc1_pgsql_UTF-8.sql 2011-01-27 09:48:27 UTC (rev 7475)
@@ -608,7 +608,7 @@
ALTER TABLE mb_user_wmc ADD COLUMN wmc_serial_id INTEGER;
ALTER TABLE mb_user_wmc ADD COLUMN wmc_timestamp_create INTEGER;
ALTER TABLE mb_user_wmc ALTER COLUMN wmc_serial_id SET DEFAULT nextval('mb_user_wmc_wmc_serial_id_seq');
-UPDATE mb_user_wmc SET wmc_serial_id = NEXTVAL('mb_user_wmc_wmc_serial_id_seq');
+--UPDATE mb_user_wmc SET wmc_serial_id = NEXTVAL('mb_user_wmc_wmc_serial_id_seq'); TODO: this is only for older installations - if a serial column exists before, the serial ids will be updated - that is not what we want cause this are the references!
Modified: branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql
===================================================================
--- branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql 2011-01-27 09:48:27 UTC (rev 7475)
@@ -2,3 +2,127 @@
--bugfix for template_openlayers #759
--
UPDATE gui_element set e_pos='2' WHERE e_id='jq_ui_position';
+--
+--new function to get the load_count of wmc which are stored in the mapbender database
+--
+-- Function: f_wmc_load_count(integer)
+
+-- DROP FUNCTION f_wmc_load_count(integer);
+
+CREATE OR REPLACE FUNCTION f_wmc_load_count(integer)
+ RETURNS integer AS
+$BODY$
+DECLARE
+ wmc_rel int8;
+BEGIN
+wmc_rel := load_count from wmc_load_count where wmc_load_count.fkey_wmc_serial_id=$1;
+IF wmc_rel IS NULL THEN
+ RETURN 0;
+ELSE
+ RETURN wmc_rel;
+END IF;
+END;
+$BODY$
+ LANGUAGE 'plpgsql' VOLATILE
+ COST 100;
+ALTER FUNCTION f_wmc_load_count(integer) OWNER TO postgres;
+--
+-- change view for search wmc to include the load_count
+--
+-- View: search_wmc_view
+
+-- DROP VIEW search_wmc_view;
+
+CREATE OR REPLACE VIEW search_wmc_view AS
+ SELECT wmc_dep.fkey_user_id AS user_id, wmc_dep.wmc_id, wmc_dep.srs AS wmc_srs, wmc_dep.wmc_title, wmc_dep.abstract AS wmc_abstract, f_collect_searchtext_wmc(wmc_dep.wmc_id) AS searchtext, wmc_dep.wmc_timestamp, wmc_dep.department, wmc_dep.mb_group_name, wmc_dep.mb_group_title, wmc_dep.mb_group_country, wmc_dep.wmc_serial_id, f_wmc_load_count(wmc_dep.wmc_serial_id) as load_count, wmc_dep.mb_group_stateorprovince, f_collect_inspire_cat_wmc(wmc_dep.wmc_serial_id) AS md_inspire_cats, f_collect_custom_cat_wmc(wmc_dep.wmc_serial_id) AS md_custom_cats, f_collect_topic_cat_wmc(wmc_dep.wmc_id) AS md_topic_cats, transform(geometryfromtext(((((((((((((((((((('POLYGON(('::text || wmc_dep.minx::text) || ' '::text) || wmc_dep.miny::text) || ','::text) || wmc_dep.minx::text) || ' '::text) || wmc_dep.maxy::text) || ','::text) || wmc_dep.maxx::text) || ' '::text) || wmc_dep.maxy::text) || ','::text) || wmc_dep.maxx::text) || ' '::text) || wmc_dep.miny::text) || ','::text) || wmc_dep.minx::
text) || ' '::text) || wmc_dep.miny::text) || '))'::text, regexp_replace(upper(wmc_dep.srs::text), 'EPSG:'::text, ''::text)::integer), 4326) AS the_geom, (((((wmc_dep.minx::text || ','::text) || wmc_dep.miny::text) || ','::text) || wmc_dep.maxx::text) || ','::text) || wmc_dep.maxy::text AS bbox, wmc_dep.mb_group_logo_path
+ FROM ( SELECT mb_user_wmc.wmc_public, mb_user_wmc.maxy, mb_user_wmc.maxx, mb_user_wmc.miny, mb_user_wmc.minx, mb_user_wmc.srs, mb_user_wmc.wmc_serial_id AS wmc_id, mb_user_wmc.wmc_serial_id, mb_user_wmc.wmc_title, mb_user_wmc.abstract, mb_user_wmc.wmc_timestamp, mb_user_wmc.fkey_user_id, user_dep.mb_group_id AS department, user_dep.mb_group_name, user_dep.mb_group_title, user_dep.mb_group_country, user_dep.mb_group_stateorprovince, user_dep.mb_group_logo_path
+ FROM ( SELECT registrating_groups.fkey_mb_user_id AS mb_user_id, mb_group.mb_group_id, mb_group.mb_group_name, mb_group.mb_group_title, mb_group.mb_group_country, mb_group.mb_group_stateorprovince, mb_group.mb_group_logo_path
+ FROM registrating_groups, mb_group
+ WHERE registrating_groups.fkey_mb_group_id = mb_group.mb_group_id) user_dep, mb_user_wmc
+ WHERE user_dep.mb_user_id = mb_user_wmc.fkey_user_id) wmc_dep
+ WHERE wmc_dep.wmc_public = 1
+ ORDER BY wmc_dep.wmc_id;
+
+ALTER TABLE search_wmc_view OWNER TO postgres;
+--
+-- Bugfix for normalize searchtext of wmc docs
+--
+-- Function: f_collect_searchtext_wmc(integer)
+
+-- DROP FUNCTION f_collect_searchtext_wmc(integer);
+
+CREATE OR REPLACE FUNCTION f_collect_searchtext_wmc(integer)
+ RETURNS text AS
+$BODY$
+DECLARE
+ p_wmc_id ALIAS FOR $1;
+
+ r_keywords RECORD;
+ l_result TEXT;
+BEGIN
+ l_result := '';
+ l_result := l_result || (SELECT COALESCE(wmc_title, '') || ' ' || COALESCE(abstract, '') FROM mb_user_wmc WHERE wmc_serial_id = p_wmc_id);
+ FOR r_keywords IN SELECT DISTINCT keyword FROM
+ (SELECT keyword FROM wmc_keyword L JOIN keyword K ON (K.keyword_id = L.fkey_keyword_id )
+ ) AS __keywords__ LOOP
+ l_result := l_result || ' ' || COALESCE(r_keywords.keyword, '');
+ END LOOP;
+ l_result := UPPER(l_result);
+ l_result := replace(replace(replace(replace(replace(replace(replace(l_result,'Ä','AE'),'ß','SS'),'Ö','OE'),'Ü','UE'),'ä','AE'),'ü','UE'),'ö','OE');
+
+ RETURN l_result;
+END;
+$BODY$
+ LANGUAGE 'plpgsql' VOLATILE
+ COST 100;
+ALTER FUNCTION f_collect_searchtext_wmc(integer) OWNER TO postgres;
+
+--Bugfix in integral monitoring table
+
+-- Function: mb_monitor_after()
+
+-- DROP FUNCTION mb_monitor_after();
+
+CREATE OR REPLACE FUNCTION mb_monitor_after()
+ RETURNS "trigger" AS
+$BODY$DECLARE
+ availability_new REAL;
+ average_res_cap REAL;
+ count_monitors REAL;
+ BEGIN
+ IF TG_OP = 'UPDATE' THEN
+
+ count_monitors := count(fkey_wms_id) from mb_monitor where fkey_wms_id=NEW.fkey_wms_id;
+ --the following should be adopted if the duration of storing is changed!!!
+ average_res_cap := ((select average_resp_time from mb_wms_availability where fkey_wms_id=NEW.fkey_wms_id)*count_monitors+(NEW.timestamp_end-NEW.timestamp_begin))/(count_monitors+1);
+
+ IF NEW.status > -1 THEN --service gives caps
+ availability_new := round(cast(((select availability from mb_wms_availability where fkey_wms_id=NEW.fkey_wms_id)*count_monitors + 100)/(count_monitors+1) as numeric),2);
+ ELSE --service has problems with caps
+ availability_new := round(cast(((select availability from mb_wms_availability where fkey_wms_id=NEW.fkey_wms_id)*count_monitors)/(count_monitors+1) as numeric),2);
+ END IF;
+
+ UPDATE mapbender.mb_wms_availability SET average_resp_time=average_res_cap,last_status=NEW.status, availability=availability_new, image=NEW.image, status_comment=NEW.status_comment,upload_url=NEW.upload_url,map_url=NEW.map_url, cap_diff=NEW.cap_diff WHERE mb_wms_availability.fkey_wms_id=NEW.fkey_wms_id;
+ RETURN NEW;
+ END IF;
+ IF TG_OP = 'INSERT' THEN
+
+ IF (select count(fkey_wms_id) from mb_wms_availability where fkey_wms_id=NEW.fkey_wms_id) > 0 then -- service is not new
+ UPDATE mb_wms_availability set fkey_upload_id=NEW.upload_id,last_status=NEW.status,status_comment=NEW.status_comment,upload_url=NEW.upload_url, cap_diff=NEW.cap_diff where fkey_wms_id=NEW.fkey_wms_id;
+ else --service has not yet been monitored
+ INSERT INTO mb_wms_availability (fkey_upload_id,fkey_wms_id,last_status,status_comment,upload_url,map_url,cap_diff,average_resp_time,availability) VALUES (NEW.upload_id,NEW.fkey_wms_id,NEW.status,NEW.status_comment,NEW.upload_url::text,NEW.map_url,NEW.cap_diff,0,100);
+ end if;
+
+ RETURN NEW;
+ END IF;
+ END;
+$BODY$
+ LANGUAGE 'plpgsql' VOLATILE;
+ALTER FUNCTION mb_monitor_after() OWNER TO postgres;
+
+--new columns with uuids for resources wms, layer, wfs, featuretype - is needed to generate konsistent metadatasets
+--you need a postgres >= 8.3 cause the new datatype uuid is used!
+ALTER TABLE wms ADD COLUMN uuid UUID;
+ALTER TABLE layer ADD COLUMN uuid UUID;
+ALTER TABLE wfs ADD COLUMN uuid UUID;
+ALTER TABLE wfs_featuretype ADD COLUMN uuid UUID;
Modified: branches/2.7/tools/mod_monitorCapabilities_main.php
===================================================================
--- branches/2.7/tools/mod_monitorCapabilities_main.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/tools/mod_monitorCapabilities_main.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -17,6 +17,7 @@
require_once dirname(__FILE__) ."/../http/classes/class_administration.php";
require_once dirname(__FILE__) ."/../tools/mod_monitorCapabilities_defineGetMapBbox.php";
require_once dirname(__FILE__) ."/../http/classes/class_bbox.php";
+require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
#do db close at the most reasonable point
$admin = new administration();
@@ -79,11 +80,13 @@
$br = "\n\n";
}
+$e = new mb_exception("mod_monitorCapabilities_main.php: group: ".$group);
+
$userIdArray = array();
//loop for doing the monitor for all registrating institutions ****************
if (!is_null($group)) {
- echo "monitoriing " . $group;
+ echo "monitoring " . $group;
if (!is_numeric($group)) {
echo _mb("Parameter 'group' must be numeric.");
die;
@@ -125,12 +128,13 @@
if (count($userIdArray) === 0) {
echo _mb("No user found for the given parameters.");
+
die;
}
$user_id_all = $userIdArray;
echo $br ."Count of registrating users: " . count($user_id_all) . $br;
-
+$e = new mb_exception("mod_monitorCapabilities_main.php: count of group members: ".count($user_id_all));
$time_array = array();
for ($iz = 0; $iz < count($user_id_all); $iz++) {
@@ -143,7 +147,7 @@
echo "Starting monitoring cycle...$br";
echo "WMS services are requested for availability.$br";
echo "Capabilities documents are requested and compared to the infos in the service db.$br";
-
+ $e = new mb_exception("mod_monitorCapabilities_main.php: monitoring for user: ".$userid);
//new: time user-monitoring cycle must stored in array
$time_array[$userid] = strval(time());
//wait 2 seconds to give enough time between to different users the time can differ also for one user!
@@ -185,7 +189,8 @@
//initialize monitoriung in db (set status=-2)
echo "initialize monitoring for user: " . $userid .
" WMS: " . $wms_id_own[$k] . $br;
- $sql = "INSERT INTO mb_monitor (upload_id, fkey_wms_id, " .
+ $e = new mb_exception("mod_monitorCapabilities_main.php: wms: ".$wms_id_own[$k]);
+ $sql = "INSERT INTO mb_monitor (upload_id, fkey_wms_id, " .
"status, status_comment, timestamp_begin, timestamp_end, " .
"upload_url, updated)";
$sql .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8)";
@@ -236,13 +241,15 @@
// start of the monitoring processes on shell
// (maybe problematic for windows os)
+ $e = new mb_exception("mod_monitorCapabilities_main.php: php call: ".$exec);
$exec = PHP_PATH . "php5 " . dirname(__FILE__) . "/mod_monitorCapabilities_write.php " .
$currentFilename . " 0 > /dev/null &";
/*
* @security_patch exec done
* Added escapeshellcmd()
*/
- exec(escapeshellcmd($exec));
+ #exec(escapeshellcmd($exec));TODO what goes wrong here?
+ exec($exec);
}
echo "Monitoring start cycle for user: ".$userid." has ended. " .
"(Altogether: " . count($wms_id_own) . " WMS monitorings started).$br";
@@ -266,8 +273,10 @@
// records in the database
$wms_id_own = $admin->getWmsByWmsOwner($userid);
for ($k = 0; $k < count($wms_id_own); $k++) {
+
$monitorFile = "./tmp/wms_monitor_report_" . $time . "_" .
$wms_id_own[$k] . "_".$userid.".xml";
+ $e = new mb_exception("mod_monitorCapabilities_main.php: look for following file: ".$monitorFile);
$status = getTagOutOfXML($monitorFile,"status");
$status_comment = getTagOutOfXML($monitorFile,"comment");
$cap_diff = getTagOutOfXML($monitorFile,"getcapdiff");
@@ -278,7 +287,7 @@
$sql = "UPDATE mb_monitor SET updated = $1, status = $2, " .
"image = $3, status_comment = $4, timestamp_end = $5, " .
- "map_url = $6 , timestamp_begin = $7, caps_diff = $8 " .
+ "map_url = $6 , timestamp_begin = $7, cap_diff = $8 " .
"WHERE upload_id = $9 AND fkey_wms_id=$10 ";
// check if status = -2 return new comment and status -1,
@@ -339,4 +348,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/2.7/tools/mod_monitorCapabilities_write.php
===================================================================
--- branches/2.7/tools/mod_monitorCapabilities_write.php 2011-01-27 09:38:03 UTC (rev 7474)
+++ branches/2.7/tools/mod_monitorCapabilities_write.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -1,11 +1,12 @@
<?php
require_once(dirname(__FILE__)."/../lib/class_Monitor.php");
-
+require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
/*
* incoming parameters from command line
*/
if ($_SERVER["argc"] != 3) {
echo _mb("Insufficient arguments! Monitoring aborted.");
+ $e = new mb_exception("Insufficient arguments! Monitoring aborted.");
die;
}
@@ -15,5 +16,6 @@
$monitor = new Monitor($reportFile, $autoUpdate, dirname(__FILE__)."/tmp/");
+
$monitor->updateInXMLReport();
?>
Copied: branches/2.7/tools/mod_updateDatabaseUuid.php (from rev 7473, trunk/mapbender/tools/mod_updateDatabaseUuid.php)
===================================================================
--- branches/2.7/tools/mod_updateDatabaseUuid.php (rev 0)
+++ branches/2.7/tools/mod_updateDatabaseUuid.php 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,147 @@
+<?php
+# http://www.mapbender.org/index.php/Administration
+# 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.
+
+/*
+ALTER TABLE wms ADD COLUMN uuid UUID;
+ALTER TABLE layer ADD COLUMN uuid UUID;
+ALTER TABLE wfs ADD COLUMN uuid UUID;
+ALTER TABLE wfs_featuretype ADD COLUMN uuid UUID;
+*/
+
+
+require_once dirname(__FILE__) . "/../../core/globalSettings.php";
+require_once dirname(__FILE__) . "/../classes/class_Uuid.php";
+/*
+//DROP uuid columns
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wms DROP COLUMN uuid;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE layer DROP COLUMN uuid;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wfs DROP COLUMN uuid;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wfs_featuretype DROP COLUMN uuid;";
+$res = db_prep_query($sql,$v,$t);
+
+//generate new columns
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wms ADD COLUMN uuid UUID;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE layer ADD COLUMN uuid UUID;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wfs ADD COLUMN uuid UUID;";
+$res = db_prep_query($sql,$v,$t);
+
+$v = array();
+$t = array();
+$sql = "ALTER TABLE wfs_featuretype ADD COLUMN uuid UUID;";
+$res = db_prep_query($sql,$v,$t);
+
+*/
+
+//update wms table
+$v = array();
+$t = array();
+$sql = "SELECT wms_id FROM wms WHERE uuid IS NULL;";
+$res = db_prep_query($sql,$v,$t);
+$countWmsWithoutUuid = 0;
+while($row = db_fetch_array($res)){
+ $wmsId = $row['wms_id'];
+ $uuid = new Uuid();
+ $vUpdate = array($uuid,$wmsId);
+ $tUpdate = array('s');
+ $sqlUpdate = "UPDATE wms set uuid = $1 WHERE wms_id = $2;";
+ $resUpdate = db_prep_query($sqlUpdate,$vUpdate,$tUpdate);
+ $countWmsWithoutUuid++;
+}
+echo $countWmsWithoutUuid." WMS updated!";
+echo "<br>";
+//end -- update wms table
+//update layer table
+$v = array();
+$t = array();
+$sql = "SELECT layer_id FROM layer WHERE uuid IS NULL;";
+$res = db_prep_query($sql,$v,$t);
+$countLayerWithoutUuid = 0;
+while($row = db_fetch_array($res)){
+ $layerId = $row['layer_id'];
+ $uuid = new Uuid();
+ $vUpdate = array($uuid,$layerId);
+ $tUpdate = array('s');
+ $sqlUpdate = "UPDATE layer set uuid = $1 WHERE layer_id = $2;";
+ $resUpdate = db_prep_query($sqlUpdate,$vUpdate,$tUpdate);
+ $countLayerWithoutUuid++;
+}
+echo $countLayerWithoutUuid." Layer updated!";
+echo "<br>";
+//end -- update layer table
+//update wfs table
+$v = array();
+$t = array();
+$sql = "SELECT wfs_id FROM wfs WHERE uuid IS NULL;";
+$res = db_prep_query($sql,$v,$t);
+$countWfsWithoutUuid = 0;
+while($row = db_fetch_array($res)){
+ $wfsId = $row['wfs_id'];
+ $uuid = new Uuid();
+ $vUpdate = array($uuid,$wfsId);
+ $tUpdate = array('s');
+ $sqlUpdate = "UPDATE wfs set uuid = $1 WHERE wfs_id = $2;";
+ $resUpdate = db_prep_query($sqlUpdate,$vUpdate,$tUpdate);
+ $countWfsWithoutUuid++;
+}
+echo $countWfsWithoutUuid." Wfs updated!";
+echo "<br>";
+//end -- update wfs table
+//update featuretype table
+$v = array();
+$t = array();
+$sql = "SELECT featuretype_id FROM wfs_featuretype WHERE uuid IS NULL;";
+$res = db_prep_query($sql,$v,$t);
+$countFeaturetypeWithoutUuid = 0;
+while($row = db_fetch_array($res)){
+ $featuretypeId = $row['featuretype_id'];
+ $uuid = new Uuid();
+ $vUpdate = array($uuid,$featuretypeId);
+ $tUpdate = array('s');
+ $sqlUpdate = "UPDATE wfs_featuretype set uuid = $1 WHERE featuretype_id = $2;";
+ $resUpdate = db_prep_query($sqlUpdate,$vUpdate,$tUpdate);
+ $countFeaturetypeWithoutUuid++;
+}
+echo $countFeaturetypeWithoutUuid." Featuretype updated!";
+echo "<br>";
+//end -- update featuretype table
+
+?>
Copied: branches/2.7/tools/monitorCapabilities.sh (from rev 7473, trunk/mapbender/tools/monitorCapabilities.sh)
===================================================================
--- branches/2.7/tools/monitorCapabilities.sh (rev 0)
+++ branches/2.7/tools/monitorCapabilities.sh 2011-01-27 09:48:27 UTC (rev 7475)
@@ -0,0 +1,3 @@
+. /etc/profile
+cd /data/mapbender/tools/
+php5 /data/mapbender/tools/mod_monitorCapabilities_main.php group:36 > /dev/null
More information about the Mapbender_commits
mailing list