retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Support for replacing in ${param-name$default-value} style. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2857 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2009-09-25 13:13:58 +00:00
parent 14b4e4a755
commit 5b6d399446
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/NamedList.cpp
View File

@ -295,10 +295,17 @@ int NamedList::replaceParams(String& str, bool sqlEsc, char extraEsc) const
while ((p1 = str.find("${",p1)) >= 0) {
int p2 = str.find('}',p1+2);
if (p2 > 0) {
String def;
String tmp = str.substr(p1+2,p2-p1-2);
tmp.trimBlanks();
int pq = tmp.find('$');
if (pq >= 0) {
// param is in ${<name>$<default>} format
def = tmp.substr(pq+1).trimBlanks();
tmp = tmp.substr(0,pq).trimBlanks();
}
DDebug(DebugAll,"NamedList replacing parameter '%s' [%p]",tmp.c_str(),this);
const NamedString* ns = getParam(tmp);
const String* ns = getParam(tmp);
if (ns) {
if (sqlEsc) {
const DataBlock* data = 0;
@ -316,7 +323,7 @@ int NamedList::replaceParams(String& str, bool sqlEsc, char extraEsc) const
tmp = *ns;
}
else
tmp.clear();
tmp = def;
str = str.substr(0,p1) + tmp + str.substr(p2+1);
// advance search offset past the string we just replaced
p1 += tmp.length();