Module: nagvis Branch: master Commit: a38a30aca31c10e8def62fe3977a8ad34db75776 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=a38a30aca31c10e8def62fe3977a8ad34db75776
Author: Lars Michelsen <[email protected]> Date: Wed Apr 14 21:44:06 2010 +0200 #250 fixed the automap layer limitation --- share/server/core/classes/NagVisAutoMap.php | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/share/server/core/classes/NagVisAutoMap.php b/share/server/core/classes/NagVisAutoMap.php index 45c0e38..fedb793 100644 --- a/share/server/core/classes/NagVisAutoMap.php +++ b/share/server/core/classes/NagVisAutoMap.php @@ -218,8 +218,11 @@ class NagVisAutoMap extends GlobalMap { // state of the objects $this->MAPOBJ = new NagVisMapObj($this->CORE, $this->BACKEND, $this->MAPCFG, $bIsView); $this->MAPOBJ->objectTreeToMapObjects($this->rootObject); - $this->MAPOBJ->fetchState(); + $this->MAPOBJ->queueState(GET_STATE, GET_SINGLE_MEMBER_STATES); + $this->BACKEND->execute(); + $this->MAPOBJ->applyState(); + if($this->filterByState != '') { $this->filterChildObjectTreeByState(); @@ -553,12 +556,13 @@ class NagVisAutoMap extends GlobalMap { // Loop all map object foreach(array_merge(Array($this->rootObject), $this->arrMapObjects) AS $OBJ) { + $name = $OBJ->getName(); // Try to find a matching object in the map configuration - if(isset($aConf[$OBJ->getName()])) { - unset($aConf[$OBJ->getName()]['type']); - unset($aConf[$OBJ->getName()]['object_id']); - unset($aConf[$OBJ->getName()]['host_name']); - $OBJ->setConfiguration($aConf[$OBJ->getName()]); + if(isset($aConf[$name])) { + unset($aConf[$name]['type']); + unset($aConf[$name]['object_id']); + unset($aConf[$name]['host_name']); + $OBJ->setConfiguration($aConf[$name]); } } } ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
