Module: nagvis Branch: master Commit: 21154306616113bfac8ff0e8b969e454306dc0ff URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=21154306616113bfac8ff0e8b969e454306dc0ff
Author: Lars Michelsen <[email protected]> Date: Fri Apr 23 20:17:33 2010 +0200 Map configuration errors are now ignored when deleting map objects --- share/server/core/classes/CoreModMap.php | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/share/server/core/classes/CoreModMap.php b/share/server/core/classes/CoreModMap.php index 85e58e8..3b40b50 100644 --- a/share/server/core/classes/CoreModMap.php +++ b/share/server/core/classes/CoreModMap.php @@ -555,12 +555,16 @@ class CoreModMap extends CoreModule { private function doDeleteObject($a) { // initialize map and read map config $MAPCFG = new WuiMapCfg($this->CORE, $a['map']); - $MAPCFG->readMapConfig(); + // Ignore map configurations with errors in it. + // the problems may get resolved by deleting the object + try { + $MAPCFG->readMapConfig(); + } catch(MapCfgInvalid $e) {} // first delete element from array - $MAPCFG->deleteElement($a['type'],$a['id']); + $MAPCFG->deleteElement($a['type'], $a['id']); // then write new array to file - $MAPCFG->writeElement($a['type'],$a['id']); + $MAPCFG->writeElement($a['type'], $a['id']); // delete map lock if(!$MAPCFG->deleteMapLock()) { ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
