[Mapbender-commits] r8630 - trunk/mapbender/http/plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Sun May 26 12:11:40 PDT 2013
Author: armin11
Date: 2013-05-26 12:11:40 -0700 (Sun, 26 May 2013)
New Revision: 8630
Modified:
trunk/mapbender/http/plugins/mb_metadata_edit.js
trunk/mapbender/http/plugins/mb_metadata_server.php
trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js
trunk/mapbender/http/plugins/mb_metadata_showMetadataAddonWfs.js
trunk/mapbender/http/plugins/mb_metadata_wfs_edit.js
trunk/mapbender/http/plugins/mb_metadata_wfs_server.php
trunk/mapbender/http/plugins/mb_metadata_xml_import.js
trunk/mapbender/http/plugins/mb_metadata_xml_import_wfs.js
Log:
Some code cleaning - make things easier to debug and extend
Modified: trunk/mapbender/http/plugins/mb_metadata_edit.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_edit.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_edit.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -107,6 +107,7 @@
});
req.send();
}
+
//Show more information about the licences
this.fillLicence = function(obj) {
// get licence information from server per termsofuse_id
Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php 2013-05-26 19:11:40 UTC (rev 8630)
@@ -317,18 +317,13 @@
case "getLayerByWms" :
$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
FROM layer WHERE fkey_wms_id = $wmsId ORDER BY layer_pos;
SQL;
-
-
-
$res = db_query($sql);
-
$rows = array();
while ($row = db_fetch_assoc($res)) {
$rows[] = $row;
@@ -367,7 +362,6 @@
$row = $rows[$j];
$pos = intval($row["layer_pos"]);
$parent = $row["layer_parent"] !== "" ? intval($row["layer_parent"]) : null;
-
// first node of subtree
if ($addNewNode) {
$nodeArray[]= createNode($left, null, $row);
@@ -377,19 +371,14 @@
// 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"] +
2 * count($addedNodeArray) + 1;
-
$left = $nodeArray[count($nodeArray)-1]["right"] + 1;
-
$nodeArray = array_merge($nodeArray, $addedNodeArray);
$j += count($addedNodeArray) - 1;
$addNewNode = true;
-
- }
- // siblings
+ }// siblings
elseif ($parent === $nodeArray[count($nodeArray)-1]["parent"]) {
$nodeArray[count($nodeArray)-1]["right"] = ++$left;
$nodeArray[]= createNode(++$left, null, $row);
@@ -401,21 +390,15 @@
}
return $nodeArray;
}
-
-
$nodeArray = addSubTree($rows, 0, 1);
$resultObj = array(
"nestedSets" => $nodeArray
- );
-
+ );
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
-
-
break;
case "save":
$data = $ajaxResponse->getParameter("data");
-
try {
$wmsId = intval($data->wms->wms_id);
}
@@ -425,10 +408,8 @@
$ajaxResponse->send();
}
getWms($wmsId);
-
$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",
@@ -460,7 +441,6 @@
$wms->$c = $value;
}
}
-
if (is_array($data->wms->layer_searchable)) {
foreach ($wms->objLayer as &$layer) {
$layer->layer_searchable = 0;//why
@@ -481,7 +461,6 @@
}
}
}
-
try {
$layerId = intval($data->layer->layer_id);
}
@@ -490,7 +469,6 @@
$ajaxResponse->setMessage(_mb("Could not read layer ID ".$data->layer->layer_id));
$ajaxResponse->send();
}
-
if ($layerId) {
$e = new mb_notice("Got following layer id from wms metadata editor client: ".$layerId);
try {
@@ -510,9 +488,6 @@
"layer_inspire_category_id",
"layer_custom_category_id"
);
-
-
-
//extract relevant information from json and fill them into the wms object
foreach ($columns as $c) {
$value = $data->layer->$c;
@@ -599,17 +574,11 @@
}
$ajaxResponse->setMessage($messResult);
$ajaxResponse->setSuccess(true);
-
break;
-
-
-
case "getContactMetadata" :
$mbGroupId = $ajaxResponse->getParameter("id");
$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;
$v = array($mbGroupId);
$t = array('i');
@@ -630,13 +599,10 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-
case "getLicenceInformation" :
$termsofuseId = $ajaxResponse->getParameter("id");
$sql = <<<SQL
-
SELECT name, symbollink, description, descriptionlink, isopen FROM termsofuse WHERE termsofuse_id = $1
-
SQL;
$v = array($termsofuseId);
$t = array('i');
@@ -672,8 +638,7 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
- case "getLayerMetadataAddon" :
- //$layerId = $ajaxResponse->getParameter("layerId");
+ case "getMetadataAddon" :
$metadataId = $ajaxResponse->getParameter("metadataId");
$mbMetadata = new Iso19139();
$result = $mbMetadata->createFromDBInternalId($metadataId);
@@ -684,8 +649,8 @@
$resultObj["origin"] = $mbMetadata->origin; //char
$resultObj["link"] = $mbMetadata->href; //char
$resultObj["linktype"] = $mbMetadata->type; //char
- $resultObj["title"] = $mbMetadata->title; //char -- prefill from layer
- $resultObj["abstract"] = $mbMetadata->abstract; //char - prefill from layer
+ $resultObj["title"] = $mbMetadata->title; //char -- prefill from layer/ft
+ $resultObj["abstract"] = $mbMetadata->abstract; //char - prefill from layer/ft
$resultObj["format"] = $mbMetadata->dataFormat; //char
$resultObj["ref_system"] = $mbMetadata->refSystem; //char
$resultObj["spatial_res_type"] = $mbMetadata->spatialResType; //integer
@@ -756,8 +721,7 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
- case "updateLayerMetadataAddon" :
- //$layerId = $ajaxResponse->getParameter("layerId");
+ case "updateMetadataAddon" :
$metadataId = $ajaxResponse->getParameter("metadataId");
//get json data from ajax call
$data = $ajaxResponse->getParameter("data");
@@ -818,23 +782,19 @@
$ajaxResponse->setMessage(_mb("Edited metadata was updated in the mapbender database!"));
$ajaxResponse->setSuccess(true);
}
-
} else {
//could not read metadata from db
$ajaxResponse->setMessage(_mb("Could not get metadata object from database!"));
$ajaxResponse->setSuccess(false);
}
break;
-
case "getOwnedMetadata" :
$layerId = $ajaxResponse->getParameter("layerId");
-
$user = new User(Mapbender::session()->get("mb_user_id"));
//$e = new mb_exception("plugins/mb_metadata_wfs_server.php: user_id: ".$user->id);
//Here a new handling is needed. Get coupled metadata entries from owned services - ows / content /md_relation / title of the coupled metadata maybe extented with union on owned metadata entries from big metador
$sql = <<<SQL
-
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
@@ -844,9 +804,7 @@
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
-
SQL;
-
$v = array($user->id, $layerId);
$t = array('i','i');
$res = db_prep_query($sql,$v,$t);
@@ -858,13 +816,12 @@
$resultObj[$i]->metadataTitle = $row["title"]; //char
$i++;
}
-
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-//******************
- case "insertLayerMetadataAddon" :
- $layerId = $ajaxResponse->getParameter("layerId");
+ case "insertMetadataAddon" :
+ $resourceId = $ajaxResponse->getParameter("resourceId");
+ $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
@@ -875,12 +832,8 @@
//insert a simple relation to an internal metadata entry - but how can this be distinguished?
//we need a new column with type of relation - maybe called internal
- $sql = <<<SQL
-
-INSERT INTO ows_relation_metadata (fkey_metadata_id, fkey_layer_id, internal, relation_type) VALUES ( $1, $2, $3, 'internal')
-
-SQL;
- $v = array($data->internal_relation,$layerId, 1);
+ $sql = "INSERT INTO ows_relation_metadata (fkey_metadata_id, fkey_".$resourceType."_id, internal, relation_type) VALUES ( $1, $2, $3, 'internal')";
+ $v = array($data->internal_relation,$resourceId, 1);
$t = array('i','i','i');
$res = db_prep_query($sql,$v,$t);
if (!$res){
@@ -985,7 +938,7 @@
$mbMetadata->type = "ISO19115:2003";
$mbMetadata->origin = "external";
$mbMetadata->owner = $mdOwner;
- $result = $mbMetadata->insertToDB("layer",$layerId);
+ $result = $mbMetadata->insertToDB($resourceType,$resourceId);
if ($result['value'] == false){
$e = new mb_exception("Problem while storing metadata to mb_metadata table!");
$e = new mb_exception($result['message']);
@@ -999,8 +952,7 @@
$mbMetadata->origin = "metador";
$mbMetadata->fileIdentifier = $uuid;
$mbMetadata->randomId = $randomid;
-
- $result = $mbMetadata->insertToDB("layer",$layerId);
+ $result = $mbMetadata->insertToDB($resourceType,$resourceId);
$e = new mb_exception("test to metadata insert/update via metador!");
if ($result['value'] == false) {
$e = new mb_exception("Problem while storing metadata from editor to mb_metadata table!");
@@ -1013,35 +965,28 @@
}
}
break;
-
case "deleteInternalMetadataLinkage" :
$metadataId = $ajaxResponse->getParameter("metadataId");
- $layerId = $ajaxResponse->getParameter("layerId");
- $resourceId = $layerId;
- $resourceType = "layer";
+ $resourceType = $ajaxResponse->getParameter("resourceType");
+ $resourceId = $ajaxResponse->getParameter("resourceId");
$mbMetadata = new Iso19139();
$result = $mbMetadata->deleteInternalMetadataLinkage($resourceType, $resourceId, $metadataId);
$ajaxResponse->setSuccess($result['success']);
$ajaxResponse->setMessage($result['message']);
- //$ajaxResponse->send();
- //die();
break;
-
- case "deleteLayerMetadataAddon" :
+ case "deleteMetadataAddon" :
$metadataId = $ajaxResponse->getParameter("metadataId");
- $layerId = $ajaxResponse->getParameter("layerId");
- $resourceId = $layerId;
- $resourceType = "layer";
+ $resourceId = $ajaxResponse->getParameter("resourceId");
+ $resourceType = $ajaxResponse->getParameter("resourceType");
$mbMetadata = new Iso19139();
$result = $mbMetadata->deleteMetadataAddon($resourceType, $resourceId, $metadataId); //$contentType = "layer" or "featuretype" or ...
$ajaxResponse->setSuccess($result['success']);
$ajaxResponse->setMessage($result['message']);
- //$ajaxResponse->send();
- //die();
break;
- case "importLayerXmlAddon" :
+ case "importXmlAddon" :
//this case is similar to insert the metadata from external link, but came from internal file from tmp folder which has been uploaded before
- $layerId = $ajaxResponse->getParameter("layerId");
+ $resourceId = $ajaxResponse->getParameter("resourceId");
+ $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
@@ -1061,7 +1006,7 @@
$mbMetadata->type = "ISO19115:2003";
$mbMetadata->origin = "upload";
$mbMetadata->owner = $mdOwner;
- $result = $mbMetadata->insertToDB("layer",$layerId);
+ $result = $mbMetadata->insertToDB($resourceType,$resourceId);
if ($result['value'] == false){
$e = new mb_exception("Problem while storing uploaded metadata xml to mb_metadata table!");
$e = new mb_exception($result['message']);
Modified: trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_showMetadataAddon.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -91,13 +91,12 @@
}
- this.getAddedMetadata = function(metadataId, layerId){
+ this.getAddedMetadata = function(metadataId){
// get metadata from server
var req = new Mapbender.Ajax.Request({
url: "../plugins/mb_metadata_server.php",
- method: "getLayerMetadataAddon",
+ method: "getMetadataAddon",
parameters: {
- "layerId": layerId,
"metadataId": metadataId
},
callback: function (obj, result, message) {
@@ -141,9 +140,10 @@
// push metadata from server
var req = new Mapbender.Ajax.Request({
url: "../plugins/mb_metadata_server.php",
- method: "insertLayerMetadataAddon",
+ method: "insertMetadataAddon",
parameters: {
- "layerId": layerId,
+ "resourceId": layerId,
+ "resourceType": "layer",
"data": data
},
callback: function (obj, result, message) {
@@ -162,9 +162,8 @@
// push metadata from server
var req = new Mapbender.Ajax.Request({
url: "../plugins/mb_metadata_server.php",
- method: "updateLayerMetadataAddon",
+ method: "updateMetadataAddon",
parameters: {
- "layerId": layerId,
"metadataId": metadataId,
"data": data
},
@@ -210,10 +209,11 @@
// push metadata from server
var req = new Mapbender.Ajax.Request({
url: "../plugins/mb_metadata_server.php",
- method: "deleteLayerMetadataAddon",
+ method: "deleteMetadataAddon",
parameters: {
"metadataId": metadataId,
- "layerId": layerId
+ "resourceId": layerId,
+ "resourceType": "layer"
},
callback: function (obj, result, message) {
if (!result) {
@@ -230,9 +230,7 @@
});
}
});
- req.send();
-
-
+ req.send();
}
deleteInternalMetadataLinkage = function(metadataId, layerId){
@@ -242,7 +240,8 @@
method: "deleteInternalMetadataLinkage",
parameters: {
"metadataId": metadataId,
- "layerId": layerId
+ "resourceType": "layer",
+ "resourceId": layerId
},
callback: function (obj, result, message) {
if (!result) {
@@ -259,9 +258,7 @@
});
}
});
- req.send();
-
-
+ req.send();
}
this.showForm = function (metadataId, layerId, isNew) {
@@ -332,7 +329,7 @@
constraintInput: true});
//first get json
if (!isNew) {
- that.getAddedMetadata(metadataId, layerId);
+ that.getAddedMetadata(metadataId);
} else {
//show chooser
Modified: trunk/mapbender/http/plugins/mb_metadata_showMetadataAddonWfs.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_showMetadataAddonWfs.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_showMetadataAddonWfs.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -90,13 +90,12 @@
req.send();
}
- this.getAddedMetadata = function(metadataId, featuretypeId){
+ this.getAddedMetadata = function(metadataId){
// get metadata from server
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
- method: "getFeaturetypeMetadataAddon",
+ url: "../plugins/mb_metadata_server.php",
+ method: "getMetadataAddon",
parameters: {
- "featuretypeId": featuretypeId,
"metadataId": metadataId
},
callback: function (obj, result, message) {
@@ -139,10 +138,11 @@
this.insertAddedMetadata = function(featuretypeId, data){
// push metadata from server
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
- method: "insertFeaturetypeMetadataAddon",
+ url: "../plugins/mb_metadata_server.php",
+ method: "insertMetadataAddon",
parameters: {
- "featuretypeId": featuretypeId,
+ "resourceId": featuretypeId,
+ "resourceType": "featuretype",
"data": data
},
callback: function (obj, result, message) {
@@ -160,10 +160,9 @@
this.updateAddedMetadata = function(metadataId, featuretypeId, data){
// push metadata from server
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
- method: "updateFeaturetypeMetadataAddon",
+ url: "../plugins/mb_metadata_server.php",
+ method: "updateMetadataAddon",
parameters: {
- "featuretypeId": featuretypeId,
"metadataId": metadataId,
"data": data
},
@@ -208,11 +207,12 @@
deleteAddedMetadata = function(metadataId, featuretypeId){
// push metadata from server
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
- method: "deleteFeaturetypeMetadataAddon",
+ url: "../plugins/mb_metadata_server.php",
+ method: "deleteMetadataAddon",
parameters: {
"metadataId": metadataId,
- "featuretypeId": featuretypeId
+ "resourceType": "featuretype",
+ "resourceId": featuretypeId
},
callback: function (obj, result, message) {
if (!result) {
@@ -237,11 +237,12 @@
deleteInternalMetadataLinkage = function(metadataId, featuretypeId){
// push metadata from server
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
+ url: "../plugins/mb_metadata_server.php",
method: "deleteInternalMetadataLinkage",
parameters: {
"metadataId": metadataId,
- "featuretypeId": featuretypeId
+ "resourceType": "featuretype",
+ "resourceId": featuretypeId
},
callback: function (obj, result, message) {
if (!result) {
@@ -320,7 +321,6 @@
that.fillFeaturetypeForm(featuretypeId);
}
-
this.init = function (metadataId, featuretypeId, isNew) {
$metadataAddonPopup.dialog("close");
$metadataAddonForm.load("../plugins/mb_metadata_addon.php", function () {
@@ -331,8 +331,7 @@
constraintInput: true});
//first get json
if (!isNew) {
- that.getAddedMetadata(metadataId, featuretypeId);
-
+ that.getAddedMetadata(metadataId);
} else {
//show chooser
$("#metadataUrlEditor").css("display","block");
Modified: trunk/mapbender/http/plugins/mb_metadata_wfs_edit.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_wfs_edit.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_wfs_edit.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -88,7 +88,7 @@
this.fillMdContact = function(obj) {
// get mdContact from server per fkey_mb_group_id
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
+ url: "../plugins/mb_metadata_server.php",
method: "getContactMetadata",
parameters: {
"id": obj
@@ -112,7 +112,7 @@
this.fillLicence = function(obj) {
// get licence information from server per termsofuse_id
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
+ url: "../plugins/mb_metadata_server.php",
method: "getLicenceInformation",
parameters: {
"id": obj
Modified: trunk/mapbender/http/plugins/mb_metadata_wfs_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_wfs_server.php 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_wfs_server.php 2013-05-26 19:11:40 UTC (rev 8630)
@@ -41,14 +41,10 @@
switch ($ajaxResponse->getMethod()) {
case "getWfs" :
$wfsIdArray = getWfs();
-
$wfsList = implode(",", $wfsIdArray);
-
$sql = <<<SQL
-
SELECT wfs.wfs_id, wfs.wfs_title, wfs.wfs_timestamp, wfs_version
FROM wfs WHERE wfs_id IN ($wfsList);
-
SQL;
$res = db_query($sql);
$resultObj = array(
@@ -60,7 +56,6 @@
),
"data" => array()
);
-
while ($row = db_fetch_row($res)) {
// convert NULL to '', NULL values cause datatables to crash
$walk = array_walk($row, create_function('&$s', '$s=strval($s);'));
@@ -69,26 +64,20 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-
case "getWfsMetadata" :
$wfsId = $ajaxResponse->getParameter("id");
getWfs($wfsId);
-
$sql = <<<SQL
-
SELECT wfs_id, wfs_abstract, wfs_title, fees, accessconstraints,
individualname, positionname, providername, voice,
facsimile, deliverypoint, city,
administrativearea, postalcode, country, electronicmailaddress,
wfs_timestamp, wfs_timestamp_create, wfs_network_access, fkey_mb_group_id, wfs_max_features
FROM wfs WHERE wfs_id = $wfsId;
-
SQL;
-
$res = db_query($sql);
$resultObj = array();
$row = db_fetch_assoc($res);
-
$resultObj['wfs_id'] = $row['wfs_id'];
$resultObj['summary'] = $row['wfs_abstract'];
$resultObj['title'] = $row['wfs_title'];
@@ -110,29 +99,22 @@
$resultObj['wfs_network_access'] = $row['wfs_network_access'];
$resultObj['wfs_max_features'] = $row['wfs_max_features'];
$resultObj['fkey_mb_group_id'] = $row['fkey_mb_group_id'];
-
$keywordSql = <<<SQL
-
SELECT DISTINCT keyword FROM keyword, wfs_featuretype_keyword
WHERE keyword_id = fkey_keyword_id AND fkey_featuretype_id IN (
SELECT featuretype_id from wfs_featuretype, wfs
WHERE fkey_wfs_id = wfs_id AND wfs_id = $wfsId
) ORDER BY keyword
-
SQL;
-
$keywordRes = db_query($keywordSql);
$keywords = array();
while ($keywordRow = db_fetch_assoc($keywordRes)) {
$keywords[]= $keywordRow["keyword"];
}
-
$resultObj["wfs_keywords"] = implode(", ", $keywords);
-
$termsofuseSql = <<<SQL
SELECT fkey_termsofuse_id FROM wfs_termsofuse WHERE fkey_wfs_id = $wfsId
SQL;
-
$termsofuseRes = db_query($termsofuseSql);
if ($termsofuseRes) {
$termsofuseRow = db_fetch_assoc($termsofuseRes);
@@ -141,9 +123,7 @@
else {
$resultObj["wfs_termsofuse"] = null;
}
-
$resultObj['wfs_network_access'] = $resultObj['wfs_network_access'] == 1 ? true : false;
-
//get contact information from group relation
//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"])){
@@ -153,9 +133,7 @@
$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;
$v = array($userId);
$t = array('i');
@@ -175,9 +153,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;
$v = array($resultObj["fkey_mb_group_id"]);
$t = array('i');
@@ -197,32 +173,23 @@
$resultObj["fkey_mb_group_id"] = null;
}
}
-
-
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
-
break;
-
case "getFeaturetypeMetadata" :
$featuretypeId = $ajaxResponse->getParameter("id");
getFeaturetype($featuretypeId);
-
$sql = <<<SQL
-
SELECT featuretype_id, featuretype_name, featuretype_title, featuretype_abstract, featuretype_searchable, inspire_download
FROM wfs_featuretype WHERE featuretype_id = $featuretypeId;
-
SQL;
$res = db_query($sql);
-
$resultObj = array();
while ($row = db_fetch_assoc($res)) {
foreach ($row as $key => $value) {
$resultObj[$key] = $value;
}
}
-
$sql = <<<SQL
SELECT fkey_md_topic_category_id
FROM wfs_featuretype_md_topic_category
@@ -232,7 +199,6 @@
while ($row = db_fetch_assoc($res)) {
$resultObj["featuretype_md_topic_category_id"][]= $row["fkey_md_topic_category_id"];
}
-
$sql = <<<SQL
SELECT fkey_inspire_category_id
FROM wfs_featuretype_inspire_category
@@ -242,7 +208,6 @@
while ($row = db_fetch_assoc($res)) {
$resultObj["featuretype_inspire_category_id"][]= $row["fkey_inspire_category_id"];
}
-
$sql = <<<SQL
SELECT fkey_custom_category_id
FROM wfs_featuretype_custom_category
@@ -252,21 +217,16 @@
while ($row = db_fetch_assoc($res)) {
$resultObj["featuretype_custom_category_id"][]= $row["fkey_custom_category_id"];
}
-
$sql = <<<SQL
SELECT keyword FROM keyword, wfs_featuretype_keyword
WHERE keyword_id = fkey_keyword_id AND fkey_featuretype_id = $featuretypeId
SQL;
$res = db_query($sql);
-
$resultObj["featuretype_keyword"] = array();
while ($row = db_fetch_assoc($res)) {
$resultObj["featuretype_keyword"][]= $row["keyword"];
}
-
$resultObj['inspire_download'] = $resultObj['inspire_download'] == 1 ? true : false;
-
-
//get 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
@@ -297,40 +257,23 @@
//$resultObj["md_metadata"]->internal[$i]= $row["internal"];
$i++;
}
-
-
-
-
-
-
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-
case "getFeaturetypeByWfs" :
$wfsId = $ajaxResponse->getParameter("id");
// getWms($wmsId);
-
$sql = <<<SQL
SELECT featuretype_id, featuretype_name, f_count_featuretype_couplings(featuretype_id) as count_coupling, f_collect_inspire_cat_wfs_featuretype(featuretype_id) AS inspire_cats, featuretype_abstract, featuretype_searchable, inspire_download
FROM wfs_featuretype WHERE fkey_wfs_id = $wfsId ORDER BY featuretype_id;
-
SQL;
-/* $sql = <<<SQL
-
-SELECT featuretype_id, featuretype_name, featuretype_title, featuretype_abstract
-FROM wfs_featuretype WHERE fkey_wfs_id = $wfsId ORDER BY featuretype_id;
-
-SQL;*/
$res = db_query($sql);
-
$rows = array();
while ($row = db_fetch_assoc($res)) {
$rows[] = $row;
}
$left = 1;
-
function createNode ($left, $right, $row) {
return array(
"left" => $left,
@@ -372,83 +315,18 @@
}
return $nodeArray;
}
-
-
$nodeArray = addSubTree($rows, 0, 1);
$resultObj = array(
"nestedSets" => $nodeArray
);
-
$ajaxResponse->setResult($resultObj);
- $ajaxResponse->setSuccess(true);
-
+ $ajaxResponse->setSuccess(true);
break;
-
- case "getFeaturetypeMetadataAddon" :
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- $metadataId = $ajaxResponse->getParameter("metadataId");
- $sql = <<<SQL
-
-SELECT * from mb_metadata where metadata_id = $1
-
-SQL;
- $v = array($metadataId);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $row = array();
- if ($res) {
- $row = db_fetch_assoc($res);
- $resultObj["metadata_id"]= $row['metadata_id']; //serial
- $resultObj["uuid"] = $row["uuid"]; //char
- $resultObj["origin"] = $row["origin"]; //char
- $resultObj["link"] = $row["link"]; //char
- $resultObj["linktype"] = $row["linktype"]; //char
- $resultObj["title"] = $row["title"]; //char -- prefill from featuretype
- $resultObj["abstract"] = $row["abstract"]; //char - prefill from featuretype
- $resultObj["format"] = $row["format"]; //char
- $resultObj["ref_system"] = $row["ref_system"]; //char
- $resultObj["spatial_res_type"] = $row["spatial_res_type"]; //integer
- $resultObj["spatial_res_value"] = $row["spatial_res_value"]; //char
- $resultObj["inspire_charset"] = $row["inspire_charset"]; //char
- $resultObj["lineage"] = $row["lineage"]; //text
- $resultObj["tmp_reference_1"] = $row["tmp_reference_1"]; //text
- $resultObj["tmp_reference_2"] = $row["tmp_reference_2"]; //text
- $export2csw = $row["export2csw"]; //boolean
- $resultObj["update_frequency"] = $row["update_frequency"]; //text
- switch ($export2csw) {
- case "t" :
- $resultObj["export2csw"] = true;
- break;
- case "f" :
- $resultObj["export2csw"] = false;
- break;
- default:
- break;
- }
- $inspire_top_consistence = $row["inspire_top_consistence"]; //boolean
- switch ($inspire_top_consistence) {
- case "t" :
- $resultObj["inspire_top_consistence"] = true;
- break;
- case "f" :
- $resultObj["inspire_top_consistence"] = false;
- break;
- default:
- break;
- }
-
- }
- $ajaxResponse->setResult($resultObj);
- $ajaxResponse->setSuccess(true);
- break;
-
case "getInitialFeaturetypeMetadata" :
$featuretypeId = $ajaxResponse->getParameter("featuretypeId");
$metadataId = $ajaxResponse->getParameter("metadataId");
$sql = <<<SQL
-
SELECT featuretype_title, featuretype_abstract from wfs_featuretype where featuretype_id = $1
-
SQL;
$v = array($featuretypeId);
$t = array('i');
@@ -462,41 +340,6 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-
- case "updateFeaturetypeMetadataAddon" :
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- $metadataId = $ajaxResponse->getParameter("metadataId");
- $data = $ajaxResponse->getParameter("data");
- if ($data->export2csw) {
- $data->export2csw = 't';
- } else {
- $data->export2csw = 'f';
- }
- if ($data->inspire_top_consistence) {
- $data->inspire_top_consistence = 't';
- } else {
- $data->inspire_top_consistence = 'f';
- }
- $sql = <<<SQL
-
-UPDATE mb_metadata SET link = $2, title = $3, abstract = $4, format = $5, ref_system = $6, export2csw = $7, inspire_top_consistence = $8, tmp_reference_1 = $9, tmp_reference_2 = $10, lineage = $11, spatial_res_type = $12, spatial_res_value = $13, inspire_charset = $14, changedate = now(), update_frequency = $15 WHERE metadata_id = $1
-
-SQL;
- $v = array($metadataId, $data->link, $data->title, $data->abstract, $data->format, $data->ref_system, $data->export2csw, $data->inspire_top_consistence, $data->tmp_reference_1, $data->tmp_reference_2, $data->lineage, $data->spatial_res_type, $data->spatial_res_value, $data->inspire_charset, $data->update_frequency);
- $t = array('i','s','s','s','s','s','b','b','s','s','s','s','s','s','s');
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $e){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not update metadata object in database!"));
- $ajaxResponse->send();
- die;
- }
- $ajaxResponse->setMessage("Metadata updated!");
- $ajaxResponse->setSuccess(true);
- break;
-
case "getOwnedMetadata" :
$featuretypeId = $ajaxResponse->getParameter("featuretypeId");
@@ -532,315 +375,8 @@
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
break;
-
- case "insertFeaturetypeMetadataAddon" :
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- $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
- //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
- if ($data->kindOfMetadataAddOn == 'internallink') {
- //insert a simple relation to an internal metadata entry - but how can this be distinguished?
- //we need a new column with type of relation - maybe called internal
-
- $sql = <<<SQL
-
-INSERT INTO ows_relation_metadata (fkey_metadata_id, fkey_featuretype_id, internal, relation_type) VALUES ( $1, $2, $3, 'internal')
-
-SQL;
- $v = array($data->internal_relation,$featuretypeId, 1);
- $t = array('i','i','i');
- $res = db_prep_query($sql,$v,$t);
- if (!$res){
- abort(_mb("Could not insert internal metadatalink into database!"));
- }
- $ajaxResponse->setMessage("Metadatalink inserted!");
- $ajaxResponse->setSuccess(true);
- break;
- }
- if ($data->kindOfMetadataAddOn == 'link') {
- //generate metador entry
- $origin = 'external';
- } else {
- $origin = 'metador';
- }
- //export
- if ($data->export2csw == "on") {
- $data->export2csw = 't';
- } else {
- $data->export2csw = 'f';
- }
- //consistance
- if ($data->inspire_top_consistence == "on") {
- $data->inspire_top_consistence = 't';
- } else {
- $data->inspire_top_consistence = 'f';
- }
- //generate a uuid for the record:
- $uuid = new Uuid();
- //initialize database objects
- //are initialized from class_iso19139
- $mbMetadata = new Iso19139();
- $randomid = new Uuid();
- //read out json objects
- if (isset($data->link)) {
- $mbMetadata->href = $data->link;
- }
- if (isset($data->export2csw)) {
- $mbMetadata->export2Csw = $data->export2csw;
- } else {
- $mbMetadata->export2Csw = 'f';
- }
- if (isset($data->title)) {
- $mbMetadata->title = $data->title;
- }
- if (isset($data->abstract)) {
- $mbMetadata->abstract = $data->abstract;
- }
- if (isset($data->format)) {
- $mbMetadata->dataFormat = $data->format;
- }
- if (isset($data->ref_system)) {
- $mbMetadata->refSystem = $data->ref_system;
- }
- if (isset($data->inspire_top_consistence)) {
- $mbMetadata->inspireTopConsistence = $data->inspire_top_consistence;
- }
- if (isset($data->tmp_reference_1)) {
- $mbMetadata->tmpExtentBegin = $data->tmp_reference_1;
- }
- if (isset($data->tmp_reference_2)) {
- $mbMetadata->tmpExtentEnd = $data->tmp_reference_2;
- }
- if (isset($data->lineage)) {
- $mbMetadata->lineage = $data->lineage;
- }
- if (isset($data->spatial_res_type)) {
- $mbMetadata->spatialResType = $data->spatial_res_type;
- }
- if (isset($data->spatial_res_value)) {
- $mbMetadata->spatialResValue = $data->spatial_res_value;
- }
- if (isset($data->inspire_charset)) {
- $mbMetadata->inspireCharset = $data->inspire_charset;
- }
- if (isset($data->update_frequency)) {
- $mbMetadata->updateFrequency = $data->update_frequency;
- }
-
- //Check if origin is external and export2csw is activated!
- if ($origin == 'external' ) {
- //harvest link from location, parse the content for datasetid and push xml into data column
- $mdOwner = Mapbender::session()->get("mb_user_id");
- $mbMetadata->randomId = $randomid;
- $mbMetadata->format = "text/xml";
- $mbMetadata->type = "ISO19115:2003";
- $mbMetadata->origin = "external";
- $mbMetadata->owner = $mdOwner;
-
- $result = $mbMetadata->insertToDB("featuretype",$featuretypeId);
-
- if ($result['value'] == false){
- $e = new mb_exception("Problem while storing metadata to mb_metadata table!");
- $e = new mb_exception($result['message']);
- abort($result['message']);
- } else {
- $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
- $mbMetadata->origin = "metador";
- $mbMetadata->fileIdentifier = $uuid;
- $mbMetadata->randomId = $randomid;
-
- $result = $mbMetadata->insertToDB("featuretype",$featuretypeId);
-
- if ($result['value'] == false) {
- $e = new mb_exception("Problem while storing metadata from editor to mb_metadata table!");
- $e = new mb_exception($result['message']);
- abort($result['message']);
- } else {
- $e = new mb_notice("Metadata with id ".$randomid." stored from editor to db!");
- $ajaxResponse->setMessage("Metadata object from editor inserted into md_metadata!");
- $ajaxResponse->setSuccess(true);
- }
- }
- break;
-
- case "deleteInternalMetadataLinkage" :
- $metadataId = $ajaxResponse->getParameter("metadataId");
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- $sql = <<<SQL
-
-DELETE FROM ows_relation_metadata WHERE fkey_metadata_id = $1 and fkey_featuretype_id = $2 and relation_type = 'internal'
-
-SQL;
- $v = array($metadataId, $featuretypeId);
- $t = array('i','i');
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $e){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not delete internal metadata linkage from database!"));
- $ajaxResponse->send();
- die;
- }
- $ajaxResponse->setMessage("Internal metadata linkage deleted!");
- $ajaxResponse->setSuccess(true);
-
- break;
- case "deleteFeaturetypeMetadataAddon" :
- $metadataId = $ajaxResponse->getParameter("metadataId");
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- //TODO delete the entry only, if the metadataset has no other relation!!!!!
- //get count of relations for the relevant metadata set
- $sql = "SELECT count(*) as count FROM ows_relation_metadata WHERE fkey_metadata_id = $1";
-
- $v = array($metadataId);
- $t = array('i');
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $e){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not determine a count of metadata relations!"));
- $ajaxResponse->send();
- die;
- }
- while ($row = db_fetch_assoc($res)) {
- $countMetadataLinkage = (integer)$row['count']; //integer
- }
- if ($countMetadataLinkage == 1) {
- $e = new mb_exception("Metadata has only one reference and will be deleted from database if it was created by upload or link!");
- //delete the metadata itself cause it has no other reference - really - not right for metador files !!!
- $sql = <<<SQL
-
-DELETE FROM mb_metadata WHERE metadata_id = $1 and origin NOT IN ('metador')
-
-SQL;
- $v = array($metadataId);
- $t = array('i');
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $e){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not delete metadata from database!"));
- $ajaxResponse->send();
- die;
- }
- //delete link if metadata was not deleted cause it has been created by editor!
- $sql = <<<SQL
-
-DELETE FROM ows_relation_metadata WHERE fkey_metadata_id = $1 and fkey_featuretype_id = $2
-
-SQL;
- $v = array($metadataId, $featuretypeId);
- $t = array('i','i');
-
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $E){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not delete internal metadata linkage from database!"));
- $ajaxResponse->send();
- die;
- }
- $ajaxResponse->setMessage("Metadata and/or linkage was deleted from database!");
- $ajaxResponse->setSuccess(true);
- break;
-
-
-
- } else {
- //only delete the relation
- $sql = <<<SQL
-
-DELETE FROM ows_relation_metadata WHERE fkey_metadata_id = $1 and fkey_featuretype_id = $2
-
-SQL;
- $v = array($metadataId, $featuretypeId);
- $t = array('i','i');
- //$e = new mb_exception("metadataid:".$metadataId." - layerid: ".$layerId);
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $E){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not delete metadata linkage from database!"));
- $ajaxResponse->send();
- die;
- }
- $ajaxResponse->setMessage("Metadata linkage deleted!");
- $ajaxResponse->setSuccess(true);
- }
- break;
- /*case "deleteFeaturetypeMetadataAddon" :
- $metadataId = $ajaxResponse->getParameter("metadataId");
- $sql = <<<SQL
-
-DELETE FROM mb_metadata WHERE metadata_id = $1
-
-SQL;
- $v = array($metadataId);
- $t = array('i');
- try {
- $res = db_prep_query($sql,$v,$t);
- }
- catch (Exception $e){
- $ajaxResponse->setSuccess(false);
- $ajaxResponse->setMessage(_mb("Could not delete metadata from database!"));
- $ajaxResponse->send();
- die;
- }
- $ajaxResponse->setMessage("Metadata deleted!");
- $ajaxResponse->setSuccess(true);
- break;*/
- case "importFeaturetypeXmlAddon" :
- //this case is similar to insert the metadata from external link, but came from internal file from tmp folder which has been uploaded before
- $featuretypeId = $ajaxResponse->getParameter("featuretypeId");
- $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
- //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();
- $e = new mb_notice("File to load: ".$filename);
- $metaData = file_get_contents($filename);
- if (!$metaData){
- abort(_mb("Reading file ".$filename." failed!"));
- }
- $mbMetadata = new Iso19139();
- $mdOwner = Mapbender::session()->get("mb_user_id");
- $mbMetadata->randomId = $randomid;
- $mbMetadata->metadata = $metaData;
- $mbMetadata->format = "text/xml";
- $mbMetadata->type = "ISO19115:2003";
- $mbMetadata->origin = "upload";
- $mbMetadata->owner = $mdOwner;
-
- $result = $mbMetadata->insertToDB("featuretype",$featuretypeId);
-
- if ($result['value'] == false){
- $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;
-
case "save":
$data = $ajaxResponse->getParameter("data");
-
try {
$wfsId = intval($data->wfs->wfs_id);
}
@@ -948,7 +484,6 @@
//extract relevant information from json and fill them into the wfs object
foreach ($columns as $c) {
-
if ($c === "summary") {
$value = $data->featuretype->featuretype_abstract;
}
@@ -998,72 +533,14 @@
if($wfs->wfs_max_features == "") {
$wfs->wfs_max_features = intval('1000');
}
-
$wfs->update($wfsId, true); //parameter for metadata only update - some things are not pulled when creating object from database and some things need not to be updated.
-
$ajaxResponse->setMessage("Updated WFS metadata for ID " . $wfsId);
$ajaxResponse->setSuccess(true);
-
break;
-
- case "getContactMetadata" :
- $mbGroupId = $ajaxResponse->getParameter("id");
- $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;
- $v = array($mbGroupId);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $row = array();
- if ($res) {
- $row = db_fetch_assoc($res);
- $resultObj["fkey_mb_group_id"] = $mbGroupId;
- $resultObj["mb_group_name"] = $row["mb_group_name"];
- $resultObj["mb_group_title"] = $row["mb_group_title"];
- $resultObj["mb_group_address"] = $row["mb_group_address"];
- $resultObj["mb_group_email"] = $row["mb_group_email"];
- $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"];
- }
- $ajaxResponse->setResult($resultObj);
- $ajaxResponse->setSuccess(true);
- break;
-
- case "getLicenceInformation" :
- $termsofuseId = $ajaxResponse->getParameter("id");
- $sql = <<<SQL
-
-SELECT name, symbollink, description, descriptionlink, isopen FROM termsofuse WHERE termsofuse_id = $1
-
-SQL;
- $v = array($termsofuseId);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $row = array();
- if ($res) {
- $row = db_fetch_assoc($res);
- $resultObj["termsofuse_id"] = $termsofuseId;
- $resultObj["name"] = $row["name"];
- $resultObj["symbollink"] = $row["symbollink"];
- $resultObj["description"] = $row["description"];
- $resultObj["descriptionlink"] = $row["descriptionlink"];
- $resultObj["isopen"] = $row["isopen"];
- $ajaxResponse->setResult($resultObj);
- $ajaxResponse->setSuccess(true);
- } else {
- $ajaxResponse->setSuccess(false);
- }
- break;
-
default:
$ajaxResponse->setSuccess(false);
$ajaxResponse->setMessage(_mb("An unknown error occured."));
break;
}
-
$ajaxResponse->send();
?>
Modified: trunk/mapbender/http/plugins/mb_metadata_xml_import.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_xml_import.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_xml_import.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -16,10 +16,11 @@
var importUploadedFile = function(filename, layerId, callback){
var req = new Mapbender.Ajax.Request({
url: "../plugins/mb_metadata_server.php",
- method: "importLayerXmlAddon",
+ method: "importXmlAddon",
parameters: {
filename: filename,
- layerId: layerId
+ "resourceId": layerId,
+ "resourceType": "layer"
},
callback: function (obj, result, message, errorCode) {
if (!result) {
Modified: trunk/mapbender/http/plugins/mb_metadata_xml_import_wfs.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_xml_import_wfs.js 2013-05-26 12:18:54 UTC (rev 8629)
+++ trunk/mapbender/http/plugins/mb_metadata_xml_import_wfs.js 2013-05-26 19:11:40 UTC (rev 8630)
@@ -15,11 +15,12 @@
var importUploadedFile = function(filename, featuretypeId, callback){
var req = new Mapbender.Ajax.Request({
- url: "../plugins/mb_metadata_wfs_server.php",
- method: "importFeaturetypeXmlAddon",
+ url: "../plugins/mb_metadata_server.php",
+ method: "importXmlAddon",
parameters: {
filename: filename,
- featuretypeId: featuretypeId
+ "resourceType": "featuretype",
+ "resourceId": featuretypeId
},
callback: function (obj, result, message, errorCode) {
if (!result) {
More information about the Mapbender_commits
mailing list