[Mapbender-commits] r9503 - trunk/mapbender/http/plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jun 1 07:35:32 PDT 2016
Author: verenadiewald
Date: 2016-06-01 07:35:32 -0700 (Wed, 01 Jun 2016)
New Revision: 9503
Modified:
trunk/mapbender/http/plugins/mb_metadata_layer.js
trunk/mapbender/http/plugins/mb_metadata_layer.php
trunk/mapbender/http/plugins/mb_metadata_layerPreview.js
trunk/mapbender/http/plugins/mb_metadata_server.php
Log:
hint for user if preview image has been uploaded
Modified: trunk/mapbender/http/plugins/mb_metadata_layer.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_layer.js 2016-05-27 10:29:42 UTC (rev 9502)
+++ trunk/mapbender/http/plugins/mb_metadata_layer.js 2016-06-01 14:35:32 UTC (rev 9503)
@@ -96,6 +96,12 @@
that.fillMetadataURLs(obj);
that.valid();
that.enableResetButton();
+ // check for preview
+ if (obj.hasPreview === true) {
+ $("#previewImgUpload .hasPreviewImage").css('display','inline-block');
+ } else {
+ $("#previewImgUpload .hasPreviewImage").css('display','none');
+ }
}
});
req.send();
@@ -234,5 +240,3 @@
};
$metadataLayer.mapbender(new MetadataLayerApi(options));
-
-
Modified: trunk/mapbender/http/plugins/mb_metadata_layer.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_layer.php 2016-05-27 10:29:42 UTC (rev 9502)
+++ trunk/mapbender/http/plugins/mb_metadata_layer.php 2016-06-01 14:35:32 UTC (rev 9503)
@@ -96,6 +96,7 @@
<div id="previewImgUpload">
<form id="previewImgForm" action='../php/mb_metadata_uploadLayerPreview.php' enctype="multipart/form-data">
<input type="file" name="image">
+ <span style="display:none;color:green" class="hasPreviewImage">Preview vorhanden</span>
<input type="submit" value="Upload">
<input type="hidden" name="source_id" value="source_id" >
<div id="upload"></div>
@@ -146,4 +147,3 @@
</p>
</fieldset>
</div>
-
Modified: trunk/mapbender/http/plugins/mb_metadata_layerPreview.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_layerPreview.js 2016-05-27 10:29:42 UTC (rev 9502)
+++ trunk/mapbender/http/plugins/mb_metadata_layerPreview.js 2016-06-01 14:35:32 UTC (rev 9503)
@@ -215,7 +215,6 @@
function fileUpload(form, action_url, div_id, type) {
-
var iframe = document.createElement("iframe");
iframe.setAttribute("id", "upload_iframe");
iframe.setAttribute("name", "upload_iframe");
@@ -237,7 +236,10 @@
content = iframeId.document.body.innerHTML;
}
document.getElementById(div_id).innerHTML = content;
- setTimeout('iframeId.parentNode.removeChild(iframeId)', 250);
+ setTimeout('iframeId.parentNode.removeChild(iframeId)', 350);
+ $("#previewImgForm").get(0).reset();
+ $("#previewImgUpload .hasPreviewImage").css('display','inline-block');
+
}
if (iframeId.addEventListener) iframeId.addEventListener("load", eventHandler, true);
if (iframeId.attachEvent) iframeId.attachEvent("onload", eventHandler);
@@ -248,12 +250,10 @@
form.setAttribute("encoding", "multipart/form-data");
//set the layer_id
if (type === 'wms') {
-
$('#previewImgForm input[type=hidden]').val($('input[id="layer_id"]').val());
} else {
$('#previewImgForm input[type=hidden]').val($('input[id="wmc_id"]').val());
}
form.submit();
-
document.getElementById(div_id).innerHTML = "Uploading...";
}
Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php 2016-05-27 10:29:42 UTC (rev 9502)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php 2016-06-01 14:35:32 UTC (rev 9503)
@@ -117,7 +117,7 @@
for ($k = 0; $k < $numberOfSurfaces; $k++) {
$polygonalExtentExterior[] = extractPolygonArray($xpath, '/gml:MultiSurface/gml:surfaceMember['. (string)($k + 1) .']');
}
- } else {
+ } else {
$polygonalExtentExterior[0] = extractPolygonArray($xpath, '/');
}
$crs = $xpath->query('/gml:Polygon/@srsName');
@@ -137,21 +137,21 @@
$area_4326_box = explode(',',EXTENTSERVICEBBOX);
if ($layer_4326_box[0] <= $area_4326_box[0] || $layer_4326_box[2] >= $area_4326_box[2] || $layer_4326_box[1] <= $area_4326_box[1] || $layer_4326_box[3] >= $area_4326_box[3]) {
if ($layer_4326_box[0] < $area_4326_box[0]) {
- $area_4326_box[0] = $layer_4326_box[0];
+ $area_4326_box[0] = $layer_4326_box[0];
}
if ($layer_4326_box[2] > $area_4326_box[2]) {
- $area_4326_box[2] = $layer_4326_box[2];
+ $area_4326_box[2] = $layer_4326_box[2];
}
if ($layer_4326_box[1] < $area_4326_box[1]) {
- $area_4326_box[1] = $layer_4326_box[1];
+ $area_4326_box[1] = $layer_4326_box[1];
}
if ($layer_4326_box[3] > $area_4326_box[3]) {
- $area_4326_box[3] = $layer_4326_box[3];
+ $area_4326_box[3] = $layer_4326_box[3];
}
- $d_x = $area_4326_box[2] - $area_4326_box[0];
+ $d_x = $area_4326_box[2] - $area_4326_box[0];
$d_y = $area_4326_box[3] - $area_4326_box[1];
-
+
$new_minx = $area_4326_box[0] - 0.05*($d_x);
$new_maxx = $area_4326_box[2] + 0.05*($d_x);
$new_miny = $area_4326_box[1] - 0.05*($d_y);
@@ -169,13 +169,13 @@
switch ($ajaxResponse->getMethod()) {
case "getWms" :
$wmsIdArray = getWms();
-
+
$wmsList = implode(",", $wmsIdArray);
$sql = <<<SQL
-
+
SELECT wms.wms_id, wms.wms_title, to_timestamp(wms.wms_timestamp),to_timestamp(wms.wms_timestamp_create), wms_version, m.status_comment, wms_id
FROM wms LEFT JOIN mb_wms_availability AS m
-ON wms.wms_id = m.fkey_wms_id
+ON wms.wms_id = m.fkey_wms_id
WHERE wms_id IN ($wmsList);
SQL;
@@ -189,7 +189,7 @@
_mb("version"),
_mb("status"),
_mb("wms id")
- ),
+ ),
"data" => array()
);
@@ -210,23 +210,23 @@
$wms->createObjFromDBNoGui($wmsId);//here the owsproxyurls will be read out - to make previews with proxy urls
$fields = array(
- "wms_id",
- "wms_abstract",
- "wms_title",
- "fees",
- "accessconstraints",
- "contactperson",
- "contactposition",
- "contactvoicetelephone",
- "contactfacsimiletelephone",
- "contactorganization",
- "address",
- "city",
- "stateorprovince",
- "postcode",
- "country",
+ "wms_id",
+ "wms_abstract",
+ "wms_title",
+ "fees",
+ "accessconstraints",
+ "contactperson",
+ "contactposition",
+ "contactvoicetelephone",
+ "contactfacsimiletelephone",
+ "contactorganization",
+ "address",
+ "city",
+ "stateorprovince",
+ "postcode",
+ "country",
"contactelectronicmailaddress",
- "wms_timestamp",
+ "wms_timestamp",
"wms_timestamp_create",
"wms_network_access",
"wms_max_imagesize",
@@ -239,17 +239,17 @@
foreach ($fields as $field) {
if ($field == "wms_timestamp" || $field == "wms_timestamp_create") {
if ($wms->$field != "") {
-
+
$resultObj[$field] = date('d.m.Y', $wms->$field);
-
+
}
}
else {
$resultObj[$field] = $wms->$field;
- //$e = new mb_exception("mb_metadata_server: resultObject[".$field."]=".$wms->$field);
+ //$e = new mb_exception("mb_metadata_server: resultObject[".$field."]=".$wms->$field);
}
}
-
+
// layer searchable
$resultObj["layer_searchable"] = array();
foreach ($wms->objLayer as $layer) {
@@ -257,12 +257,12 @@
$resultObj["layer_searchable"][] = intval($layer->layer_uid);
}
}
-
+
$keywordSql = <<<SQL
-
-SELECT DISTINCT keyword FROM keyword, layer_keyword
+
+SELECT DISTINCT keyword FROM keyword, layer_keyword
WHERE keyword_id = fkey_keyword_id AND fkey_layer_id IN (
- SELECT layer_id from layer, wms
+ SELECT layer_id from layer, wms
WHERE fkey_wms_id = wms_id AND wms_id = $wmsId
) ORDER BY keyword
@@ -296,12 +296,12 @@
//check if fkey_mb_group_id has been defined before - in service table
if ($resultObj["fkey_mb_group_id"] == "" || !isset($resultObj["fkey_mb_group_id"])){
$e = new mb_notice("fkey_mb_group_id is null or empty");
- //check if primary group is set
+ //check if primary group is set
$user = new User;
$userId = $user->id;
//$e = new mb_exception("user id:".$userId);
$sql = <<<SQL
-
+
SELECT fkey_mb_group_id, mb_group_name, mb_group_title, mb_group_address, mb_group_email, mb_group_postcode, mb_group_city, mb_group_logo_path, mb_group_voicetelephone FROM (SELECT fkey_mb_group_id FROM mb_user_mb_group WHERE fkey_mb_user_id = $1 AND mb_user_mb_group_type = 2) AS a LEFT JOIN mb_group ON a.fkey_mb_group_id = mb_group.mb_group_id
SQL;
@@ -323,7 +323,7 @@
} else {
//get current fkey_mb_group_id and the corresponding data
$sql = <<<SQL
-
+
SELECT mb_group_name, mb_group_title, mb_group_address, mb_group_email, mb_group_postcode, mb_group_city, mb_group_logo_path, mb_group_voicetelephone FROM mb_group WHERE mb_group_id = $1
SQL;
@@ -349,14 +349,14 @@
$ajaxResponse->setSuccess(true);
break;
-
+
case "getLayerMetadata" :
$layerId = $ajaxResponse->getParameter("id");
getLayer($layerId);
//new - only layers with latlonbboxes are supported!
$sql = <<<SQL
-
-SELECT layer_id, layer_name, layer_title, layer_abstract, layer_searchable, inspire_download, fkey_wms_id as wms_id
+
+SELECT layer_id, layer_name, layer_title, layer_abstract, layer_searchable, inspire_download, fkey_wms_id as wms_id
FROM layer WHERE layer_id = $layerId;
SQL;
@@ -371,8 +371,8 @@
}
$sql = <<<SQL
-SELECT fkey_md_topic_category_id
-FROM layer_md_topic_category
+SELECT fkey_md_topic_category_id
+FROM layer_md_topic_category
WHERE fkey_layer_id = $layerId AND fkey_metadata_id ISNULL
SQL;
$res = db_query($sql);
@@ -381,8 +381,8 @@
}
$sql = <<<SQL
-SELECT fkey_inspire_category_id
-FROM layer_inspire_category
+SELECT fkey_inspire_category_id
+FROM layer_inspire_category
WHERE fkey_layer_id = $layerId AND fkey_metadata_id ISNULL
SQL;
$res = db_query($sql);
@@ -391,8 +391,8 @@
}
$sql = <<<SQL
-SELECT fkey_custom_category_id
-FROM layer_custom_category
+SELECT fkey_custom_category_id
+FROM layer_custom_category
WHERE fkey_layer_id = $layerId AND fkey_metadata_id ISNULL
SQL;
$res = db_query($sql);
@@ -401,7 +401,7 @@
}
$sql = <<<SQL
-SELECT keyword FROM keyword, layer_keyword
+SELECT keyword FROM keyword, layer_keyword
WHERE keyword_id = fkey_keyword_id AND fkey_layer_id = $layerId
SQL;
$res = db_query($sql);
@@ -417,14 +417,14 @@
SELECT minx, miny, maxx, maxy from layer_epsg WHERE fkey_layer_id = $1 AND epsg = 'EPSG:4326'
SQL;
$res = db_query($sql);*/
-
+
//read out values
-
+
//get coupled MetadataURLs from md_metadata and ows_relation_metadata table
$sql = <<<SQL
-SELECT metadata_id, uuid, link, linktype, md_format, relation.relation_type, origin FROM mb_metadata
-INNER JOIN (SELECT * from ows_relation_metadata
-WHERE fkey_layer_id = $layerId ) as relation ON
+SELECT metadata_id, uuid, link, linktype, md_format, relation.relation_type, origin FROM mb_metadata
+INNER JOIN (SELECT * from ows_relation_metadata
+WHERE fkey_layer_id = $layerId ) as relation ON
mb_metadata.metadata_id = relation.fkey_metadata_id WHERE relation.relation_type IN ('capabilities','external','metador','upload', 'internal') ORDER BY metadata_id DESC
SQL;
$res = db_query($sql);
@@ -448,6 +448,12 @@
}
$i++;
}
+ // check for preview image
+ if (file_exists(PREVIEW_DIR."/".$layerId."_layer_map_preview.jpg")) {
+ $resultObj['hasPreview']= true;
+ } else {
+ $resultObj['hasPreview']= false;
+ }
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
@@ -455,8 +461,8 @@
$wmsId = $ajaxResponse->getParameter("id");
// getWms($wmsId);
$sql = <<<SQL
-
-SELECT layer_id, f_count_layer_couplings(layer_id) as count_coupling, f_collect_inspire_cat_layer(layer_id) AS inspire_cats, layer_pos, layer_parent, layer_name, layer_title, layer_abstract, layer_searchable, inspire_download
+
+SELECT layer_id, f_count_layer_couplings(layer_id) as count_coupling, f_collect_inspire_cat_layer(layer_id) AS inspire_cats, layer_pos, layer_parent, layer_name, layer_title, layer_abstract, layer_searchable, inspire_download
FROM layer WHERE fkey_wms_id = $wmsId ORDER BY layer_pos;
SQL;
@@ -508,8 +514,8 @@
// new sub tree
if ($parent === $nodeArray[count($nodeArray)-1]["pos"]) {
$addedNodeArray = addSubTree($rows, $j, ++$left);
- $nodeArray[count($nodeArray)-1]["right"] =
- $nodeArray[count($nodeArray)-1]["left"] +
+ $nodeArray[count($nodeArray)-1]["right"] =
+ $nodeArray[count($nodeArray)-1]["left"] +
2 * count($addedNodeArray) + 1;
$left = $nodeArray[count($nodeArray)-1]["right"] + 1;
$nodeArray = array_merge($nodeArray, $addedNodeArray);
@@ -542,26 +548,26 @@
catch (Exception $e) {
$ajaxResponse->setSuccess(false);
$ajaxResponse->setMessage(_mb("Invalid WMS ID."));
- $ajaxResponse->send();
+ $ajaxResponse->send();
}
getWms($wmsId);
- $wms = new wms();
+ $wms = new wms();
$wms->createObjFromDBNoGui($wmsId,false);//here the original urls will be used - cause the object will used to update the wms table
$columns = array(
- "wms_abstract",
- "wms_title",
- "fees",
- "accessconstraints",
- "contactperson",
- "contactposition",
- "contactvoicetelephone",
- "contactfacsimiletelephone",
- "contactorganization",
- "address",
- "city",
- "stateorprovince",
- "postcode",
- "country",
+ "wms_abstract",
+ "wms_title",
+ "fees",
+ "accessconstraints",
+ "contactperson",
+ "contactposition",
+ "contactvoicetelephone",
+ "contactfacsimiletelephone",
+ "contactorganization",
+ "address",
+ "city",
+ "stateorprovince",
+ "postcode",
+ "country",
"contactelectronicmailaddress",
"wms_termsofuse",
"wms_network_access",
@@ -594,9 +600,9 @@
$e = new mb_notice("mb_metadata_server.php: Layer with id ".$id." found to be searchable");
if ($id == intval($layer->layer_uid)) {
$e = new mb_notice("mb_metadata_server.php: Layer identical - update it in wms object");
- $layer->layer_searchable = 1;
+ $layer->layer_searchable = 1;
} else {
- continue; //with next
+ continue; //with next
}
unset($id);
//$layer->layer_searchable = 1;
@@ -610,7 +616,7 @@
catch (Exception $e) {
$ajaxResponse->setSuccess(false);
$ajaxResponse->setMessage(_mb("Could not read layer ID ".$data->layer->layer_id));
- $ajaxResponse->send();
+ $ajaxResponse->send();
}
if ($layerId) {
$e = new mb_notice("Got following layer id from wms metadata editor client: ".$layerId);
@@ -620,7 +626,7 @@
catch (Exception $e) {
$ajaxResponse->setSuccess(false);
$ajaxResponse->setMessage(_mb("Could not get layer with ID ".$layerId." from wms object by reference!"));
- $ajaxResponse->send();
+ $ajaxResponse->send();
}
$columns = array(
"layer_abstract",
@@ -708,12 +714,12 @@
//catch (Exception $e) {
// $ajaxResponse->setSuccess(false);
// $ajaxResponse->setMessage(_mb("Could not update wms object in database!"));
- // $ajaxResponse->send();
+ // $ajaxResponse->send();
//}
$e = new mb_exception("object in db updated");
-
+
$ajaxResponse->setMessage($messResult);
- $ajaxResponse->setSuccess(true);
+ $ajaxResponse->setSuccess(true);
break;
case "getContactMetadata" :
$mbGroupId = $ajaxResponse->getParameter("id");
@@ -734,7 +740,7 @@
$resultObj["mb_group_postcode"] = $row["mb_group_postcode"];
$resultObj["mb_group_city"] = $row["mb_group_city"];
$resultObj["mb_group_logo_path"] = $row["mb_group_logo_path"];
- $resultObj["mb_group_voicetelephone"] = $row["mb_group_voicetelephone"];
+ $resultObj["mb_group_voicetelephone"] = $row["mb_group_voicetelephone"];
}
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
@@ -779,7 +785,7 @@
$row = array();
if ($res) {
$row = db_fetch_assoc($res);
- $resultObj["wms_id"]= $row['fkey_wms_id'];
+ $resultObj["wms_id"]= $row['fkey_wms_id'];
}
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
@@ -817,11 +823,11 @@
$resultObj["update_frequency"] = $mbMetadata->updateFrequency; //text
//check for existing polygon
//$e = new mb_exception("mb_metadata_server.php: count of polygon points ".count($mbMetadata->polygonalExtentExterior));
- if (count($mbMetadata->polygonalExtentExterior) >= 1) {
+ if (count($mbMetadata->polygonalExtentExterior) >= 1) {
$e = new mb_notice("mb_metadata_server.php: count of polygon points ".count($mbMetadata->polygonalExtentExterior));
$resultObj["has_polygon"] = true;
} else {
- $resultObj["has_polygon"] = false;
+ $resultObj["has_polygon"] = false;
}
switch ($export2csw) {
case "t" :
@@ -831,7 +837,7 @@
$resultObj["export2csw"] = false;
break;
default:
- break;
+ break;
}
$inspire_top_consistence = $mbMetadata->inspireTopConsistence; //boolean
switch ($inspire_top_consistence) {
@@ -842,7 +848,7 @@
$resultObj["inspire_top_consistence"] = false;
break;
default:
- break;
+ break;
}
switch ($mbMetadata->inspireDownload) {
case 0 :
@@ -852,7 +858,7 @@
$resultObj["inspire_download"] = true;
break;
default:
- break;
+ break;
}
//things about licences
$resultObj["fees_md"] = $mbMetadata->fees;
@@ -869,7 +875,7 @@
//only pull keywords without a thesaurus name!!
for ($i = 0; $i < count($mbMetadata->keywords); $i++) {
if ($mbMetadata->keywordsThesaurusName[$i] == "" or $mbMetadata->keywordsThesaurusName[$i] == "none") {
- $resultObj["keywords"][] = $mbMetadata->keywords[$i];
+ $resultObj["keywords"][] = $mbMetadata->keywords[$i];
}
}
$resultObj["keywords"] = implode(",",$resultObj["keywords"]);
@@ -902,7 +908,7 @@
if ($res) {
$row = db_fetch_assoc($res);
$resultObj["title"]= $row['layer_title']; //serial
- $resultObj["abstract"] = $row["layer_abstract"]; //char
+ $resultObj["abstract"] = $row["layer_abstract"]; //char
$resultObj["west"]= $row['west']; //double
$resultObj["south"] = $row["south"]; //double
$resultObj["east"]= $row['east']; //double
@@ -1010,7 +1016,7 @@
}
if (isset($data->south)) {
$mbMetadata->wgs84Bbox[1] = $data->south;
- }
+ }
if (isset($data->fees_md)) {
$mbMetadata->fees = $data->fees_md;
}
@@ -1069,13 +1075,13 @@
$sql = <<<SQL
select distinct metadata_id, title from (
select metadata_id, title from (select fkey_metadata_id from (select layer_id from
- (select wms_id from wms where wms_owner = $1) wms inner join layer on wms.wms_id = layer.fkey_wms_id) layer
-inner join ows_relation_metadata on layer.layer_id = ows_relation_metadata.fkey_layer_id where layer.layer_id <> $2) ows_r_m inner
-join mb_metadata on ows_r_m.fkey_metadata_id = mb_metadata.metadata_id union
-select distinct metadata_id, title from (select fkey_metadata_id from (select featuretype_id
-from (select wfs_id from wfs where wfs_owner = $1) wfs inner join wfs_featuretype on
-wfs.wfs_id = wfs_featuretype.fkey_wfs_id) featuretype inner join ows_relation_metadata on
-featuretype.featuretype_id = ows_relation_metadata.fkey_featuretype_id) ows_r_m inner
+ (select wms_id from wms where wms_owner = $1) wms inner join layer on wms.wms_id = layer.fkey_wms_id) layer
+inner join ows_relation_metadata on layer.layer_id = ows_relation_metadata.fkey_layer_id where layer.layer_id <> $2) ows_r_m inner
+join mb_metadata on ows_r_m.fkey_metadata_id = mb_metadata.metadata_id union
+select distinct metadata_id, title from (select fkey_metadata_id from (select featuretype_id
+from (select wfs_id from wfs where wfs_owner = $1) wfs inner join wfs_featuretype on
+wfs.wfs_id = wfs_featuretype.fkey_wfs_id) featuretype inner join ows_relation_metadata on
+featuretype.featuretype_id = ows_relation_metadata.fkey_featuretype_id) ows_r_m inner
join mb_metadata on ows_r_m.fkey_metadata_id = mb_metadata.metadata_id) as foo order by metadata_id DESC
SQL;
$v = array($user->id, $layerId);
@@ -1086,7 +1092,7 @@
$i = 0;
while ($row = db_fetch_assoc($res)) {
$resultObj[$i]->metadataId = $row['metadata_id']; //integer
- $resultObj[$i]->metadataTitle = $row["title"]; //char
+ $resultObj[$i]->metadataTitle = $row["title"]; //char
$i++;
}
$ajaxResponse->setResult($resultObj);
@@ -1097,7 +1103,7 @@
$resourceType = $ajaxResponse->getParameter("resourceType");
$data = $ajaxResponse->getParameter("data");
//normaly the link is only set if a link has been created
- //if a record has been created, the link element will be empty
+ //if a record has been created, the link element will be empty
//use this to distinguish between the to different inserts!
//this insert should also push one entry in the ows_relation_metadata table! - after the insert into md_metadata
//origin
@@ -1139,7 +1145,7 @@
//are initialized from class_iso19139
$mbMetadata = new Iso19139();
$randomid = new Uuid();
- //read out json objects
+ //read out json objects
if (isset($data->link)) {
$mbMetadata->href = $data->link;
}
@@ -1148,7 +1154,7 @@
} else {
$mbMetadata->export2Csw = 'f';
}
-
+
if (isset($data->title)) {
$mbMetadata->title = $data->title;
}
@@ -1219,7 +1225,7 @@
}
if (isset($data->south)) {
$mbMetadata->wgs84Bbox[1] = $data->south;
- }
+ }
$e = new mb_exception("whole area: ".$data->inspire_whole_area);
if (isset($data->inspire_whole_area) && $data->inspire_whole_area != "") {
$mbMetadata->inspireWholeArea = $data->inspire_whole_area;
@@ -1279,7 +1285,7 @@
$ajaxResponse->setMessage("Stored metadata from external link to mapbender database!");
$ajaxResponse->setSuccess(true);
$e = new mb_notice("Stored metadata from external link to mapbender database!");
- }
+ }
} else { //fill thru metador
$mdOwner = Mapbender::session()->get("mb_user_id");
$mbMetadata->owner = $mdOwner;
@@ -1297,7 +1303,7 @@
$ajaxResponse->setMessage("Metadata with id ".$randomid." stored from editor to db!");
$ajaxResponse->setSuccess(true);
}
- }
+ }
break;
case "deleteInternalMetadataLinkage" :
$metadataId = $ajaxResponse->getParameter("metadataId");
@@ -1311,7 +1317,7 @@
case "deleteMetadataAddon" :
$metadataId = $ajaxResponse->getParameter("metadataId");
$resourceId = $ajaxResponse->getParameter("resourceId");
- $resourceType = $ajaxResponse->getParameter("resourceType");
+ $resourceType = $ajaxResponse->getParameter("resourceType");
$mbMetadata = new Iso19139();
$result = $mbMetadata->deleteMetadataAddon($resourceType, $resourceId, $metadataId); //$contentType = "layer" or "featuretype" or ...
$ajaxResponse->setSuccess($result['success']);
@@ -1328,7 +1334,7 @@
if ($wktPolygon) {
//insert polygon into database
$sql = <<<SQL
-UPDATE mb_metadata SET bounding_geom = $2 WHERE metadata_id = $1
+UPDATE mb_metadata SET bounding_geom = $2 WHERE metadata_id = $1
SQL;
$v = array($metadataId, $wktPolygon);
//$e = new mb_exception($metadataId);
@@ -1338,7 +1344,7 @@
abort(_mb("Problem while storing geometry into database!"));
} else {
//build new preview url if possible and give it back in ajax response
-
+
$ajaxResponse->setMessage("Stored successfully geometry into database!");
$ajaxResponse->setSuccess(true);
}
@@ -1347,13 +1353,13 @@
}
//parse gml and extract multipolygon to wkt representation
//push multipolygon into database
-
+
break;
case "deleteGmlPolygon" :
$metadataId = $ajaxResponse->getParameter("metadataId");
$e = new mb_notice("metadataId: ".$metadataId);
$sql = <<<SQL
-UPDATE mb_metadata SET bounding_geom = NULL WHERE metadata_id = $1
+UPDATE mb_metadata SET bounding_geom = NULL WHERE metadata_id = $1
SQL;
$v = array($metadataId);
//$e = new mb_exception($metadataId);
@@ -1372,10 +1378,10 @@
$resourceType = $ajaxResponse->getParameter("resourceType");
$filename = $ajaxResponse->getParameter("filename");
//normaly the link is only set if a link has been created
- //if a record has been created, the link element will be empty
+ //if a record has been created, the link element will be empty
//use this to distinguish between the to different inserts!
//this insert should also push one entry in the ows_relation_metadata table! - after the insert into md_metadata
- $randomid = new Uuid();
+ $randomid = new Uuid();
$e = new mb_notice("File to load: ".$filename);
$metaData = file_get_contents($filename);
if (!$metaData){
@@ -1394,15 +1400,15 @@
$e = new mb_exception("Problem while storing uploaded metadata xml to mb_metadata table!");
$e = new mb_exception($result['message']);
abort($result['message']);
-
+
} else {
$e = new mb_notice("Metadata with random id ".$randomid." stored to db!");
-
+
$ajaxResponse->setMessage("Uploaded metadata object inserted into md_metadata table!");
$ajaxResponse->setSuccess(true);
}
- break;
- default:
+ break;
+ default:
$ajaxResponse->setSuccess(false);
$ajaxResponse->setMessage(_mb("An unknown error occured."));
break;
More information about the Mapbender_commits
mailing list