From a0747551ca1905349310b83f27b9b1b3ac920463 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 29 Oct 2006 13:43:07 +0000
Subject: * added transparent mechanism for generating placeholders  
 (@@@...@@@) and adjusted handling of @@@server_ip@@@ to   make use of it.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@484 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/OpenSLX/ConfigDB.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'config-db/OpenSLX/ConfigDB.pm')

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index 45c414e5..9d1b266e 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -65,7 +65,7 @@ my @aggregationExports = qw(
 my @supportExports = qw(
 	isAttribute mergeAttributes
 	externalIDForSystem externalIDForClient
-	externalAttrName
+	externalAttrName generatePlaceholderFor
 );
 
 @EXPORT = @accessExports;
@@ -867,7 +867,7 @@ sub aggregatedSystemFileInfosOfSystem
 	if ($exportURI !~ m[\w]) {
 		# auto-generate export_uri if none has been given:
 		my $type = $system->{'export_type'};
-		my $serverIpToken = '@@@server_ip@@@';
+		my $serverIpToken = generatePlaceholderFor('serverip');
 		$exportURI
 			= "$type://$serverIpToken$openslxConfig{'export-path'}/$type/$vendorOS->{path}";
 	}
@@ -946,4 +946,10 @@ sub externalAttrName
 	return substr($attr, 5);
 }
 
+sub generatePlaceholderFor
+{
+	my $varName = shift;
+	return '@@@'.$varName.'@@@';
+}
+
 1;
-- 
cgit v1.2.3-55-g7522