Module: nagvis Branch: master Commit: 9673e27adec447564d5dbbb11d806b6cb041c40f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=9673e27adec447564d5dbbb11d806b6cb041c40f
Author: Lars Michelsen <[email protected]> Date: Sun Dec 26 00:39:57 2010 +0100 Fixed automap after latest changes --- share/server/core/classes/CoreModAutoMap.php | 4 ---- share/server/core/classes/NagVisAutomapCfg.php | 11 +++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/share/server/core/classes/CoreModAutoMap.php b/share/server/core/classes/CoreModAutoMap.php index 94a9593..6971091 100644 --- a/share/server/core/classes/CoreModAutoMap.php +++ b/share/server/core/classes/CoreModAutoMap.php @@ -187,9 +187,6 @@ class CoreModAutoMap extends CoreModule { 'i' => MATCH_STRING_NO_SPACE); $aVals = $this->getCustomOptions($aOpts); - $sType = $aVals['ty']; - $arrObjId = $aVals['i']; - // Initialize backends $BACKEND = new CoreBackendMgmt($this->CORE); @@ -198,7 +195,6 @@ class CoreModAutoMap extends CoreModule { $MAPCFG->readMapConfig(); $MAPCFG->filterMapObjects($aVals['i']); - $MAP = new NagVisAutoMap($this->CORE, $MAPCFG, $BACKEND, $this->opts, IS_VIEW); $MAPOBJ = $MAP->MAPOBJ; return $MAP->parseObjectsJson($aVals['ty']); diff --git a/share/server/core/classes/NagVisAutomapCfg.php b/share/server/core/classes/NagVisAutomapCfg.php index 88e57d7..4803217 100644 --- a/share/server/core/classes/NagVisAutomapCfg.php +++ b/share/server/core/classes/NagVisAutomapCfg.php @@ -91,8 +91,15 @@ class NagVisAutomapCfg extends GlobalMapCfg { return $this->defaultConf; } - public function writeElement($id) { - echo 'Dummy element write'; + public function writeElement($id) { } + + public function filterMapObjects($a) { + if(isset($this->mapConfig[2])) { + $global = $this->mapConfig[0]; + $dummy = $this->mapConfig[1]; + parent::filterMapObjects($a); + $this->mapConfig = array_merge(Array($global, $dummy), $this->mapConfig); + } } } ?> ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
