X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=28afdebc850c96d350fd8684f0c31f9914794f66;hb=808f3be91dd6b6677e380695e2f16e6473141a7e;hp=05f03c6b925d0bf658915418d88a16ef26cbe57b;hpb=47bcaaabae789a2f20de958b84714ff2e23dc5bb;p=citadel.git
diff --git a/webcit/subst.c b/webcit/subst.c
index 05f03c6b9..28afdebc8 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -30,8 +30,10 @@ HashList *LocalTemplateCache;
HashList *GlobalNS;
HashList *Iterators;
HashList *Conditionals;
+HashList *SortHash;
int LoadTemplates = 0;
+WCTemplputParams NoCtx;
#define SV_GETTEXT 1
#define SV_CONDITIONAL 2
@@ -56,6 +58,72 @@ typedef struct _HashHandler {
}HashHandler;
void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere);
+int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP);
+
+typedef struct _SortStruct {
+ StrBuf *Name;
+ StrBuf *PrefPrepend;
+ CompareFunc Forward;
+ CompareFunc Reverse;
+ CompareFunc GroupChange;
+
+ long ContextType;
+}SortStruct;
+
+void DestroySortStruct(void *vSort)
+{
+ SortStruct *Sort = (SortStruct*) vSort;
+ FreeStrBuf(&Sort->Name);
+ FreeStrBuf(&Sort->PrefPrepend);
+ free (Sort);
+}
+
+void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplputParams *TP, const char *Format, ...)
+{
+ StrBuf *Error;
+ StrBuf *Info;
+ va_list arg_ptr;
+ const char *Err = NULL;
+
+ Info = NewStrBuf();
+ Error = NewStrBuf();
+
+ va_start(arg_ptr, Format);
+ StrBufVAppendPrintf(Error, Format, arg_ptr);
+ va_end(arg_ptr);
+
+ switch (ErrorPos) {
+ default:
+ case ERR_NAME: /* the main token name... */
+ Err = TP->Tokens->pName;
+ break;
+ case ERR_PARM1:
+ Err = TP->Tokens->Params[0]->Start;
+ break;
+ case ERR_PARM2:
+ Err = TP->Tokens->Params[1]->Start;
+ break;
+ }
+ lprintf(1, "%s [%s] (in '%s' line %ld); %s; [%s]\n",
+ Type,
+ Err,
+ ChrPtr(TP->Tokens->FileName),
+ TP->Tokens->Line,
+ ChrPtr(Error),
+ ChrPtr(TP->Tokens->FlatToken));
+ if (Target != NULL) {
+ StrBufAppendPrintf(
+ Target,
+ "\n%s [%s] (in '%s' line %ld); %s\n[%s]\n
\n",
+ Type,
+ Err,
+ ChrPtr(TP->Tokens->FileName),
+ TP->Tokens->Line,
+ ChrPtr(Error),
+ ChrPtr(TP->Tokens->FlatToken));
+ }
+}
+
void RegisterNS(const char *NSName,
long len,
@@ -137,7 +205,7 @@ void VarPrintEntry(const char *Key, void *vSubst, int odd)
/**
* \brief Clear out the list of substitution variables local to this session
*/
-void clear_substs(struct wcsession *wc) {
+void clear_substs(wcsession *wc) {
if (wc->vars != NULL) {
DeleteHash(&wc->vars);
@@ -219,7 +287,7 @@ void deletevar(void *data)
wcsubst *NewSubstVar(const char *keyname, int keylen, int type)
{
wcsubst* ptr;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
ptr = (wcsubst *) malloc(sizeof(wcsubst));
memset(ptr, 0, sizeof(wcsubst));
@@ -257,7 +325,7 @@ void SVPRINTF(char *keyname, int keytype, const char *format,...)
void *vPtr;
wcsubst *ptr = NULL;
size_t keylen;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
keylen = strlen(keyname);
/**
@@ -293,7 +361,7 @@ void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...)
va_list arg_ptr;
void *vPtr;
wcsubst *ptr = NULL;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
/**
* First look if we're doing a replacement of
@@ -327,7 +395,7 @@ void SVPut(char *keyname, size_t keylen, int keytype, char *Data)
{
void *vPtr;
wcsubst *ptr = NULL;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
/**
@@ -358,7 +426,7 @@ void SVPutLong(char *keyname, size_t keylen, long Data)
{
void *vPtr;
wcsubst *ptr = NULL;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
/**
@@ -387,7 +455,7 @@ void SVCallback(char *keyname, size_t keylen, WCHandlerFunc fcn_ptr)
{
wcsubst *ptr;
void *vPtr;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
/**
* First look if we're doing a replacement of
@@ -417,7 +485,7 @@ void SVPUTBuf(const char *keyname, int keylen, const StrBuf *Buf, int ref)
{
wcsubst *ptr;
void *vPtr;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
/**
* First look if we're doing a replacement of
@@ -463,92 +531,47 @@ void pvo_do_cmd(StrBuf *Target, StrBuf *servcmd) {
}
}
-
-/**
- * \brief puts string into the template and computes which escape methon we should use
- * \param Source the string we should put into the template
- * \param FormatTypeIndex where should we look for escape types if?
- */
-void StrBufAppendTemplate(StrBuf *Target,
- int nArgs,
- WCTemplateToken *Tokens,
- void *Context, int ContextType,
- const StrBuf *Source, int FormatTypeIndex)
-{
- struct wcsession *WCC;
- StrBuf *Buf;
- char EscapeAs = ' ';
-
- if ((FormatTypeIndex < Tokens->nParameters) &&
- (Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
- (Tokens->Params[FormatTypeIndex]->len == 1)) {
- EscapeAs = *Tokens->Params[FormatTypeIndex]->Start;
- }
-
- switch(EscapeAs)
- {
- case 'H':
- WCC = WC;
- Buf = NewStrBufPlain(NULL, StrLength(Buf));
- StrBuf_RFC822_to_Utf8(Buf,
- Source,
- (WCC!=NULL)? WCC->DefaultCharset : NULL,
- NULL);
- StrEscAppend(Target, Buf, NULL, 0, 0);
- FreeStrBuf(&Buf);
- break;
- case 'X':
- StrEscAppend(Target, Source, NULL, 0, 0);
- break;
- default:
- StrBufAppendBuf(Target, Source, 0);
- }
-}
-
-
-void GetTemplateTokenString(WCTemplateToken *Tokens,
- int N,
+void GetTemplateTokenString(WCTemplputParams *TP,
+ int N,
const char **Value,
long *len)
{
StrBuf *Buf;
- if (Tokens->nParameters < N) {
+ if (TP->Tokens->nParameters < N) {
+ lprintf(1, "invalid token. this shouldn't have come till here.\n");
+ wc_backtrace();
*Value = "";
*len = 0;
return;
}
- switch (Tokens->Params[N]->Type) {
+ switch (TP->Tokens->Params[N]->Type) {
case TYPE_STR:
- *Value = Tokens->Params[N]->Start;
- *len = Tokens->Params[N]->len;
+ *Value = TP->Tokens->Params[N]->Start;
+ *len = TP->Tokens->Params[N]->len;
break;
case TYPE_BSTR:
- Buf = (StrBuf*) SBstr(Tokens->Params[N]->Start,
- Tokens->Params[N]->len);
+ Buf = (StrBuf*) SBstr(TKEY(N));
*Value = ChrPtr(Buf);
*len = StrLength(Buf);
break;
case TYPE_PREFSTR:
- get_PREFERENCE(
- Tokens->Params[N]->Start,
- Tokens->Params[N]->len,
- &Buf);
+ get_PREFERENCE(TKEY(N), &Buf);
*Value = ChrPtr(Buf);
*len = StrLength(Buf);
break;
case TYPE_LONG:
case TYPE_PREFINT:
- break; ///todo: string to text?
+ break; /* todo: string to text? */
case TYPE_GETTEXT:
- *Value = _(Tokens->Params[N]->Start);
+ *Value = _(TP->Tokens->Params[N]->Start);
*len = strlen(*Value);
break;
default:
break;
-//todo log error
+/*/todo log error */
}
}
@@ -558,21 +581,22 @@ void GetTemplateTokenString(WCTemplateToken *Tokens,
* \brief Print the value of a variable
* \param keyname get a key to print
*/
-void print_value_of(StrBuf *Target, WCTemplateToken *Tokens, void *Context, int ContextType) {
- struct wcsession *WCC = WC;
+void print_value_of(StrBuf *Target, WCTemplputParams *TP)
+
+{
+ wcsession *WCC = WC;
wcsubst *ptr;
void *vVar;
/*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
- /// TODO: debricated!
- if (Tokens->pName[0] == '=') {
- DoTemplate(Tokens->pName+1, Tokens->NameEnd - 1, NULL, NULL, 0);
+ /* TODO: depricated! */
+ if (TP->Tokens->pName[0] == '=') {
+ DoTemplate(TP->Tokens->pName+1, TP->Tokens->NameEnd - 1, NULL, &NoCtx);
}
-
-//////TODO: if param[1] == "U" -> urlescape
-/// X -> escputs
+/*/////TODO: if param[1] == "U" -> urlescape
+/// X -> escputs */
/** Page-local variables */
- if ((WCC->vars!= NULL) && GetHash(WCC->vars, Tokens->pName, Tokens->NameEnd, &vVar)) {
+ if ((WCC->vars!= NULL) && GetHash(WCC->vars, TP->Tokens->pName, TP->Tokens->NameEnd, &vVar)) {
ptr = (wcsubst*) vVar;
switch(ptr->wcs_type) {
case WCS_STRING:
@@ -582,7 +606,7 @@ void print_value_of(StrBuf *Target, WCTemplateToken *Tokens, void *Context, int
pvo_do_cmd(Target, ptr->wcs_value);
break;
case WCS_FUNCTION:
- (*ptr->wcs_function) (Target, Tokens->nParameters, Tokens, Context, ContextType);
+ (*ptr->wcs_function) (Target, TP);
break;
case WCS_STRBUF:
case WCS_STRBUF_REF:
@@ -592,24 +616,22 @@ void print_value_of(StrBuf *Target, WCTemplateToken *Tokens, void *Context, int
StrBufAppendPrintf(Target, "%ld", ptr->lvalue);
break;
default:
- lprintf(1,"WARNING: invalid value in SV-Hash at %s!\n", Tokens->pName);
- StrBufAppendPrintf(Target, "WARNING: \ninvalid value in SV-Hash at %s!\n
", Tokens->pName);
+ LogTemplateError(
+ Target, "Subst", ERR_NAME, TP,
+ "WARNING: invalid value in SV-Hash at %s!", TP->Tokens->pName);
}
}
else {
- lprintf(1, "didn't find Handler [%s] (in '%s' line %ld); "
- " [%s]\n",
- Tokens->pName,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
+ LogTemplateError(
+ Target, "Token", ERR_NAME, TP,
+ "didn't find Handler");
wc_backtrace();
}
}
int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup)
{
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
wcsubst *ptr;
void *vVar;
@@ -647,7 +669,7 @@ int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLoo
int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup)
{
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
wcsubst *ptr;
void *vVar;
@@ -676,6 +698,47 @@ int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup)
}
+
+/**
+ * \brief puts string into the template and computes which escape methon we should use
+ * \param Source the string we should put into the template
+ * \param FormatTypeIndex where should we look for escape types if?
+ */
+void StrBufAppendTemplate(StrBuf *Target,
+ WCTemplputParams *TP,
+ const StrBuf *Source, int FormatTypeIndex)
+{
+ wcsession *WCC;
+ StrBuf *Buf;
+ char EscapeAs = ' ';
+
+ if ((FormatTypeIndex < TP->Tokens->nParameters) &&
+ (TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
+ (TP->Tokens->Params[FormatTypeIndex]->len == 1)) {
+ EscapeAs = *TP->Tokens->Params[FormatTypeIndex]->Start;
+ }
+
+ switch(EscapeAs)
+ {
+ case 'H':
+ WCC = WC;
+ Buf = NewStrBufPlain(NULL, StrLength(Source));
+ StrBuf_RFC822_to_Utf8(Buf,
+ Source,
+ (WCC!=NULL)? WCC->DefaultCharset : NULL,
+ NULL);
+ StrEscAppend(Target, Buf, NULL, 0, 0);
+ FreeStrBuf(&Buf);
+ break;
+ case 'X':
+ StrEscAppend(Target, Source, NULL, 0, 0);
+ break;
+ default:
+ StrBufAppendBuf(Target, Source, 0);
+ }
+}
+
+
void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
{
if (Template->nTokensUsed + 1 >= Template->TokenSpace) {
@@ -726,6 +789,8 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, W
else if (*pch == '_') {
Parm->Type = TYPE_GETTEXT;
pch ++;
+ if (*pch == '(')
+ pch ++;
}
else if (*pch == 'B') {
Parm->Type = TYPE_BSTR;
@@ -767,6 +832,10 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, W
Parm->Start = pchs;
Parm->len = pche - pchs;
pch ++; /* move after trailing quote */
+ if ((Parm->Type = TYPE_GETTEXT) && (*pch == ')')) {
+ pch ++;
+ }
+
}
}
else {
@@ -786,12 +855,14 @@ TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, W
}
else {
Parm->lvalue = 0;
+/* TODO whUT?
lprintf(1, "Error (in '%s' line %ld); "
"evaluating long template param [%s] in Token [%s]\n",
ChrPtr(pTmpl->FileName),
Tokens->Line,
ChrPtr(Tokens->FlatToken),
*pCh);
+ */
free(Parm);
return NULL;
}
@@ -817,7 +888,9 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
const char *pch;
TemplateParam *Param;
WCTemplateToken *NewToken = (WCTemplateToken*)malloc(sizeof(WCTemplateToken));
+ WCTemplputParams TP;
+ TP.Tokens = NewToken;
NewToken->FileName = pTmpl->FileName; /* to print meaningfull log messages... */
NewToken->Flags = 0;
NewToken->Line = Line + 1;
@@ -842,23 +915,20 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
NewToken->NameEnd = pch - NewToken->pName;
pch ++;
if (*(pTmplEnd - 1) != ')') {
- lprintf(1, "Warning, Non welformed Token; missing right parenthesis (in '%s' line %ld); "
- "[%s]\n",
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Parseerror", ERR_NAME, &TP,
+ "Warning, Non welformed Token; missing right parenthesis");
}
while (pch < pTmplEnd - 1) {
Param = GetNextParameter(Buf, &pch, pTmplEnd - 1, NewToken, pTmpl);
if (Param != NULL) {
NewToken->HaveParameters = 1;
if (NewToken->nParameters > MAXPARAM) {
- lprintf(1, "Error (in '%s' line %ld); "
- "only [%ld] Params allowed in Tokens [%s]\n",
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- MAXPARAM,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Parseerror", ERR_NAME, &TP,
+ "only [%ld] Params allowed in Tokens",
+ MAXPARAM);
+
free(Param);
FreeToken(&NewToken);
return NULL;
@@ -894,13 +964,11 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
Handler = (HashHandler*) vVar;
if ((NewToken->nParameters < Handler->nMinArgs) ||
(NewToken->nParameters > Handler->nMaxArgs)) {
- lprintf(1, "Handler [%s] (in '%s' line %ld); "
- "doesn't work with %ld params [%s]\n",
- NewToken->pName,
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- NewToken->nParameters,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Token", ERR_NAME, &TP,
+ "doesn't work with %ld params",
+ NewToken->nParameters);
+
}
else {
NewToken->PreEval = Handler;
@@ -910,24 +978,20 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
break;
case SV_GETTEXT:
if (NewToken->nParameters !=1) {
- lprintf(1, "Gettext (in '%s' line %ld); "
- "requires exactly 1 parameter, you gave %ld params [%s]\n",
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- NewToken->nParameters,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Gettext", ERR_NAME, &TP,
+ "requires exactly 1 parameter, you gave %ld params",
+ NewToken->nParameters);
NewToken->Flags = 0;
break;
}
break;
case SV_SUBTEMPL:
if (NewToken->nParameters != 1) {
- lprintf(1, "Subtemplates (in '%s' line %ld); "
- "require exactly 1 parameter, you gave %ld params [%s]\n",
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- NewToken->nParameters,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Subtemplates", ERR_NAME, &TP,
+ "require exactly 1 parameter, you gave %ld params",
+ NewToken->nParameters);
break;
}
break;
@@ -935,28 +999,31 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
case SV_CONDITIONAL:
case SV_NEG_CONDITIONAL:
if (NewToken->nParameters <2) {
- lprintf(1, "Conditional (in '%s' line %ld); "
- "require at least 2 parameters, you gave %ld params [%s]\n",
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- NewToken->nParameters,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Conditional", ERR_NAME, &TP,
+ "require at least 2 parameters, you gave %ld params",
+ NewToken->nParameters);
+ NewToken->Flags = 0;
+ break;
+ }
+ if (NewToken->Params[1]->lvalue == 0) {
+ LogTemplateError(
+ NULL, "Conditional", ERR_NAME, &TP,
+ "Conditional ID (Parameter 1) mustn't be 0!");
NewToken->Flags = 0;
break;
}
if (!GetHash(Conditionals,
- NewToken->Params[0]->Start,
- NewToken->Params[0]->len,
+ NewToken->Params[0]->Start,
+ NewToken->Params[0]->len,
&vVar) ||
(vVar == NULL)) {
if ((NewToken->Params[0]->len == 1) &&
(NewToken->Params[0]->Start[0] == 'X'))
break;
- lprintf(1, "Conditional [%s] (in '%s' line %ld); Not found![%s]\n",
- NewToken->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- NewToken->Line,
- ChrPtr(NewToken->FlatToken));
+ LogTemplateError(
+ NULL, "Conditional", ERR_NAME, &TP,
+ "Not found!");
/*
NewToken->Error = NewStrBuf();
StrBufAppendPrintf(
@@ -978,260 +1045,6 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
-int EvaluateConditional(StrBuf *Target, WCTemplateToken *Tokens, WCTemplate *pTmpl, void *Context, int Neg, int state, int ContextType)
-{
- ConditionalStruct *Cond;
-
- if ((Tokens->Params[0]->len == 1) &&
- (Tokens->Params[0]->Start[0] == 'X'))
- return (state != 0)?Tokens->Params[1]->lvalue:0;
-
- Cond = (ConditionalStruct *) Tokens->PreEval;
- if (Cond == NULL) {
- lprintf(1, "Conditional [%s] (in '%s' line %ld); unknown![%s]\n",
- Tokens->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
- return 1;
- }
-
- if (Tokens->nParameters < Cond->nParams) {
- lprintf(1, "Conditional [%s] (in '%s' line %ld); needs %ld Params![%s]\n",
- Tokens->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Cond->nParams,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nConditional [%s] (in '%s' line %ld); needs %ld Params!\n[%s]\n
\n",
- Tokens->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Cond->nParams,
- ChrPtr(Tokens->FlatToken));
- return 0;
- }
- if (Cond->CondF(Tokens, Context, ContextType) == Neg)
- return Tokens->Params[1]->lvalue;
- return 0;
-}
-
-/**
- * \brief executes one token
- * \param Target buffer to append to
- * \param Token da to process.
- * \param Template we're iterating
- * \param Context Contextpoointer to pass in
- * \param state are we in conditional state?
- * \param ContextType what type of information does context giv us?
- */
-int EvaluateToken(StrBuf *Target, WCTemplateToken *Tokens, WCTemplate *pTmpl, void *Context, int state, int ContextType)
-{
- HashHandler *Handler;
- void *vVar;
-// much output, since pName is not terminated...
-// lprintf(1,"Doing token: %s\n",Token->pName);
-
- switch (Tokens->Flags) {
- case SV_GETTEXT:
- TmplGettext(Target, Tokens->nParameters, Tokens);
- break;
- case SV_CONDITIONAL: /** Forward conditional evaluation */
- return EvaluateConditional(Target, Tokens, pTmpl, Context, 1, state, ContextType);
- break;
- case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
- return EvaluateConditional(Target, Tokens, pTmpl, Context, 0, state, ContextType);
- break;
- case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
- if (Tokens->nParameters >= 6) {
- if (EvaluateConditional(Target, Tokens, pTmpl, Context, 0, state, ContextType))
- StrBufAppendBufPlain(Target,
- Tokens->Params[5]->Start,
- Tokens->Params[5]->len,
- 0);
- else
- StrBufAppendBufPlain(Target,
- Tokens->Params[4]->Start,
- Tokens->Params[4]->len,
- 0);
- }
- else {
- lprintf(1, "Conditional [%s] (in '%s' line %ld); needs at least 6 Params![%s]\n",
- Tokens->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nConditional [%s] (in '%s' line %ld); needs 6 Params!\n[%s]\n
\n",
- Tokens->Params[0]->Start,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
- }
- break;
- case SV_SUBTEMPL:
- if (Tokens->nParameters == 1)
- DoTemplate(Tokens->Params[0]->Start, Tokens->Params[0]->len, NULL, NULL, ContextType);
- break;
- case SV_PREEVALUATED:
- Handler = (HashHandler*) Tokens->PreEval;
- if ((Handler->ContextRequired != CTX_NONE) &&
- (Handler->ContextRequired != ContextType)) {
- lprintf(1, "Handler [%s] (in '%s' line %ld); "
- "requires context of type %ld, have %ld [%s]\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Handler->ContextRequired,
- ContextType,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nHandler [%s] (in '%s' line %ld);"
- " requires context of type %ld, have %ld!\n[%s]\n
\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Handler->ContextRequired,
- ContextType,
- ChrPtr(Tokens->FlatToken));
- return -1;
-
- }
- Handler->HandlerFunc(Target,
- Tokens->nParameters,
- Tokens,
- Context,
- ContextType);
- break;
- default:
- if (GetHash(GlobalNS, Tokens->pName, Tokens->NameEnd, &vVar)) {
- Handler = (HashHandler*) vVar;
- if ((Handler->ContextRequired != CTX_NONE) &&
- (Handler->ContextRequired != ContextType)) {
- lprintf(1, "Handler [%s] (in '%s' line %ld); "
- "requires context of type %ld, have %ld [%s]\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Handler->ContextRequired,
- ContextType,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nHandler [%s] (in '%s' line %ld);"
- " requires context of type %ld, have %ld!\n[%s]\n
\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Handler->ContextRequired,
- ContextType,
- ChrPtr(Tokens->FlatToken));
- return -1;
- }
- else if ((Tokens->nParameters < Handler->nMinArgs) ||
- (Tokens->nParameters > Handler->nMaxArgs)) {
- lprintf(1, "Handler [%s] (in '%s' line %ld); "
- "doesn't work with %ld params [%s]\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Tokens->nParameters,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nHandler [%s] (in '%s' line %ld);"
- " doesn't work with %ld params!\n[%s]\n
\n",
- Tokens->pName,
- ChrPtr(pTmpl->FileName),
- Tokens->Line,
- Tokens->nParameters,
- ChrPtr(Tokens->FlatToken));
- }
- else {
- Handler->HandlerFunc(Target,
- Tokens->nParameters,
- Tokens,
- Context,
- ContextType); /*TODO: subset of that */
-
- }
- }
- else {
- print_value_of(Target, Tokens, Context, ContextType);
- }
- }
- return 0;
-}
-
-void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, void *Context, int ContextType)
-{
- WCTemplate *pTmpl = Tmpl;
- int done = 0;
- int i, state;
- const char *pData, *pS;
- long len;
-
- if (LoadTemplates != 0) {
- if (LoadTemplates > 1)
- lprintf(1, "DBG: ----- loading: [%s] ------ \n",
- ChrPtr(Tmpl->FileName));
-
- pTmpl = load_template(Tmpl->FileName, NULL, NULL);
- if(pTmpl == NULL) {
- StrBufAppendPrintf(
- Target,
- "\nError loading Template [%s]\n See Logfile for details\n
\n",
- ChrPtr(Tmpl->FileName));
- return;
- }
-
- }
-
- pS = pData = ChrPtr(pTmpl->Data);
- len = StrLength(pTmpl->Data);
- i = 0;
- state = 0;
- while (!done) {
- if (i >= pTmpl->nTokensUsed) {
- StrBufAppendBufPlain(Target,
- pData,
- len - (pData - pS), 0);
- done = 1;
- }
- else {
- StrBufAppendBufPlain(
- Target, pData,
- pTmpl->Tokens[i]->pTokenStart - pData, 0);
- state = EvaluateToken(Target, pTmpl->Tokens[i], pTmpl, Context, state, ContextType);
- while ((state != 0) && (i+1 < pTmpl->nTokensUsed)) {
- /* condition told us to skip till its end condition */
- i++;
- if ((pTmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
- (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
- if (state == EvaluateConditional(
- Target,
- pTmpl->Tokens[i],
- pTmpl,
- Context,
- pTmpl->Tokens[i]->Flags,
- state,
- ContextType))
- state = 0;
- }
- }
- pData = pTmpl->Tokens[i++]->pTokenEnd + 1;
- if (i > pTmpl->nTokensUsed)
- done = 1;
- }
- }
- if (LoadTemplates != 0) {
- FreeWCTemplate(pTmpl);
- }
-}
/**
@@ -1313,7 +1126,7 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
pts = pch;
/** Found one? parse it. */
- for (; pch < pE - 1; pch ++) {
+ for (; pch <= pE - 1; pch ++) {
if (*pch == '"')
InDoubleQuotes = ! InDoubleQuotes;
else if (*pch == '\'')
@@ -1324,7 +1137,7 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
break;
}
}
- if (pch + 1 >= pE)
+ if (pch + 1 > pE)
continue;
pte = pch;
PutNewToken(NewTemplate,
@@ -1337,7 +1150,6 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
}
-///void PrintTemplate(const char *Key, void *vSubst, int odd)
const char* PrintTemplate(void *vSubst)
{
WCTemplate *Tmpl = vSubst;
@@ -1346,50 +1158,6 @@ const char* PrintTemplate(void *vSubst)
}
-
-/**
- * \brief Display a variable-substituted template
- * \param templatename template file to load
- */
-void DoTemplate(const char *templatename, long len, StrBuf *Target, void *Context, int ContextType)
-{
- HashList *Static;
- HashList *StaticLocal;
- void *vTmpl;
-
- if (Target == NULL)
- Target = WC->WBuf;
- if (WC->is_mobile) {
- Static = WirelessTemplateCache;
- StaticLocal = WirelessLocalTemplateCache;
- }
- else {
- Static = TemplateCache;
- StaticLocal = LocalTemplateCache;
- }
-
- if (len == 0)
- {
- lprintf (1, "Can't to load a template with empty name!\n");
- StrBufAppendPrintf(Target, "\nCan't to load a template with empty name!\n
");
- return;
- }
-
- if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
- !GetHash(Static, templatename, len, &vTmpl)) {
- lprintf (1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename));
- StrBufAppendPrintf(Target, "\ndidn't find Template [%s] %ld %ld\n
",
- templatename, len,
- (long)strlen(templatename));
-/// dbg_PrintHash(Static, PrintTemplate, NULL);
-// PrintHash(Static, VarPrintTransition, PrintTemplate);
- return;
- }
- if (vTmpl == NULL)
- return;
- ProcessTemplate(vTmpl, Target, Context, ContextType);
-}
-
int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
{
StrBuf *FileName;
@@ -1462,120 +1230,363 @@ void InitTemplateCache(void)
+/*-----------------------------------------------------------------------------
+ * Filling & processing Templates
+ */
+/**
+ * \brief executes one token
+ * \param Target buffer to append to
+ * \param Token da to process.
+ * \param Template we're iterating
+ * \param Context Contextpoointer to pass in
+ * \param state are we in conditional state?
+ * \param ContextType what type of information does context giv us?
+ */
+int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
+{
+ const char *AppendMe;
+ long AppendMeLen;
+ HashHandler *Handler;
+ void *vVar;
+/* much output, since pName is not terminated...
+ lprintf(1,"Doing token: %s\n",Token->pName);
+*/
+
+ switch (TP->Tokens->Flags) {
+ case SV_GETTEXT:
+ TmplGettext(Target, TP);
+ break;
+ case SV_CONDITIONAL: /** Forward conditional evaluation */
+ return EvaluateConditional(Target, 1, state, TP);
+ break;
+ case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
+ return EvaluateConditional(Target, 0, state, TP);
+ break;
+ case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
+ if (TP->Tokens->nParameters >= 6) {
+ if (EvaluateConditional(Target, 0, state, TP)) {
+ GetTemplateTokenString(TP, 5, &AppendMe, &AppendMeLen);
+ StrBufAppendBufPlain(Target,
+ AppendMe,
+ AppendMeLen,
+ 0);
+ }
+ else{
+ GetTemplateTokenString(TP, 4, &AppendMe, &AppendMeLen);
+ StrBufAppendBufPlain(Target,
+ AppendMe,
+ AppendMeLen,
+ 0);
+ }
+ }
+ else {
+ LogTemplateError(
+ Target, "Conditional", ERR_NAME, TP,
+ "needs at least 6 Params!");
+ }
+ break;
+ case SV_SUBTEMPL:
+ if (TP->Tokens->nParameters == 1)
+ DoTemplate(TKEY(0), NULL, TP);
+ break;
+ case SV_PREEVALUATED:
+ Handler = (HashHandler*) TP->Tokens->PreEval;
+ if ((Handler->ContextRequired != CTX_NONE) &&
+ (Handler->ContextRequired != TP->ContextType)) {
+ LogTemplateError(
+ Target, "Token", ERR_NAME, TP,
+ "requires context of type %ld, have %ld",
+ Handler->ContextRequired,
+ TP->ContextType);
+ return -1;
+
+ }
+ Handler->HandlerFunc(Target, TP);
+ break;
+ default:
+ if (GetHash(GlobalNS, TP->Tokens->pName, TP->Tokens->NameEnd, &vVar)) {
+ Handler = (HashHandler*) vVar;
+ if ((Handler->ContextRequired != CTX_NONE) &&
+ (Handler->ContextRequired != TP->ContextType)) {
+ LogTemplateError(
+ Target, "Token", ERR_NAME, TP,
+ "requires context of type %ld, have %ld",
+ Handler->ContextRequired,
+ TP->ContextType);
+ return -1;
+ }
+ else if ((TP->Tokens->nParameters < Handler->nMinArgs) ||
+ (TP->Tokens->nParameters > Handler->nMaxArgs)) {
+ LogTemplateError(
+ Target, "Token", ERR_NAME, TP,
+ "doesn't work with %ld params need > %ld < %ld",
+ TP->Tokens->nParameters,
+ Handler->nMaxArgs,
+ Handler->nMinArgs);
+ }
+ else {
+ Handler->HandlerFunc(Target, TP);
+ }
+ }
+ else {
+ print_value_of(Target, TP);
+ }
+ }
+ return 0;
+}
+
+
+
+void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, void *Context, int ContextType)
+{
+ WCTemplate *pTmpl = Tmpl;
+ int done = 0;
+ int i, state;
+ const char *pData, *pS;
+ long len;
+ WCTemplputParams TP;
+
+ TP.Context = Context;
+ TP.ContextType = ContextType;
+
+ if (LoadTemplates != 0) {
+ if (LoadTemplates > 1)
+ lprintf(1, "DBG: ----- loading: [%s] ------ \n",
+ ChrPtr(Tmpl->FileName));
+
+ pTmpl = load_template(Tmpl->FileName, NULL, NULL);
+ if(pTmpl == NULL) {
+ StrBufAppendPrintf(
+ Target,
+ "\nError loading Template [%s]\n See Logfile for details\n
\n",
+ ChrPtr(Tmpl->FileName));
+ return;
+ }
+
+ }
+
+ pS = pData = ChrPtr(pTmpl->Data);
+ len = StrLength(pTmpl->Data);
+ i = 0;
+ state = 0;
+ while (!done) {
+ if (i >= pTmpl->nTokensUsed) {
+ StrBufAppendBufPlain(Target,
+ pData,
+ len - (pData - pS), 0);
+ done = 1;
+ }
+ else {
+ StrBufAppendBufPlain(
+ Target, pData,
+ pTmpl->Tokens[i]->pTokenStart - pData, 0);
+ TP.Tokens = pTmpl->Tokens[i];
+ TP.nArgs = pTmpl->Tokens[i]->nParameters;
+ state = EvaluateToken(Target, state, &TP);
+
+ while ((state != 0) && (i+1 < pTmpl->nTokensUsed)) {
+ /* condition told us to skip till its end condition */
+ i++;
+ TP.Tokens = pTmpl->Tokens[i];
+ TP.nArgs = pTmpl->Tokens[i]->nParameters;
+ if ((pTmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
+ (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
+ if (state == EvaluateConditional(
+ Target,
+ pTmpl->Tokens[i]->Flags,
+ state,
+ &TP))
+ state = 0;
+ }
+ }
+ pData = pTmpl->Tokens[i++]->pTokenEnd + 1;
+ if (i > pTmpl->nTokensUsed)
+ done = 1;
+ }
+ }
+ if (LoadTemplates != 0) {
+ FreeWCTemplate(pTmpl);
+ }
+}
+
+/**
+ * \brief Display a variable-substituted template
+ * \param templatename template file to load
+ */
+void DoTemplate(const char *templatename, long len, StrBuf *Target, WCTemplputParams *TP)
+{
+ HashList *Static;
+ HashList *StaticLocal;
+ void *vTmpl;
+
+ if (Target == NULL)
+ Target = WC->WBuf;
+ if (WC->is_mobile) {
+ Static = WirelessTemplateCache;
+ StaticLocal = WirelessLocalTemplateCache;
+ }
+ else {
+ Static = TemplateCache;
+ StaticLocal = LocalTemplateCache;
+ }
+
+ if (len == 0)
+ {
+ lprintf (1, "Can't to load a template with empty name!\n");
+ StrBufAppendPrintf(Target, "\nCan't to load a template with empty name!\n
");
+ return;
+ }
+
+ if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
+ !GetHash(Static, templatename, len, &vTmpl)) {
+ lprintf (1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename));
+ StrBufAppendPrintf(Target, "\ndidn't find Template [%s] %ld %ld\n
",
+ templatename, len,
+ (long)strlen(templatename));
+#if 0
+ dbg_PrintHash(Static, PrintTemplate, NULL);
+ PrintHash(Static, VarPrintTransition, PrintTemplate);
+#endif
+ return;
+ }
+ if (vTmpl == NULL)
+ return;
+ ProcessTemplate(vTmpl, Target, TP->Context, TP->ContextType);
+}
+
+/*-----------------------------------------------------------------------------
+ * Iterators
+ */
typedef struct _HashIterator {
HashList *StaticList;
int AdditionalParams;
int ContextType;
int XPectContextType;
+ int Flags;
RetrieveHashlistFunc GetHash;
HashDestructorFunc Destructor;
SubTemplFunc DoSubTemplate;
} HashIterator;
-void tmpl_iterate_subtmpl(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void RegisterITERATOR(const char *Name, long len,
+ int AdditionalParams,
+ HashList *StaticList,
+ RetrieveHashlistFunc GetHash,
+ SubTemplFunc DoSubTempl,
+ HashDestructorFunc Destructor,
+ int ContextType,
+ int XPectContextType,
+ int Flags)
+{
+ HashIterator *It = (HashIterator*)malloc(sizeof(HashIterator));
+ It->StaticList = StaticList;
+ It->AdditionalParams = AdditionalParams;
+ It->GetHash = GetHash;
+ It->DoSubTemplate = DoSubTempl;
+ It->Destructor = Destructor;
+ It->ContextType = ContextType;
+ It->XPectContextType = XPectContextType;
+ It->Flags = Flags;
+ Put(Iterators, Name, len, It, NULL);
+}
+
+void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
{
void *vIt;
HashIterator *It;
HashList *List;
HashPos *it;
+ SortStruct *SortBy = NULL;
+ void *vSortBy;
+ int DetectGroupChange = 0;
+ int nMembersUsed;
+ int nMembersCounted = 0;
long len;
const char *Key;
void *vContext;
+ void *vLastContext = NULL;
StrBuf *SubBuf;
int oddeven = 0;
+ WCTemplputParams SubTP;
+
+ memcpy (&SubTP, &TP, sizeof(WCTemplputParams));
- if (!GetHash(Iterators,
- Tokens->Params[0]->Start,
- Tokens->Params[0]->len,
- &vIt)) {
- lprintf(1, "unknown Iterator [%s] (in '%s' line %ld); "
- " [%s]\n",
- Tokens->Params[0]->Start,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nunknown Iterator [%s] (in '%s' line %ld); \n"
- " [%s]\n
",
- Tokens->Params[0]->Start,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- ChrPtr(Tokens->FlatToken));
+ if (!GetHash(Iterators, TKEY(0), &vIt)) {
+ LogTemplateError(
+ Target, "Iterator", ERR_PARM1, TP, "Unknown!");
return;
}
It = (HashIterator*) vIt;
- if (Tokens->nParameters < It->AdditionalParams + 2) {
- lprintf(1, "Iterator [%s] (in '%s' line %ld); "
- "doesn't work with %ld params [%s]\n",
- Tokens->Params[0]->Start,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- Tokens->nParameters,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "Iterator [%s] \n(in '%s' line %ld);\n"
- "doesn't work with %ld params \n[%s]\n
",
- Tokens->Params[0]->Start,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- Tokens->nParameters,
- ChrPtr(Tokens->FlatToken));
+ if (TP->Tokens->nParameters < It->AdditionalParams + 2) {
+ LogTemplateError(
+ Target, "Iterator", ERR_PARM1, TP,
+ "doesn't work with %ld params",
+ TP->Tokens->nParameters);
return;
}
if ((It->XPectContextType != CTX_NONE) &&
- (It->XPectContextType != ContextType)) {
- lprintf(1, "Iterator [%s] (in '%s' line %ld); "
- "requires context of type %ld, have %ld [%s]\n",
- Tokens->pName,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
+ (It->XPectContextType != TP->ContextType)) {
+ LogTemplateError(
+ Target, "Iterator", ERR_PARM1, TP,
+ "requires context of type %ld, have %ld",
It->XPectContextType,
- ContextType,
- ChrPtr(Tokens->FlatToken));
- StrBufAppendPrintf(
- Target,
- "\nIterator [%s] (in '%s' line %ld);"
- " requires context of type %ld, have %ld!\n[%s]\n
\n",
- Tokens->pName,
- ChrPtr(Tokens->FileName),
- Tokens->Line,
- It->XPectContextType,
- ContextType,
- ChrPtr(Tokens->FlatToken));
+ TP->ContextType);
return ;
}
-
-
-
if (It->StaticList == NULL)
- List = It->GetHash(Target, nArgs, Tokens, Context, ContextType);
+ List = It->GetHash(Target, TP);
else
List = It->StaticList;
+ DetectGroupChange = (It->Flags & IT_FLAG_DETECT_GROUPCHANGE) != 0;
+ if (DetectGroupChange) {
+ const StrBuf *BSort;
+ DetectGroupChange = 0;
+ if (havebstr("SortBy")) {
+ BSort = sbstr("SortBy");
+ if (GetHash(SortHash, SKEY(BSort), &vSortBy) &&
+ (vSortBy != NULL)) {
+ SortBy = (SortStruct*)vSortBy;
+ /** Ok, its us, lets see in which direction we should sort... */
+ if (havebstr("SortOrder")) {
+ int SortOrder;
+ SortOrder = LBSTR("SortOrder");
+ if (SortOrder != 0)
+ DetectGroupChange = 1;
+ }
+ }
+ }
+ }
+ nMembersUsed = GetCount(List);
SubBuf = NewStrBuf();
- it = GetNewHashPos();
+ SubTP.ContextType = It->ContextType;
+ it = GetNewHashPos(List, 0);
while (GetNextHashPos(List, it, &len, &Key, &vContext)) {
+ if (DetectGroupChange && nMembersCounted > 0) {
+ if (SortBy->GroupChange(vContext, vLastContext))
+ svputlong("ITERATE:ISGROUPCHANGE", 1);
+ else
+ svputlong("ITERATE:ISGROUPCHANGE", 0);
+ }
svprintf(HKEY("ITERATE:ODDEVEN"), WCS_STRING, "%s",
(oddeven) ? "odd" : "even");
svprintf(HKEY("ITERATE:KEY"), WCS_STRING, "%s", Key);
-
+ svputlong("ITERATE:N", nMembersCounted);
+ svputlong("ITERATE:LASTN", ++nMembersCounted == nMembersUsed);
+ SubTP.Context = vContext;
if (It->DoSubTemplate != NULL)
- It->DoSubTemplate(SubBuf, vContext, Tokens);
- DoTemplate(Tokens->Params[1]->Start,
- Tokens->Params[1]->len,
- SubBuf, vContext,
- It->ContextType);
+ It->DoSubTemplate(SubBuf, &SubTP);
+ DoTemplate(TKEY(1), SubBuf, &SubTP);
StrBufAppendBuf(Target, SubBuf, 0);
FlushStrBuf(SubBuf);
oddeven = ~ oddeven;
+ vLastContext = vContext;
}
FreeStrBuf(&SubBuf);
DeleteHashPos(&it);
@@ -1583,20 +1594,54 @@ void tmpl_iterate_subtmpl(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, vo
It->Destructor(&List);
}
-int ConditionalVar(WCTemplateToken *Tokens, void *Context, int ContextType)
+
+
+/*-----------------------------------------------------------------------------
+ * Conditionals
+ */
+int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP)
+{
+ ConditionalStruct *Cond;
+
+ if ((TP->Tokens->Params[0]->len == 1) &&
+ (TP->Tokens->Params[0]->Start[0] == 'X'))
+ return (state != 0)?TP->Tokens->Params[1]->lvalue:0;
+
+ Cond = (ConditionalStruct *) TP->Tokens->PreEval;
+ if (Cond == NULL) {
+ LogTemplateError(
+ Target, "Conditional", ERR_PARM1, TP,
+ "unknown!");
+ return 1;
+ }
+
+ if (TP->Tokens->nParameters < Cond->nParams) {
+ LogTemplateError(
+ Target, "Conditional", ERR_PARM1, TP,
+ "needs %ld Params, have %ld!",
+ Cond->nParams,
+ TP->Tokens->nParameters);
+ return 0;
+ }
+ if (Cond->CondF(Target, TP) == Neg)
+ return TP->Tokens->Params[1]->lvalue;
+ return 0;
+}
+
+int ConditionalVar(StrBuf *Target, WCTemplputParams *TP)
{
void *vsubst;
wcsubst *subst;
- if (!GetHash(WC->vars,
- Tokens->Params[2]->Start,
- Tokens->Params[2]->len,
- &vsubst))
+ if (!GetHash(WC->vars, TKEY(2), &vsubst))
return 0;
subst = (wcsubst*) vsubst;
if ((subst->ContextRequired != CTX_NONE) &&
- (subst->ContextRequired != ContextType)) {
- lprintf(1," WARNING: Conditional requires Context: [%ld]!\n", Tokens->Params[2]->Start);
+ (subst->ContextRequired != TP->ContextType)) {
+ LogTemplateError(
+ Target, "ConditionalVar", ERR_PARM1, TP,
+ " WARNING: Conditional requires Context: [%ld], have [%ld]!",
+ subst->ContextRequired, CTX);
return -1;
}
@@ -1604,18 +1649,18 @@ int ConditionalVar(WCTemplateToken *Tokens, void *Context, int ContextType)
case WCS_FUNCTION:
return (subst->wcs_function!=NULL);
case WCS_SERVCMD:
- lprintf(1, " -> Server [%s]\n", subst->wcs_value);////todo
+ lprintf(1, " -> Server [%s]\n", subst->wcs_value);/* TODO */
return 1;
case WCS_STRING:
case WCS_STRBUF:
case WCS_STRBUF_REF:
- if (Tokens->nParameters < 4)
+ if (TP->Tokens->nParameters < 4)
return 1;
- return (strcmp(Tokens->Params[3]->Start, ChrPtr(subst->wcs_value)) == 0);
+ return (strcmp(TP->Tokens->Params[3]->Start, ChrPtr(subst->wcs_value)) == 0);
case WCS_LONG:
- if (Tokens->nParameters < 4)
+ if (TP->Tokens->nParameters < 4)
return (subst->lvalue != 0);
- return (subst->lvalue == Tokens->Params[3]->lvalue);
+ return (subst->lvalue == TP->Tokens->Params[3]->lvalue);
default:
lprintf(1," WARNING: invalid type: [%ld]!\n", subst->wcs_type);
return -1;
@@ -1623,25 +1668,6 @@ int ConditionalVar(WCTemplateToken *Tokens, void *Context, int ContextType)
return 0;
}
-void RegisterITERATOR(const char *Name, long len,
- int AdditionalParams,
- HashList *StaticList,
- RetrieveHashlistFunc GetHash,
- SubTemplFunc DoSubTempl,
- HashDestructorFunc Destructor,
- int ContextType,
- int XPectContextType)
-{
- HashIterator *It = (HashIterator*)malloc(sizeof(HashIterator));
- It->StaticList = StaticList;
- It->AdditionalParams = AdditionalParams;
- It->GetHash = GetHash;
- It->DoSubTemplate = DoSubTempl;
- It->Destructor = Destructor;
- It->ContextType = ContextType;
- It->XPectContextType = XPectContextType;
- Put(Iterators, Name, len, It, NULL);
-}
void RegisterConditional(const char *Name, long len,
int nParams,
@@ -1656,71 +1682,82 @@ void RegisterConditional(const char *Name, long len,
Put(Conditionals, Name, len, Cond, NULL);
}
-
-void tmplput_ContextString(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+/*-----------------------------------------------------------------------------
+ * Context Strings
+ */
+void tmplput_ContextString(StrBuf *Target, WCTemplputParams *TP)
{
- StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, (StrBuf*)Context, 0);
+ StrBufAppendTemplate(Target, TP, (StrBuf*)CTX, 0);
}
-int ConditionalContextStr(WCTemplateToken *Tokens, void *Context, int ContextType)
+int ConditionalContextStr(StrBuf *Target, WCTemplputParams *TP)
{
- StrBuf *TokenText = (StrBuf*) Context;
+ StrBuf *TokenText = (StrBuf*) CTX;
const char *CompareToken;
long len;
- GetTemplateTokenString(Tokens, 2, &CompareToken, &len);
+ GetTemplateTokenString(TP, 2, &CompareToken, &len);
return strcmp(ChrPtr(TokenText), CompareToken) == 0;
}
+/*-----------------------------------------------------------------------------
+ * Boxed-API
+ */
-void tmpl_do_boxed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmpl_do_boxed(StrBuf *Target, WCTemplputParams *TP)
{
+ WCTemplputParams SubTP;
+
StrBuf *Headline;
- if (nArgs == 2) {
- if (Tokens->Params[1]->Type == TYPE_STR) {
+ if (TP->Tokens->nParameters == 2) {
+ if (TP->Tokens->Params[1]->Type == TYPE_STR) {
Headline = NewStrBuf();
- DoTemplate(Tokens->Params[1]->Start,
- Tokens->Params[1]->len,
- Headline,
- Context,
- ContextType);
+ DoTemplate(TKEY(1), Headline, TP);
}
else {
const char *Ch;
long len;
- GetTemplateTokenString(Tokens,
+ GetTemplateTokenString(TP,
1,
&Ch,
&len);
Headline = NewStrBufPlain(Ch, len);
}
}
-
- DoTemplate(HKEY("beginbox"), Target, Headline, CTX_STRBUF);
- DoTemplate(Tokens->Params[0]->Start,
- Tokens->Params[0]->len,
- Target,
- Context,
- ContextType);
- DoTemplate(HKEY("endbox"), Target, Context, ContextType);
+ memcpy (&SubTP, TP, sizeof(WCTemplputParams));
+ SubTP.Context = Headline;
+ SubTP.ContextType = CTX_STRBUF;
+ DoTemplate(HKEY("beginbox"), Target, &SubTP);
+ DoTemplate(TKEY(0), Target, TP);
+ DoTemplate(HKEY("endbox"), Target, TP);
+ FreeStrBuf(&Headline);
}
+/*-----------------------------------------------------------------------------
+ * Tabbed-API
+ */
-void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP)
{
StrBuf **TabNames;
int i, ntabs, nTabs;
- nTabs = ntabs = Tokens->nParameters / 2;
+ nTabs = ntabs = TP->Tokens->nParameters / 2;
TabNames = (StrBuf **) malloc(ntabs * sizeof(StrBuf*));
for (i = 0; i < ntabs; i++) {
- TabNames[i] = NewStrBuf();
- if (Tokens->Params[i * 2]->len > 0) {
- DoTemplate(Tokens->Params[i * 2]->Start,
- Tokens->Params[i * 2]->len,
- TabNames[i],
- Context,
- ContextType);
+ if ((TP->Tokens->Params[i * 2]->Type == TYPE_STR) &&
+ (TP->Tokens->Params[i * 2]->len > 0)) {
+ TabNames[i] = NewStrBuf();
+ DoTemplate(TKEY(i * 2), TabNames[i], TP);
+ }
+ else if (TP->Tokens->Params[i * 2]->Type == TYPE_GETTEXT) {
+ const char *Ch;
+ long len;
+ GetTemplateTokenString(TP,
+ i * 2,
+ &Ch,
+ &len);
+ TabNames[i] = NewStrBufPlain(Ch, -1);
}
else {
/** A Tab without subject? we can't count that, add it as silent */
@@ -1731,26 +1768,362 @@ void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Co
StrTabbedDialog(Target, nTabs, TabNames);
for (i = 0; i < ntabs; i++) {
StrBeginTab(Target, i, nTabs);
-
- DoTemplate(Tokens->Params[i * 2 + 1]->Start,
- Tokens->Params[i * 2 + 1]->len,
- Target,
- Context,
- ContextType);
+ DoTemplate(TKEY(i * 2 + 1), Target, TP);
StrEndTab(Target, i, nTabs);
}
}
+
+/*-----------------------------------------------------------------------------
+ * Sorting-API
+ */
+
+
+void RegisterSortFunc(const char *name, long len,
+ const char *prepend, long preplen,
+ CompareFunc Forward,
+ CompareFunc Reverse,
+ CompareFunc GroupChange,
+ long ContextType)
+{
+ SortStruct *NewSort = (SortStruct*) malloc(sizeof(SortStruct));
+ NewSort->Name = NewStrBufPlain(name, len);
+ if (prepend != NULL)
+ NewSort->PrefPrepend = NewStrBufPlain(prepend, preplen);
+ else
+ NewSort->PrefPrepend = NULL;
+ NewSort->Forward = Forward;
+ NewSort->Reverse = Reverse;
+ NewSort->GroupChange = GroupChange;
+ NewSort->ContextType = ContextType;
+ Put(SortHash, name, len, NewSort, DestroySortStruct);
+}
+
+CompareFunc RetrieveSort(WCTemplputParams *TP, const char *OtherPrefix,
+ const char *Default, long ldefault, long DefaultDirection)
+{
+ int isdefault = 0;
+ const StrBuf *BSort = NULL;
+ SortStruct *SortBy;
+ void *vSortBy;
+ long SortOrder = -1;
+
+ if (havebstr("SortBy")) {
+ BSort = sbstr("SortBy");
+ }
+ else { /** Try to fallback to our remembered values... */
+ if (OtherPrefix == NULL) {
+ BSort = get_room_pref("sort");
+ }
+ else {
+ /*TODO: nail prefprepend to sort, and lookup this! */
+ }
+ if (BSort != NULL)
+ putbstr("SortBy", NewStrBufDup(BSort));
+ else {
+ StrBuf *Buf;
+
+ BSort = Buf = NewStrBufPlain(Default, ldefault);
+ putbstr("SortBy", Buf);
+ }
+ }
+
+ if (!GetHash(SortHash, SKEY(BSort), &vSortBy) ||
+ (vSortBy == NULL)) {
+ isdefault = 1;
+ if (!GetHash(SortHash, Default, ldefault, &vSortBy) ||
+ (vSortBy == NULL)) {
+ LogTemplateError(
+ NULL, "Sorting", ERR_PARM1, TP,
+ "Illegal default sort: [%s]", Default);
+ wc_backtrace();
+ }
+ }
+ SortBy = (SortStruct*)vSortBy;
+
+ /** Ok, its us, lets see in which direction we should sort... */
+ if (havebstr("SortOrder")) {
+ SortOrder = LBSTR("SortOrder");
+ }
+ else { /** Try to fallback to our remembered values... */
+ StrBuf *Buf = NULL;
+ if (SortBy->PrefPrepend == NULL) {
+ Buf = get_room_pref("SortOrder");
+ SortOrder = StrTol(Buf);
+ }
+ else {
+ /* TODO: nail prefprepend to sort, and lookup this! */
+ }
+
+ if (Buf == NULL)
+ SortOrder = DefaultDirection;
+
+ Buf = NewStrBufPlain(NULL, 64);
+ StrBufPrintf(Buf, "%ld", SortOrder);
+ putbstr("SortOrder", Buf);
+ }
+ switch (SortOrder) {
+ default:
+ case 0:
+ return NULL;
+ case 1:
+ return SortBy->Forward;
+ case 2:
+ return SortBy->Reverse;
+ }
+}
+
+
+enum {
+ eNO_SUCH_SORT,
+ eNOT_SPECIFIED,
+ eINVALID_PARAM,
+ eFOUND
+};
+
+ConstStr SortIcons[] = {
+ {HKEY("static/sort_none.gif")},
+ {HKEY("static/up_pointer.gif")},
+ {HKEY("static/down_pointer.gif")},
+};
+
+ConstStr SortNextOrder[] = {
+ {HKEY("1")},
+ {HKEY("2")},
+ {HKEY("0")},
+};
+
+
+int GetSortMetric(WCTemplputParams *TP, SortStruct **Next, SortStruct **Param, long *SortOrder)
+{
+ int bSortError = eNOT_SPECIFIED;
+ const StrBuf *BSort;
+ void *vSort;
+
+ *SortOrder = 0;
+ *Next = NULL;
+ if (!GetHash(SortHash, TKEY(0), &vSort) ||
+ (vSort == NULL))
+ return eNO_SUCH_SORT;
+ *Param = (SortStruct*) vSort;
+
+
+ if (havebstr("SortBy")) {
+ BSort = sbstr("SortBy");
+ bSortError = eINVALID_PARAM;
+ }
+ else { /** Try to fallback to our remembered values... */
+ if ((*Param)->PrefPrepend == NULL) {
+ BSort = get_room_pref("sort");
+ }
+ else {
+ BSort = NULL;/* TODO: nail prefprepend to sort, and lookup this! */
+ }
+ }
+
+ if (!GetHash(SortHash, SKEY(BSort), &vSort) ||
+ (vSort == NULL))
+ return bSortError;
+
+ *Next = (SortStruct*) vSort;
+
+ /** Ok, its us, lets see in which direction we should sort... */
+ if (havebstr("SortOrder")) {
+ *SortOrder = LBSTR("SortOrder");
+ }
+ else { /** Try to fallback to our remembered values... */
+ if ((*Param)->PrefPrepend == NULL) {
+ *SortOrder = StrTol(get_room_pref("SortOrder"));
+ }
+ else {
+ *SortOrder = 0;/* TODO: nail prefprepend to sort, and lookup this! */
+ }
+ }
+ if (*SortOrder > 2)
+ *SortOrder = 0;
+
+ return eFOUND;
+}
+
+
+void tmplput_SORT_ICON(StrBuf *Target, WCTemplputParams *TP)
+{
+ long SortOrder;
+ SortStruct *Next;
+ SortStruct *Param;
+ const ConstStr *SortIcon;
+
+ switch (GetSortMetric(TP, &Next, &Param, &SortOrder)){
+ case eNO_SUCH_SORT:
+ LogTemplateError(
+ Target, "Sorter", ERR_PARM1, TP,
+ " Sorter [%s] unknown!",
+ TP->Tokens->Params[0]->Start);
+ break;
+ case eINVALID_PARAM:
+ LogTemplateError(NULL, "Sorter", ERR_PARM1, TP,
+ " Sorter specified by BSTR 'SortBy' [%s] unknown!",
+ bstr("SortBy"));
+ case eNOT_SPECIFIED:
+ case eFOUND:
+ if (Next == Param) {
+ SortIcon = &SortIcons[SortOrder];
+ }
+ else { /** Not Us... */
+ SortIcon = &SortIcons[0];
+ }
+ StrBufAppendBufPlain(Target, SortIcon->Key, SortIcon->len, 0);
+ }
+}
+
+void tmplput_SORT_NEXT(StrBuf *Target, WCTemplputParams *TP)
+{
+ long SortOrder;
+ SortStruct *Next;
+ SortStruct *Param;
+
+ switch (GetSortMetric(TP, &Next, &Param, &SortOrder)){
+ case eNO_SUCH_SORT:
+ LogTemplateError(
+ Target, "Sorter", ERR_PARM1, TP,
+ " Sorter [%s] unknown!",
+ TP->Tokens->Params[0]->Start);
+ break;
+ case eINVALID_PARAM:
+ LogTemplateError(
+ NULL, "Sorter", ERR_PARM1, TP,
+ " Sorter specified by BSTR 'SortBy' [%s] unknown!",
+ bstr("SortBy"));
+ case eNOT_SPECIFIED:
+ case eFOUND:
+ StrBufAppendBuf(Target, Param->Name, 0);
+
+ }
+}
+
+void tmplput_SORT_ORDER(StrBuf *Target, WCTemplputParams *TP)
+{
+ long SortOrder;
+ const ConstStr *SortOrderStr;
+ SortStruct *Next;
+ SortStruct *Param;
+
+ switch (GetSortMetric(TP, &Next, &Param, &SortOrder)){
+ case eNO_SUCH_SORT:
+ LogTemplateError(
+ Target, "Sorter", ERR_PARM1, TP,
+ " Sorter [%s] unknown!",
+ TP->Tokens->Params[0]->Start);
+ break;
+ case eINVALID_PARAM:
+ LogTemplateError(
+ NULL, "Sorter", ERR_PARM1, TP,
+ " Sorter specified by BSTR 'SortBy' [%s] unknown!",
+ bstr("SortBy"));
+ case eNOT_SPECIFIED:
+ case eFOUND:
+ if (Next == Param) {
+ SortOrderStr = &SortNextOrder[SortOrder];
+ }
+ else { /** Not Us... */
+ SortOrderStr = &SortNextOrder[0];
+ }
+ StrBufAppendBufPlain(Target, SortOrderStr->Key, SortOrderStr->len, 0);
+ }
+}
+
+
+void tmplput_long_vector(StrBuf *Target, WCTemplputParams *TP)
+{
+ long *LongVector = (long*) CTX;
+
+ if ((TP->Tokens->Params[0]->Type == TYPE_LONG) &&
+ (TP->Tokens->Params[0]->lvalue <= LongVector[0]))
+ {
+ StrBufAppendPrintf(Target, "%ld", LongVector[TP->Tokens->Params[0]->lvalue]);
+ }
+ else
+ {
+ if (TP->Tokens->Params[0]->Type != TYPE_LONG) {
+ LogTemplateError(
+ Target, "Longvector", ERR_NAME, TP,
+ "needs a numerical Parameter!");
+ }
+ else {
+ LogTemplateError(
+ Target, "LongVector", ERR_PARM1, TP,
+ "doesn't have %ld Parameters, its just the size of %ld!",
+ TP->Tokens->Params[0]->lvalue,
+ LongVector[0]);
+ }
+ }
+}
+
+void dbg_print_longvector(long *LongVector)
+{
+ StrBuf *Buf = NewStrBufPlain(HKEY("Longvector: ["));
+ int nItems = LongVector[0];
+ int i;
+
+ for (i = 0; i < nItems; i++) {
+ if (i + 1 < nItems)
+ StrBufAppendPrintf(Buf, "%d: %ld | ", i, LongVector[i]);
+ else
+ StrBufAppendPrintf(Buf, "%d: %ld]\n", i, LongVector[i]);
+
+ }
+ lprintf(1, ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+}
+
+int ConditionalLongVector(StrBuf *Target, WCTemplputParams *TP)
+{
+ long *LongVector = (long*) CTX;
+
+ if ((TP->Tokens->Params[2]->Type == TYPE_LONG) &&
+ (TP->Tokens->Params[2]->lvalue <= LongVector[0])&&
+ (TP->Tokens->Params[3]->Type == TYPE_LONG) &&
+ (TP->Tokens->Params[3]->lvalue <= LongVector[0]))
+ {
+ return LongVector[TP->Tokens->Params[2]->lvalue] ==
+ LongVector[TP->Tokens->Params[3]->lvalue];
+ }
+ else
+ {
+ if ((TP->Tokens->Params[2]->Type == TYPE_LONG) ||
+ (TP->Tokens->Params[2]->Type == TYPE_LONG)) {
+ LogTemplateError(
+ Target, "ConditionalLongvector", ERR_PARM1, TP,
+ "needs two long Parameter!");
+ }
+ else {
+ LogTemplateError(
+ Target, "Longvector", ERR_PARM1, TP,
+ "doesn't have %ld / %ld Parameters, its just the size of %ld!",
+ TP->Tokens->Params[2]->lvalue,
+ TP->Tokens->Params[3]->lvalue,
+ LongVector[0]);
+ }
+ }
+ return 0;
+}
+
void
InitModule_SUBST
(void)
{
+ memset(&NoCtx, 0, sizeof(WCTemplputParams));
+ RegisterNamespace("SORT:ICON", 1, 1, tmplput_SORT_ICON, CTX_NONE);
+ RegisterNamespace("SORT:ORDER", 1, 1, tmplput_SORT_ORDER, CTX_NONE);
+ RegisterNamespace("SORT:NEXT", 1, 1, tmplput_SORT_NEXT, CTX_NONE);
RegisterNamespace("CONTEXTSTR", 0, 1, tmplput_ContextString, CTX_STRBUF);
RegisterNamespace("ITERATE", 2, 100, tmpl_iterate_subtmpl, CTX_NONE);
RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed, CTX_NONE);
RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed, CTX_NONE);
+ RegisterNamespace("LONGVECTOR", 1, 1, tmplput_long_vector, CTX_LONGVECTOR);
RegisterConditional(HKEY("COND:SUBST"), 3, ConditionalVar, CTX_NONE);
RegisterConditional(HKEY("COND:CONTEXTSTR"), 3, ConditionalContextStr, CTX_STRBUF);
+ RegisterConditional(HKEY("COND:LONGVECTOR"), 4, ConditionalLongVector, CTX_LONGVECTOR);
}
/*@}*/