frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 15:58:31 +00:00
Code Issues Releases Wiki Activity

fixed bug in parsing printf text tokens

Browse Source
This commit is contained in:
louis
2015-06-13 15:05:07 +02:00
parent ffca82a883
commit 745fa9e985
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@@ -367,3 +367,4 @@ Version 0.5.2
to displaymenurecordings listelement to displaymenurecordings listelement
- allow currentelements to use conditions - allow currentelements to use conditions
- fixed bug searching channel logos with channelid - fixed bug searching channel logos with channelid
- fixed bug in parsing printf text tokens

20
libtemplate/templatefunction.c
View File

@@ -991,14 +991,13 @@ void cTemplateFunction::ParseTextToken(string &value, size_t start, size_t end)
value = value.replace(0, start, ""); value = value.replace(0, start, "");
token.type = ttConstString; token.type = ttConstString;
token.value = constString; token.value = constString;
textTokens.push_back(token);
} else { } else {
string tokenName = value.substr(1, end - start - 1); string tokenName = value.substr(1, end - start - 1);
value = value.replace(0, end - start + 1, ""); value = value.replace(0, end - start + 1, "");
token.type = ttToken; token.type = ttToken;
token.value = tokenName; token.value = tokenName;
textTokens.push_back(token);
} }
textTokens.push_back(token);
} }
void cTemplateFunction::ParseConditionalTextToken(string &value, size_t start, size_t end) { void cTemplateFunction::ParseConditionalTextToken(string &value, size_t start, size_t end) {
@@ -1008,7 +1007,6 @@ void cTemplateFunction::ParseConditionalTextToken(string &value, size_t start, s
value = value.replace(0, start, ""); value = value.replace(0, start, "");
token.type = ttConstString; token.type = ttConstString;
token.value = constString; token.value = constString;
textTokens.push_back(token);
} else { } else {
string condToken = value.substr(start + 1, end - start - 1); string condToken = value.substr(start + 1, end - start - 1);
value = value.replace(0, end - start + 1, ""); value = value.replace(0, end - start + 1, "");
@@ -1041,9 +1039,8 @@ void cTemplateFunction::ParseConditionalTextToken(string &value, size_t start, s
token.type = ttConditionalToken; token.type = ttConditionalToken;
token.value = tokenName; token.value = tokenName;
token.subTokens = subTokens; token.subTokens = subTokens;
textTokens.push_back(token);
} }
textTokens.push_back(token);
} }
void cTemplateFunction::ParsePrintfTextToken(string &value, size_t start, size_t end) { void cTemplateFunction::ParsePrintfTextToken(string &value, size_t start, size_t end) {
@@ -1053,7 +1050,6 @@ void cTemplateFunction::ParsePrintfTextToken(string &value, size_t start, size_t
value = value.replace(0, start, ""); value = value.replace(0, start, "");
token.type = ttConstString; token.type = ttConstString;
token.value = constString; token.value = constString;
textTokens.push_back(token);
} else { } else {
token.type = ttPrintfToken; token.type = ttPrintfToken;
//fetch parameter list from printf //fetch parameter list from printf
@@ -1814,14 +1810,14 @@ void cTemplateFunction::Debug(void) {
eTextTokenType tokenType = (*it).type; eTextTokenType tokenType = (*it).type;
string tokType = ""; string tokType = "";
if (tokenType == ttConstString) if (tokenType == ttConstString)
tokType = "Const: "; tokType = "Const";
else if (tokenType == ttToken) else if (tokenType == ttToken)
tokType = "Token: "; tokType = "Token";
else if (tokenType == ttConditionalToken) else if (tokenType == ttConditionalToken)
tokType = "Conditional Token: "; tokType = "Conditional Token";
else if (tokenType == ttPrintfToken) else if (tokenType == ttPrintfToken)
tokType = "PrintF Token: "; tokType = "PrintF Token";
esyslog("skindesigner: %s %d = \"%s\"", tokType.c_str(), i++, (*it).value.c_str()); esyslog("skindesigner: Token %d Type %s : \"%s\"", i++, tokType.c_str(), (*it).value.c_str());
if (tokenType == ttConditionalToken) { if (tokenType == ttConditionalToken) {
for (vector<cTextToken>::iterator it2 = (*it).subTokens.begin(); it2 != (*it).subTokens.end(); it2++) { for (vector<cTextToken>::iterator it2 = (*it).subTokens.begin(); it2 != (*it).subTokens.end(); it2++) {
eTextTokenType tokenTypeCond = (*it2).type; eTextTokenType tokenTypeCond = (*it2).type;
@@ -1835,7 +1831,7 @@ void cTemplateFunction::Debug(void) {
} }
if (tokenType == ttPrintfToken) { if (tokenType == ttPrintfToken) {
for (vector<string>::iterator it2 = (*it).parameters.begin(); it2 != (*it).parameters.end(); it2++) { for (vector<string>::iterator it2 = (*it).parameters.begin(); it2 != (*it).parameters.end(); it2++) {
esyslog("skindesigner: Printf parameter: %s", (*it2).c_str()); esyslog("skindesigner: PrintF parameter: %s", (*it2).c_str());
} }
} }
} }