* defines may now be ored or anded

[citadel.git] / webcit / subst.c

diff --git a/webcit/subst.c b/webcit/subst.c
index c12b6590832156be1ee31611d45b6dba4679cd10..ee0e324e726bafe5cd84db4083d9f5ff5f72b6b1 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -149,19 +149,13 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
        va_end(arg_ptr);
 
        switch (ErrorPos) {
-       default:
        case ERR_NAME: /* the main token name... */ 
                Err = (TP->Tokens!= NULL)? TP->Tokens->pName:"";
                break;
-       case ERR_PARM1:
-               Err = ((TP->Tokens!= NULL) && 
-                      (TP->Tokens->nParameters > 0))? 
-                       TP->Tokens->Params[0]->Start : "";
-               break;
-       case ERR_PARM2:
+       default:
                Err = ((TP->Tokens!= NULL) && 
-                      (TP->Tokens->nParameters > 1))? 
-                       TP->Tokens->Params[1]->Start : "";
+                      (TP->Tokens->nParameters > ErrorPos - 1))? 
+                       TP->Tokens->Params[ErrorPos - 1]->Start : "";
                break;
        }
        if (TP->Tokens != NULL) 
@@ -1144,12 +1138,13 @@ void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
        Template->Tokens[(Template->nTokensUsed)++] = NewToken;
 }
 
-TemplateParam *GetNextParameter(StrBuf *Buf, 
-                               const char **pCh, 
-                               const char *pe, 
-                               WCTemplateToken *Tokens, 
-                               WCTemplate *pTmpl, 
-                               WCTemplputParams *TP)
+int GetNextParameter(StrBuf *Buf, 
+                    const char **pCh, 
+                    const char *pe, 
+                    WCTemplateToken *Tokens, 
+                    WCTemplate *pTmpl, 
+                    WCTemplputParams *TP, 
+                    TemplateParam **pParm)
 {
        const char *pch = *pCh;
        const char *pchs, *pche;
@@ -1157,7 +1152,7 @@ TemplateParam *GetNextParameter(StrBuf *Buf,
        char quote = '\0';
        int ParamBrace = 0;
 
-       Parm = (TemplateParam *) malloc(sizeof(TemplateParam));
+       *pParm = Parm = (TemplateParam *) malloc(sizeof(TemplateParam));
        memset(Parm, 0, sizeof(TemplateParam));
        Parm->Type = TYPE_STR;
 
@@ -1236,7 +1231,8 @@ TemplateParam *GetNextParameter(StrBuf *Buf,
                                *pCh);
                        pch ++;
                        free(Parm);
-                       return NULL;
+                       *pParm = NULL;
+                       return 0;
                }
                else {
                        StrBufPeek(Buf, pch, -1, '\0');         
@@ -1279,7 +1275,8 @@ TemplateParam *GetNextParameter(StrBuf *Buf,
                                *pCh);
                                */
                        free(Parm);
-                       return NULL;
+                       *pParm = NULL;
+                       return 0;
                }
        }
        while ((*pch == ' ' )||
@@ -1306,9 +1303,84 @@ TemplateParam *GetNextParameter(StrBuf *Buf,
                
                        Parm->lvalue = *PVal;
                }
-               else 
+               else if (strchr(Parm->Start, '|') != NULL)
                {
-                       LogTemplateError(NULL, "Define", ERR_PARM1, TP,
+                       const char *Pos;
+                       StrBuf *pToken;
+                       StrBuf *Match;
+
+                       Parm->MaskBy = eOR;
+                       pToken = NewStrBufPlain (Parm->Start, Parm->len);
+                       Match = NewStrBufPlain (NULL, Parm->len);
+                       Pos = ChrPtr(pToken);
+                       
+                       while ((Pos != NULL) && (Pos != StrBufNOTNULL))
+                       {
+                               StrBufExtract_NextToken(Match, pToken, &Pos, '|');
+                               StrBufTrim(Match);
+                               if (StrLength (Match) > 0)
+                               {
+                                       if (GetHash(Defines, SKEY(Match), &vPVal) &&
+                                           (vPVal != NULL))
+                                       {
+                                               long *PVal;
+                                               PVal = (long*) vPVal;
+                                               
+                                               Parm->lvalue |= *PVal;
+                                       }
+                                       else {
+                                               LogTemplateError(NULL, "Define", 
+                                                                Tokens->nParameters,
+                                                                TP,
+                                                                "%s isn't known!!",
+                                                                ChrPtr(Match));
+
+                                       }
+                               }
+                       }
+               }
+               else if (strchr(Parm->Start, '&') != NULL)
+               {
+                       const char *Pos;
+                       StrBuf *pToken;
+                       StrBuf *Match;
+
+                       Parm->MaskBy = eAND;
+                       pToken = NewStrBufPlain (Parm->Start, Parm->len);
+                       Match = NewStrBufPlain (NULL, Parm->len);
+                       Pos = ChrPtr(pToken);
+                       
+                       while ((Pos != NULL) && (Pos != StrBufNOTNULL))
+                       {
+                               StrBufExtract_NextToken(Match, pToken, &Pos, '&');
+                               StrBufTrim(Match);
+                               if (StrLength (Match) > 0)
+                               {
+                                       if (GetHash(Defines, SKEY(Match), &vPVal) &&
+                                           (vPVal != NULL))
+                                       {
+                                               long *PVal;
+                                               PVal = (long*) vPVal;
+                                               
+                                               Parm->lvalue |= *PVal;
+                                       }
+                                       else {
+                                               LogTemplateError(NULL, "Define", 
+                                                                Tokens->nParameters,
+                                                                TP,
+                                                                "%s isn't known!!",
+                                                                ChrPtr(Match));
+
+                                       }
+                               }
+                       }
+               }
+               else {
+
+
+                       LogTemplateError(NULL, "Define", 
+                                        Tokens->nParameters,
+                                        TP,
                                         "%s isn't known!!",
                                         Parm->Start);
                }}
@@ -1318,14 +1390,16 @@ TemplateParam *GetNextParameter(StrBuf *Buf,
                /* well, we don't check the mobile stuff here... */
                if (!GetHash(LocalTemplateCache, Parm->Start, Parm->len, &vTmpl) &&
                    !GetHash(TemplateCache, Parm->Start, Parm->len, &vTmpl)) {
-                       LogTemplateError(
-                               NULL, "SubTemplate", ERR_PARM1, TP,
-                               "referenced here doesn't exist");
+                       LogTemplateError(NULL, 
+                                        "SubTemplate", 
+                                        Tokens->nParameters,
+                                        TP,
+                                        "referenced here doesn't exist");
                }}
                break;
        }
        *pCh = pch;
