From 0867ec925cd68f55404c3ef6fbc84655ef83cd1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sat, 6 Sep 2008 11:54:56 +0000 Subject: [PATCH] * depricate in favour of so our syntax is more persistant. --- webcit/static/t/display_aide_menu.html | 6 +- webcit/static/t/display_main_menu.html | 6 +- webcit/static/t/display_serverrestart.html | 4 +- .../static/t/display_serverrestartpage.html | 6 +- .../static/t/display_serverrestartpagedo.html | 4 +- webcit/static/t/login.html | 4 +- webcit/static/t/openid_login.html | 4 +- webcit/static/t/openid_manual_create.html | 4 +- webcit/static/t/who.html | 6 +- webcit/static/t/whosimplesection.html | 2 +- webcit/subst.c | 60 +++++++++++-------- 11 files changed, 59 insertions(+), 47 deletions(-) diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/display_aide_menu.html index 09386b4c2..dd4b7c045 100644 --- a/webcit/static/t/display_aide_menu.html +++ b/webcit/static/t/display_aide_menu.html @@ -1,5 +1,5 @@ - - + + - + diff --git a/webcit/static/t/display_main_menu.html b/webcit/static/t/display_main_menu.html index 4cac1cd90..dc6d1e0bb 100644 --- a/webcit/static/t/display_main_menu.html +++ b/webcit/static/t/display_main_menu.html @@ -1,5 +1,5 @@ - - + +
@@ -16,4 +16,4 @@
- + diff --git a/webcit/static/t/display_serverrestart.html b/webcit/static/t/display_serverrestart.html index e534ddffe..5f9f240d9 100644 --- a/webcit/static/t/display_serverrestart.html +++ b/webcit/static/t/display_serverrestart.html @@ -22,11 +22,11 @@
- +
- + diff --git a/webcit/static/t/display_serverrestartpage.html b/webcit/static/t/display_serverrestartpage.html index 26bf8d980..c83a4cd6b 100644 --- a/webcit/static/t/display_serverrestartpage.html +++ b/webcit/static/t/display_serverrestartpage.html @@ -1,6 +1,6 @@ - - + +
- + diff --git a/webcit/static/t/display_serverrestartpagedo.html b/webcit/static/t/display_serverrestartpagedo.html index a5c03ea11..ac1bedd61 100644 --- a/webcit/static/t/display_serverrestartpagedo.html +++ b/webcit/static/t/display_serverrestartpagedo.html @@ -22,11 +22,11 @@
- +
- + diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html index 2307562ff..495e4919e 100644 --- a/webcit/static/t/login.html +++ b/webcit/static/t/login.html @@ -1,4 +1,4 @@ - +
@@ -20,4 +20,4 @@ - + diff --git a/webcit/static/t/openid_login.html b/webcit/static/t/openid_login.html index 9c0f81155..f43bfd631 100644 --- a/webcit/static/t/openid_login.html +++ b/webcit/static/t/openid_login.html @@ -1,4 +1,4 @@ - + @@ -15,4 +15,4 @@ - + diff --git a/webcit/static/t/openid_manual_create.html b/webcit/static/t/openid_manual_create.html index 7b4807de0..170b80a0c 100644 --- a/webcit/static/t/openid_manual_create.html +++ b/webcit/static/t/openid_manual_create.html @@ -1,4 +1,4 @@ - +
- + diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html index 98c168989..08a1b7b20 100644 --- a/webcit/static/t/who.html +++ b/webcit/static/t/who.html @@ -1,5 +1,5 @@ - - + + - + diff --git a/webcit/static/t/whosimplesection.html b/webcit/static/t/whosimplesection.html index dee4e3e19..4ac61b109 100644 --- a/webcit/static/t/whosimplesection.html +++ b/webcit/static/t/whosimplesection.html @@ -1 +1 @@ -
  • activeuserinactiveuser">">
    • +
  • activeuserinactiveuser">
    • diff --git a/webcit/subst.c b/webcit/subst.c index 6f4efa91e..36630a89c 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -36,6 +36,7 @@ int LoadTemplates = 0; #define SV_GETTEXT 1 #define SV_CONDITIONAL 2 #define SV_NEG_CONDITIONAL 3 +#define SV_SUBTEMPL 4 typedef struct _WCTemplate { StrBuf *Data; @@ -434,6 +435,7 @@ void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) { void *vVar; /*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/ + /// TODO: debricated! if (keyname[0] == '=') { DoTemplate(keyname+1, keylen - 1, NULL, NULL); } @@ -548,7 +550,7 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe) } else { Parm->lvalue = 0; - lprintf(1, "Error evaluating template long param [%s]", *pCh); + lprintf(1, "Error evaluating template long param [%s]\n", *pCh); free(Parm); return NULL; } @@ -611,6 +613,9 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf, if ((NewToken->nParameters == 1) && (*(NewToken->pName) == '_')) NewToken->Flags = SV_GETTEXT; + else if ((NewToken->nParameters == 1) && + (*(NewToken->pName) == '=')) + NewToken->Flags = SV_SUBTEMPL; else if ((NewToken->nParameters >= 2) && (*(NewToken->pName) == '?')) NewToken->Flags = SV_CONDITIONAL; @@ -693,36 +698,43 @@ int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, void *Context, int sta void *vVar; // much output, since pName is not terminated... // lprintf(1,"Doing token: %s\n",Token->pName); - if (Token->Flags == SV_GETTEXT) { + switch (Token->Flags) { + case SV_GETTEXT: TmplGettext(Target, Token->nParameters, Token); - } - else if (Token->Flags == SV_CONDITIONAL) { + break; + case SV_CONDITIONAL: return EvaluateConditional(Token, Context, 1, state); - } - else if (Token->Flags == SV_NEG_CONDITIONAL) { + break; + case SV_NEG_CONDITIONAL: return EvaluateConditional(Token, Context, 0, state); - } - else if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) { - HashHandler *Handler; - Handler = (HashHandler*) vVar; - if ((Token->nParameters < Handler->nMinArgs) || - (Token->nParameters > Handler->nMaxArgs)) { - lprintf(1, "Handler [%s] doesn't work with %ld params", - Token->pName, - Token->nParameters); + break; + case SV_SUBTEMPL: + if (Token->nParameters == 1) + DoTemplate(Token->Params[0]->Start, Token->Params[0]->len, NULL, NULL); + break; + default: + if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) { + HashHandler *Handler; + Handler = (HashHandler*) vVar; + if ((Token->nParameters < Handler->nMinArgs) || + (Token->nParameters > Handler->nMaxArgs)) { + lprintf(1, "Handler [%s] doesn't work with %ld params", + Token->pName, + Token->nParameters); + } + else { + Handler->HandlerFunc(Target, + Token->nParameters, + Token, + Context); /*TODO: subset of that */ + + + } } else { - Handler->HandlerFunc(Target, - Token->nParameters, - Token, - Context); /*TODO: subset of that */ - - + print_value_of(Target, Token->pName, Token->NameEnd); } } - else { - print_value_of(Target, Token->pName, Token->NameEnd); - } return 0; } -- 2.30.2