From fde7d8f091d03b8d2c0c14e3f56eab700082beba Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 27 Jan 2008 14:51:47 +0000
Subject: Hopefully finished the adjustments of the tools with respect to theme
 naming and other recent discussions of user interface. * adjusted and
 simplified code to the fact that plugins are now named   in all lowercase *
 slxos-plugin --verbose list now shows description for each plugin and   a
 list of supported attributes * fixed some outstanding issues with respect to
 lowercasing of plugin names * Separated theme::name into theme::splash,
 theme::displaymanager and   theme::desktop, leading to DB-schema 0.24.  
 Please note that although these attributes exist, currently only  
 theme::splash is being used (the new ones will be used by the reimplemented  
 mkdxsinitrd) * moved some information gathering from OSPlugin::Engine into
 OSPlugin::Roster,   where it belongs

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1500 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/slxconfig | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'config-db/slxconfig')

diff --git a/config-db/slxconfig b/config-db/slxconfig
index da4e31f1..a357bc4a 100755
--- a/config-db/slxconfig
+++ b/config-db/slxconfig
@@ -93,7 +93,9 @@ elsif ($action =~ m[^change-c]i) {
 	changeClientInConfigDB(@ARGV);
 }
 elsif ($action =~ m[^list-a]) {
-	print _tr("List of known attributes:\n");
+	print @ARGV 
+		? _tr("List of known attributes for scope '%s':\n", $ARGV[0])
+		: _tr("List of known attributes:\n");
 	listAttributes(@ARGV);
 }
 elsif ($action =~ m[^list-c]) {
@@ -352,6 +354,7 @@ sub listAttributes
 		map {
 			my $attr = dclone($attrInfo->{$_});
 			$attr->{name} = $_;
+			delete $attr->{content_regex};	# no use for display purposes
 			$attr;
 		}
 		sort keys %$attrInfo
@@ -516,8 +519,7 @@ sub listSystems
 				);
 				my $mergedAttrs = $mergedSystem->{attrs} || {};
 				foreach my $plugin (@installedPlugins) {
-					my $pluginScope = lc($plugin);
-					next if !$mergedAttrs->{"${pluginScope}::active"};
+					next if !$mergedAttrs->{"${plugin}::active"};
 					push @activePlugins, $plugin;
 				}
 				if ($inherited) {
@@ -695,12 +697,11 @@ sub searchSystems
 				$openslxDB->mergeDefaultAttributesIntoSystem($mergedSystem);
 				my $mergedAttrs = $mergedSystem->{attrs} || {};
 				foreach my $plugin (@installedPlugins) {
-					my $pluginScope = lc($plugin);
-					next if !$mergedAttrs->{"${pluginScope}::active"};
+					next if !$mergedAttrs->{"${plugin}::active"};
 					my $precedence = sprintf(
-						"%02d", $mergedAttrs->{"${pluginScope}::precedence"}
+						"%02d", $mergedAttrs->{"${plugin}::precedence"}
 					);
-					push(@activePlugins, "$precedence...$plugin");
+					push(@activePlugins, $plugin);
 				}
 			}
 			$_->{PLUGINS} = [ sort @activePlugins ];
-- 
cgit v1.2.3-55-g7522