-       return Parm;
+       return 1;
 }
 
 WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf, 
@@ -1337,7 +1411,6 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 {
        void *vVar;
        const char *pch;
-       TemplateParam *Param;
        WCTemplateToken *NewToken;
        WCTemplputParams TP;
 
@@ -1374,8 +1447,15 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
                                        "Warning, Non welformed Token; missing right parenthesis");
                        }
                        while (pch < pTokenEnd - 1) {
-                               Param = GetNextParameter(Buf, &pch, pTokenEnd - 1, NewToken, pTmpl, &TP);
-                               if (Param != NULL) {
+                               NewToken->nParameters++;
+                               if (GetNextParameter(Buf, 
+                                                    &pch, 
+                                                    pTokenEnd - 1, 
+                                                    NewToken, 
+                                                    pTmpl, 
+                                                    &TP, 
+                                                    &NewToken->Params[NewToken->nParameters - 1]))
+                               {
                                        NewToken->HaveParameters = 1;
                                        if (NewToken->nParameters > MAXPARAM) {
                                                LogTemplateError(
@@ -1383,11 +1463,9 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
                                                        "only [%d] Params allowed in Tokens",
                                                        MAXPARAM);
 
-                                               free(Param);
                                                FreeToken(&NewToken);
                                                return NULL;
                                        }
-                                       NewToken->Params[NewToken->nParameters++] = Param;
                                }
                                else break;
                        }
@@ -2141,6 +2219,7 @@ int preeval_iterate(WCTemplateToken *Token)
        WCTemplputParams *TP;
        void *vTmpl;
        void *vIt;
+       HashIterator *It;
 
        memset(&TPP, 0, sizeof(WCTemplputParams));
        TP = &TPP;
@@ -2164,6 +2243,16 @@ int preeval_iterate(WCTemplateToken *Token)
                                 "referenced here doesn't exist");
        }
        Token->Preeval2 = vIt;
+       It = (HashIterator *) vIt;
+
+       if (TP->Tokens->nParameters < It->AdditionalParams + 2) {
+               LogTemplateError(                               
+                       NULL, "Iterator", ERR_PARM1, TP,
+                       "doesn't work with %d params", 
+                       TP->Tokens->nParameters);
+       }
+
+
        return 1;
 }
 
@@ -2200,7 +2289,7 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
                LogTemplateError(                               
                        Target, "Iterator", ERR_PARM1, TP,
                        "doesn't work with %d params", 
-                       TP->Tokens->nParameters);
+                       TP->Tokens->nParameters - 1);
                return;
        }
 
@@ -3034,7 +3123,7 @@ InitModule_SUBST
        RegisterNamespace("SORT:ORDER", 1, 2, tmplput_SORT_ORDER, NULL, CTX_NONE);
        RegisterNamespace("SORT:NEXT", 1, 2, tmplput_SORT_NEXT, NULL, CTX_NONE);
        RegisterNamespace("CONTEXTSTR", 0, 1, tmplput_ContextString, NULL, CTX_STRBUF);
-       RegisterNamespace("CONTEXTSTRARR", 1, 2, tmplput_ContextStringArray, NULL, CTX_STRBUF);
+       RegisterNamespace("CONTEXTSTRARR", 1, 2, tmplput_ContextStringArray, NULL, CTX_STRBUFARR);
        RegisterNamespace("ITERATE", 2, 100, tmpl_iterate_subtmpl, preeval_iterate, CTX_NONE);
        RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed, NULL, CTX_NONE);
        RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed, preeval_do_tabbed, CTX_NONE);
@@ -3046,6 +3135,7 @@ InitModule_SUBST
        RegisterConditional(HKEY("COND:CONTEXTSTRARR"), 4, ConditionalContextStrinArray, CTX_STRBUFARR);
        RegisterConditional(HKEY("COND:LONGVECTOR"), 4, ConditionalLongVector, CTX_LONGVECTOR);
 
+
        RegisterControlConditional(HKEY("COND:ITERATE:ISGROUPCHANGE"), 2, 
                                   conditional_ITERATE_ISGROUPCHANGE, 
                                   CTX_ITERATE);