#include <unistd.h>
#include <dirent.h>
#include <errno.h>
+#include <stdarg.h>
+#define SHOW_ME_VAPPEND_PRINTF
#include "webcit.h"
#include "webserver.h"
HashList *Iterators;
HashList *Contitionals;
+int LoadTemplates = 0;
+
#define SV_GETTEXT 1
#define SV_CONDITIONAL 2
#define SV_NEG_CONDITIONAL 3
+#define SV_CUST_STR_CONDITIONAL 4
+#define SV_SUBTEMPL 5
typedef struct _WCTemplate {
StrBuf *Data;
+ StrBuf *FileName;
int nTokensUsed;
int TokenSpace;
WCTemplateToken **Tokens;
WCHandlerFunc HandlerFunc;
}HashHandler;
+void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere);
+
void RegisterNS(const char *NSName, long len, int nMinArgs, int nMaxArgs, WCHandlerFunc HandlerFunc)
{
HashHandler *NewHandler;
switch(ptr->wcs_type) {
case WCS_STRING:
- lprintf(1, " -> %s\n", ptr->wcs_value);
+ lprintf(1, " -> %s\n", ChrPtr(ptr->wcs_value));
break;
case WCS_SERVCMD:
- lprintf(1, " -> Server [%s]\n", ptr->wcs_value);
+ lprintf(1, " -> Server [%s]\n", ChrPtr(ptr->wcs_value));
break;
case WCS_FUNCTION:
lprintf(1, " -> function at [%0xd]\n", ptr->wcs_function);
void clear_substs(struct wcsession *wc) {
if (wc->vars != NULL) {
-
DeleteHash(&wc->vars);
}
}
clear_substs (WC);
}
+int NeedNewBuf(type)
+{
+ switch(type) {
+ case WCS_STRING:
+ case WCS_SERVCMD:
+ case WCS_STRBUF:
+ return 1;
+ case WCS_FUNCTION:
+ case WCS_STRBUF_REF:
+ case WCS_LONG:
+ default:
+ return 0;
+ }
+}
+
+void FlushPayload(wcsubst *ptr, int reusestrbuf, int type)
+{
+ int NeedNew = NeedNewBuf(type);
+ switch(ptr->wcs_type) {
+ case WCS_STRING:
+ case WCS_SERVCMD:
+ case WCS_STRBUF:
+ if (reusestrbuf && NeedNew) {
+ FlushStrBuf(ptr->wcs_value);
+ }
+ else {
+
+ FreeStrBuf(&ptr->wcs_value);
+ ptr->wcs_value = NULL;
+ }
+ break;
+ case WCS_FUNCTION:
+ ptr->wcs_function = NULL;
+ if (reusestrbuf && NeedNew)
+ ptr->wcs_value = NewStrBuf();
+ break;
+ case WCS_STRBUF_REF:
+ ptr->wcs_value = NULL;
+ if (reusestrbuf && NeedNew)
+ ptr->wcs_value = NewStrBuf();
+ break;
+ case WCS_LONG:
+ ptr->lvalue = 0;
+ if (reusestrbuf && NeedNew)
+ ptr->wcs_value = NewStrBuf();
+ break;
+ default:
+ if (reusestrbuf && NeedNew)
+ ptr->wcs_value = NewStrBuf();
+ break;
+ }
+}
+
/**
* \brief destructor; kill one entry.
*/
void deletevar(void *data)
{
wcsubst *ptr = (wcsubst*)data;
-// if ((wc->vars->wcs_type == WCS_STRING)
-// || (wc->vars->wcs_type == WCS_SERVCMD)) {
- if (ptr->wcs_type != WCS_FUNCTION)
- free(ptr->wcs_value);
+ FlushPayload(ptr, 0, ptr->wcs_type);
free(ptr);
}
+
+wcsubst *NewSubstVar(const char *keyname, int keylen, int type)
+{
+ wcsubst* ptr;
+ struct wcsession *WCC = WC;
+
+ ptr = (wcsubst *) malloc(sizeof(wcsubst));
+ memset(ptr, 0, sizeof(wcsubst));
+
+ ptr->wcs_type = type;
+ safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
+ Put(WCC->vars, keyname, keylen, ptr, deletevar);
+
+ switch(ptr->wcs_type) {
+ case WCS_STRING:
+ case WCS_SERVCMD:
+ ptr->wcs_value = NewStrBuf();
+ break;
+ case WCS_STRBUF:
+ case WCS_FUNCTION:
+ case WCS_STRBUF_REF:
+ case WCS_LONG:
+ default:
+ break;
+ }
+ return ptr;
+}
+
+
/**
* \brief Add a substitution variable (local to this session) (strlen version...)
* \param keyname the replacementstring to substitute
void SVPRINTF(char *keyname, int keytype, const char *format,...)
{
va_list arg_ptr;
- char wbuf[SIZ];
void *vPtr;
wcsubst *ptr = NULL;
size_t keylen;
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);
+ FlushPayload(ptr, keytype, keytype);
+ ptr->wcs_type = keytype;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, keytype);
}
- /** Format the string and save it */
-
+ /** Format the string */
va_start(arg_ptr, format);
- vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
+ StrBufVAppendPrintf(ptr->wcs_value, format, arg_ptr);
va_end(arg_ptr);
-
- ptr->wcs_function = NULL;
- ptr->wcs_type = keytype;
- ptr->wcs_value = strdup(wbuf);
}
/**
void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...)
{
va_list arg_ptr;
- char wbuf[SIZ];
void *vPtr;
wcsubst *ptr = NULL;
struct wcsession *WCC = WC;
- size_t len;
-
+
/**
* First look if we're doing a replacement of
* an existing key
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);
+ FlushPayload(ptr, 1, keytype);
+ ptr->wcs_type = keytype;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, keytype);
}
/** Format the string and save it */
-
va_start(arg_ptr, format);
- len = vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
+ StrBufVAppendPrintf(ptr->wcs_value, format, arg_ptr);
va_end(arg_ptr);
-
- ptr->wcs_value = (char*) malloc(len + 1);
- memcpy(ptr->wcs_value, wbuf, len + 1);
- ptr->wcs_function = NULL;
- ptr->wcs_type = keytype;
}
/**
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);
+ FlushPayload(ptr, 1, keytype);
+ ptr->wcs_type = keytype;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, keytype);
}
-
- ptr->wcs_function = NULL;
- ptr->wcs_type = keytype;
- ptr->wcs_value = strdup(Data);
+ StrBufAppendBufPlain(ptr->wcs_value, Data, -1, 0);
}
/**
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);
+ FlushPayload(ptr, 1, WCS_LONG);
+ ptr->wcs_type = WCS_LONG;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, WCS_LONG);
}
-
- ptr->wcs_function = NULL;
- ptr->wcs_type = WCS_LONG;
ptr->lvalue = Data;
}
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);
+ FlushPayload(ptr, 1, WCS_FUNCTION);
+ ptr->wcs_type = WCS_FUNCTION;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, WCS_FUNCTION);
}
- ptr->wcs_value = NULL;
- ptr->wcs_type = WCS_FUNCTION;
ptr->wcs_function = fcn_ptr;
}
inline void SVCALLBACK(char *keyname, var_callback_fptr fcn_ptr)
/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
ptr = (wcsubst*)vPtr;
- if (ptr->wcs_value != NULL)
- free(ptr->wcs_value);///TODO: respect type
+ FlushPayload(ptr, 0, (ref)?WCS_STRBUF_REF:WCS_STRBUF);
+ ptr->wcs_type = (ref)?WCS_STRBUF_REF:WCS_STRBUF;
}
else /** Otherwise allocate a new one */
{
- ptr = (wcsubst *) malloc(sizeof(wcsubst));
- safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
- Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ ptr = NewSubstVar(keyname, keylen, (ref)?WCS_STRBUF_REF:WCS_STRBUF);
}
-
- ptr->wcs_value = NULL;
- ptr->wcs_type = (ref)?WCS_STRBUF:WCS_STRBUF_REF;
- ptr->wcs_function = (var_callback_fptr) Buf; ////TODO
+ ptr->wcs_value = Buf;
}
/**
* \brief back end for print_value_of() ... does a server command
* \param servcmd server command to execute on the citadel server
*/
-void pvo_do_cmd(StrBuf *Target, char *servcmd) {
+void pvo_do_cmd(StrBuf *Target, StrBuf *servcmd) {
char buf[SIZ];
int len;
- serv_puts(servcmd);
+ serv_puts(ChrPtr(servcmd));
len = serv_getln(buf, sizeof buf);
switch(buf[0]) {
void *vVar;
/*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
+ /// TODO: debricated!
if (keyname[0] == '=') {
DoTemplate(keyname+1, keylen - 1, NULL, NULL);
}
ptr = (wcsubst*) vVar;
switch(ptr->wcs_type) {
case WCS_STRING:
- StrBufAppendBufPlain(Target, (const char*)ptr->wcs_value, -1, 0);
+ StrBufAppendBuf(Target, ptr->wcs_value, 0);
break;
case WCS_SERVCMD:
pvo_do_cmd(Target, ptr->wcs_value);
break;
case WCS_STRBUF:
case WCS_STRBUF_REF:
- StrBufAppendBuf(Target, (StrBuf*) ptr->wcs_function, 0);
+ StrBufAppendBuf(Target, ptr->wcs_value, 0);
break;
case WCS_LONG:
- StrBufAppendPrintf(Target, "%l", ptr->lvalue);
+ StrBufAppendPrintf(Target, "%ld", ptr->lvalue);
break;
default:
lprintf(1,"WARNING: invalid value in SV-Hash at %s!", keyname);
Template->Tokens[(Template->nTokensUsed)++] = NewToken;
}
-TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
+TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, WCTemplateToken *Token, WCTemplate *pTmpl)
{
const char *pch = *pCh;
const char *pchs, *pche;
}
pche = pch;
if (*pch != quote) {
- lprintf(1, "Error evaluating template param [%s]\n", *pCh);
+ lprintf(1, "Error (in '%s' line %ld); "
+ "evaluating template param [%s] in Token [%s]\n",
+ ChrPtr(pTmpl->FileName),
+ Token->Line,
+ ChrPtr(Token->FlatToken),
+ *pCh);
pch ++;
free(Parm);
return NULL;
}
else {
StrBufPeek(Buf, pch, -1, '\0');
- lprintf(1, "DBG: got param [%s]\n", pchs);
+ if (LoadTemplates > 1) {
+ lprintf(1, "DBG: got param [%s] %ld %ld\n",
+ pchs, pche - pchs, strlen(pchs));
+ }
Parm->Start = pchs;
Parm->len = pche - pchs;
pch ++; /* move after trailing quote */
}
else {
Parm->lvalue = 0;
- lprintf(1, "Error evaluating template long param [%s]", *pCh);
+ lprintf(1, "Error (in '%s' line %ld); "
+ "evaluating long template param [%s] in Token [%s]\n",
+ ChrPtr(pTmpl->FileName),
+ Token->Line,
+ ChrPtr(Token->FlatToken),
+ *pCh);
free(Parm);
return NULL;
}
WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
const char *pStart,
const char *pTmplStart,
- const char *pTmplEnd)
+ const char *pTmplEnd,
+ long Line,
+ WCTemplate *pTmpl)
{
const char *pch;
TemplateParam *Param;
WCTemplateToken *NewToken = (WCTemplateToken*)malloc(sizeof(WCTemplateToken));
NewToken->Flags = 0;
+ NewToken->Line = Line + 1;
NewToken->pTokenStart = pTmplStart;
NewToken->TokenStart = pTmplStart - pStart;
NewToken->TokenEnd = (pTmplEnd - pStart) - NewToken->TokenStart;
NewToken->pTokenEnd = pTmplEnd;
NewToken->NameEnd = NewToken->TokenEnd - 2;
+ NewToken->FlatToken = NewStrBufPlain(pTmplStart, pTmplEnd - pTmplStart);
StrBufPeek(Buf, pTmplStart, + 1, '\0');
StrBufPeek(Buf, pTmplEnd, -1, '\0');
NewToken->NameEnd = pch - NewToken->pName;
pch ++;
while (pch < pTmplEnd - 1) {
- Param = GetNextParamter(Buf, &pch, pTmplEnd - 1);
+ Param = GetNextParameter(Buf, &pch, pTmplEnd - 1, NewToken, pTmpl);
if (Param != NULL) {
NewToken->HaveParameters = 1;
if (NewToken->nParameters > MAXPARAM) {
lprintf(1, "Only %ld Tokens supported!\n", MAXPARAM);
+ free(Param);
return NULL;
}
NewToken->Params[NewToken->nParameters++] = Param;
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_CUST_STR_CONDITIONAL;
else if ((NewToken->nParameters >= 2) &&
(*(NewToken->pName) == '?'))
NewToken->Flags = SV_CONDITIONAL;
return NewToken;
}
+void FreeToken(WCTemplateToken **Token)
+{
+ int i;
+ FreeStrBuf(&(*Token)->FlatToken);
+ if ((*Token)->HaveParameters)
+ for (i = 0; i < (*Token)->nParameters; i++)
+ free((*Token)->Params[i]);
+ free(*Token);
+ *Token = NULL;
+}
+
+
+
void FreeWCTemplate(void *vFreeMe)
{
int i;
if (FreeMe->TokenSpace > 0) {
for (i = 0; i < FreeMe->nTokensUsed; i ++) {
- free(FreeMe->Tokens[i]);
+ FreeToken(&FreeMe->Tokens[i]);
}
free(FreeMe->Tokens);
}
+ FreeStrBuf(&FreeMe->FileName);
+ FreeStrBuf(&FreeMe->Data);
free(FreeMe);
}
-int EvaluateConditional(WCTemplateToken *Token, void *Context, int Neg, int state)
+int EvaluateConditional(WCTemplateToken *Token, WCTemplate *pTmpl, void *Context, int Neg, int state)
{
void *vConditional;
ConditionalStruct *Cond;
Token->Params[0]->Start,
Token->Params[0]->len,
&vConditional)) {
- lprintf(1, "Conditional %s Not found!\n",
- Token->Params[0]->Start);
+ lprintf(1, "Conditional [%s] (in '%s' line %ld); Not found![%s]\n",
+ Token->Params[0]->Start,
+ ChrPtr(pTmpl->FileName),
+ Token->Line,
+ ChrPtr(Token->FlatToken));
}
Cond = (ConditionalStruct *) vConditional;
if (Cond == NULL) {
- lprintf(1, "Conditional %s Not found!\n",
- Token->Params[0]->Start);
+ lprintf(1, "Conditional [%s] (in '%s' line %ld); Not found![%s]\n",
+ Token->Params[0]->Start,
+ ChrPtr(pTmpl->FileName),
+ Token->Line,
+ ChrPtr(Token->FlatToken));
return 0;
}
if (Token->nParameters < Cond->nParams) {
- lprintf(1, "Conditional [%s] needs %ld Params!\n",
+ lprintf(1, "Conditional [%s] (in '%s' line %ld); needs %ld Params![%s]\n",
Token->Params[0]->Start,
- Cond->nParams);
+ ChrPtr(pTmpl->FileName),
+ Token->Line,
+ Cond->nParams,
+ ChrPtr(Token->FlatToken));
return 0;
}
if (Cond->CondF(Token, Context) == Neg)
return 0;
}
-int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, void *Context, int state)
+int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, WCTemplate *pTmpl, void *Context, int state)
{
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) {
- return EvaluateConditional(Token, Context, 1, state);
- }
- else if (Token->Flags == 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_CONDITIONAL: /** Forward conditional evaluation */
+ return EvaluateConditional(Token, pTmpl, Context, 1, state);
+ break;
+ case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
+ return EvaluateConditional(Token, pTmpl, Context, 0, state);
+ break;
+ case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
+ if (Token->nParameters >= 6) {
+ if (EvaluateConditional(Token, pTmpl, Context, 0, state))
+ StrBufAppendBufPlain(Target,
+ Token->Params[5]->Start,
+ Token->Params[5]->len,
+ 0);
+ else
+ StrBufAppendBufPlain(Target,
+ Token->Params[4]->Start,
+ Token->Params[4]->len,
+ 0);
+ }
+ 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;
}
void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, void *Context)
{
+ WCTemplate *pTmpl = Tmpl;
int done = 0;
int i, state;
const char *pData, *pS;
long len;
- pS = pData = ChrPtr(Tmpl->Data);
- len = StrLength(Tmpl->Data);
+ if (LoadTemplates != 0) {
+ if (LoadTemplates > 1)
+ lprintf(1, "DBG: ----- loading: [%s] ------ \n",
+ ChrPtr(Tmpl->FileName));
+ pTmpl = load_template(Tmpl->FileName, NULL, NULL);
+ }
+
+ pS = pData = ChrPtr(pTmpl->Data);
+ len = StrLength(pTmpl->Data);
i = 0;
state = 0;
while (!done) {
- if (i >= Tmpl->nTokensUsed) {
+ if (i >= pTmpl->nTokensUsed) {
StrBufAppendBufPlain(Target,
pData,
len - (pData - pS), 0);
else {
StrBufAppendBufPlain(
Target, pData,
- Tmpl->Tokens[i]->pTokenStart - pData, 0);
- state = EvaluateToken(Target, Tmpl->Tokens[i], Context, state);
- while ((state != 0) && (i+1 < Tmpl->nTokensUsed)) {
+ pTmpl->Tokens[i]->pTokenStart - pData, 0);
+ state = EvaluateToken(Target, pTmpl->Tokens[i], pTmpl, Context, state);
+ while ((state != 0) && (i+1 < pTmpl->nTokensUsed)) {
/* condition told us to skip till its end condition */
i++;
- if ((Tmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
- (Tmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
- if (state == EvaluateConditional(Tmpl->Tokens[i],
+ if ((pTmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
+ (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
+ if (state == EvaluateConditional(pTmpl->Tokens[i],
+ pTmpl,
Context,
- Tmpl->Tokens[i]->Flags,
+ pTmpl->Tokens[i]->Flags,
state))
state = 0;
}
}
- pData = Tmpl->Tokens[i++]->pTokenEnd + 1;
- if (i >= Tmpl->nTokensUsed)
+ 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 *prepare_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
+{
+ WCTemplate *NewTemplate;
+ NewTemplate = (WCTemplate *) malloc(sizeof(WCTemplate));
+ NewTemplate->Data = NULL;
+ NewTemplate->FileName = NewStrBufDup(filename);
+ NewTemplate->nTokensUsed = 0;
+ NewTemplate->TokenSpace = 0;
+ NewTemplate->Tokens = NULL;
+
+ Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
+ return NewTemplate;
+}
/**
* \brief Display a variable-substituted template
int fd;
struct stat statbuf;
const char *pS, *pE, *pch, *Err;
+ long Line;
int pos;
WCTemplate *NewTemplate;
NewTemplate = (WCTemplate *) malloc(sizeof(WCTemplate));
NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size);
+ NewTemplate->FileName = NewStrBufDup(filename);
NewTemplate->nTokensUsed = 0;
NewTemplate->TokenSpace = 0;
NewTemplate->Tokens = NULL;
}
close(fd);
+ Line = 0;
pS = pch = ChrPtr(NewTemplate->Data);
pE = pS + StrLength(NewTemplate->Data);
while (pch < pE) {
for (; pch < pE; pch ++) {
if ((*pch=='<')&&(*(pch + 1)=='?'))
break;
+ if (*pch=='\n') Line ++;
}
if (pch >= pE)
continue;
continue;
pte = pch;
PutNewToken(NewTemplate,
- NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte));
+ NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte, Line, NewTemplate));
pch ++;
}
- Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
+ if (LoadTemplates == 0)
+ Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
return NewTemplate;
}
+
+///void PrintTemplate(const char *Key, void *vSubst, int odd)
+const char* PrintTemplate(void *vSubst)
+{
+ WCTemplate *Tmpl = vSubst;
+
+ return ChrPtr(Tmpl->FileName);
+
+}
+
+
/**
* \brief Display a variable-substituted template
* \param templatename template file to load
if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
!GetHash(Static, templatename, len, &vTmpl)) {
- printf ("didn't find %s\n", templatename);
+ printf ("didn't find %s %ld %ld\n", templatename, len , (long)strlen(templatename));
+/// dbg_PrintHash(Static, PrintTemplate, NULL);
+// PrintHash(Static, VarPrintTransition, PrintTemplate);
return;
}
if (vTmpl == NULL)
printf("%s %d %s\n",ChrPtr(FileName), IsMobile, ChrPtr(Tag));
- load_template(FileName, Tag, (IsMobile)?wireless:big);
+ if (LoadTemplates == 0)
+ load_template(FileName, Tag, (IsMobile)?wireless:big);
+ else
+ prepare_template(FileName, Tag, (IsMobile)?wireless:big);
}
closedir(filedir);
FreeStrBuf(&FileName);
StrBufAppendBuf(Target, SubBuf, 0);
FlushStrBuf(SubBuf);
+ oddeven = ~ oddeven;
}
+ FreeStrBuf(&SubBuf);
DeleteHashPos(&it);
It->Destructor(List);
}
return 0;
subst = (wcsubst*) vsubst;
switch(subst->wcs_type) {
- case WCS_STRING:
- if (Tokens->nParameters < 4)
- return 1;
- return (strcmp(Tokens->Params[3]->Start, subst->wcs_value) == 0);
- case WCS_SERVCMD:
- lprintf(1, " -> Server [%s]\n", subst->wcs_value);////todo
- return 0;
case WCS_FUNCTION:
return (subst->wcs_function!=NULL);
+ case WCS_SERVCMD:
+ 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)
return 1;
- return (strcmp(Tokens->Params[3]->Start, ChrPtr((StrBuf*) subst->wcs_function)) == 0);
+ return (strcmp(Tokens->Params[3]->Start, ChrPtr(subst->wcs_value)) == 0);
case WCS_LONG:
if (Tokens->nParameters < 4)
return (subst->lvalue != 0);
Put(Contitionals, Name, len, Cond, NULL);
}
+void tmpl_do_boxed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ if (nArgs == 2) {
+ StrBuf *Headline = NewStrBuf();
+ DoTemplate(Tokens->Params[1]->Start,
+ Tokens->Params[1]->len,
+ Context,
+ Headline);
+ SVPutBuf("BOXTITLE", Headline, 0);
+ }
+
+ DoTemplate(HKEY("beginbox"), Context, Target);
+ DoTemplate(Tokens->Params[0]->Start,
+ Tokens->Params[0]->len,
+ Context,
+ Target);
+ DoTemplate(HKEY("endbox"), Context, Target);
+}
+
+void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ StrBuf **TabNames;
+ int i, ntabs, nTabs;
+
+ nTabs = ntabs = 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,
+ Context,
+ TabNames[i]);
+ }
+ else {
+ /** A Tab without subject? we can't count that, add it as silent */
+ nTabs --;
+ }
+ }
+
+ 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,
+ Context,
+ Target);
+ StrEndTab(Target, i, nTabs);
+ }
+}
+
void
InitModule_SUBST
(void)
{
- RegisterNamespace("SERV_PID", 0, 0, tmplput_serv_ip);
- RegisterNamespace("SERV_NODENAME", 0, 0, tmplput_serv_nodename);
- RegisterNamespace("SERV_HUMANNODE", 0, 0, tmplput_serv_humannode);
- RegisterNamespace("SERV_FQDN", 0, 0, tmplput_serv_fqdn);
- RegisterNamespace("SERV_SOFTWARE", 0, 0, tmmplput_serv_software);
- RegisterNamespace("SERV_REV_LEVEL", 0, 0, tmplput_serv_rev_level);
- RegisterNamespace("SERV_BBS_CITY", 0, 0, tmmplput_serv_bbs_city);
+ RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip);
+ RegisterNamespace("SERV:NODENAME", 0, 0, tmplput_serv_nodename);
+ RegisterNamespace("SERV:HUMANNODE", 0, 0, tmplput_serv_humannode);
+ RegisterNamespace("SERV:FQDN", 0, 0, tmplput_serv_fqdn);
+ RegisterNamespace("SERV:SOFTWARE", 0, 0, tmmplput_serv_software);
+ RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level);
+ RegisterNamespace("SERV:BBS_CITY", 0, 0, tmmplput_serv_bbs_city);
+/// RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmmplput_serv_ldap_enabled);
RegisterNamespace("CURRENT_USER", 0, 0, tmplput_current_user);
RegisterNamespace("CURRENT_ROOM", 0, 0, tmplput_current_room);
RegisterNamespace("ITERATE", 2, 4, tmpl_iterate_subtmpl);
+ RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed);
+ RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed);
RegisterConditional(HKEY("COND:SUBST"), 3, ConditionalVar);
}
projects / citadel.git / blobdiff