* cache templates

* use strbuf

diff --git a/webcit/subst.c b/webcit/subst.c
index 85d5dcc65af5f635e809656f1eaeedb33262fcc9..35c117d4702120bbf72ec690eccf25c6fee78857 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -16,6 +16,46 @@
 #include "webcit.h"
 #include "webserver.h"
 
+HashList *WirelessTemplateCache;
+HashList *WirelessLocalTemplateCache;
+HashList *TemplateCache;
+HashList *LocalTemplateCache;
+
+typedef struct _TemplateToken {
+       const char *pTokenStart;
+       size_t TokenStart;
+       size_t TokenEnd;
+       const char *pTokenEnd;
+
+       const char *pName;
+       size_t NameEnd;
+
+       int HaveParameters;
+       int nParameters;
+       size_t ParamStart [10];
+       size_t ParamEnd [10];
+} WCTemplateToken;
+
+typedef struct _WCTemplate {
+       StrBuf *Data;
+       int nTokensUsed;
+       int TokenSpace;
+       WCTemplateToken **Tokens;
+} WCTemplate;
+
+HashList *GlobalNS;
+
+typedef struct _HashHandler {
+       int foo;
+}HashHandler;
+
+typedef int (*HandlerFunc)(int nArgs, va_list vaarg);
+void RegisterNS(const char *NSName, int nMinArgs, int nMaxArgs, HandlerFunc Handler)
+{
+
+}
+
+
 /**
  * \brief debugging function to print array to log
  */
@@ -272,7 +312,7 @@ void pvo_do_cmd(char *servcmd) {
  * \brief Print the value of a variable
  * \param keyname get a key to print
  */
-void print_value_of(char *keyname, size_t keylen) {
+void print_value_of(const char *keyname, size_t keylen) {
        struct wcsession *WCC = WC;
        wcsubst *ptr;
        void *fcn();
@@ -280,7 +320,7 @@ void print_value_of(char *keyname, size_t keylen) {
 
        /*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
        if (keyname[0] == '=') {
-               do_template(&keyname[1]);
+               DoTemplate(keyname+1, keylen - 1);
        }
        /** Page-local variables */
        if ((WCC->vars!= NULL) && GetHash(WCC->vars, keyname, keylen, &vVar)) {
@@ -299,125 +339,290 @@ void print_value_of(char *keyname, size_t keylen) {
                        lprintf(1,"WARNING: invalid value in SV-Hash at %s!", keyname);
                }
        }
-       else if (!strcasecmp(keyname, "SERV_PID")) {
-               wprintf("%d", WCC->ctdl_pid);
-       }
+       else {
+               char ch;
+               ch = keyname[keylen];
+               ((char*) keyname)[keylen] = '\0'; ////TODO
+               if (!strcasecmp(keyname, "SERV_PID")) {
+                       wprintf("%d", WCC->ctdl_pid);
+               }
 
-       else if (!strcasecmp(keyname, "SERV_NODENAME")) {
-               escputs(serv_info.serv_nodename);
-       }
+               else if (!strcasecmp(keyname, "SERV_NODENAME")) {
+                       escputs(serv_info.serv_nodename);
+               }
 
-       else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
-               escputs(serv_info.serv_humannode);
-       }
+               else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
+                       escputs(serv_info.serv_humannode);
+               }
 
-       else if (!strcasecmp(keyname, "SERV_FQDN")) {
-               escputs(serv_info.serv_fqdn);
-       }
+               else if (!strcasecmp(keyname, "SERV_FQDN")) {
+                       escputs(serv_info.serv_fqdn);
+               }
 
-       else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
-               escputs(serv_info.serv_software);
-       }
+               else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
+                       escputs(serv_info.serv_software);
+               }
+
+               else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
+                       wprintf("%d.%02d",
+                               serv_info.serv_rev_level / 100,
+                               serv_info.serv_rev_level % 100
+                               );
+               }
+
+               else if (!strcasecmp(keyname, "SERV_BBS_CITY")) {
+                       escputs(serv_info.serv_bbs_city);
+               }
+
+               else if (!strcasecmp(keyname, "CURRENT_USER")) {
+                       escputs(WCC->wc_fullname);
+               }
 
-       else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
-               wprintf("%d.%02d",
-                       serv_info.serv_rev_level / 100,
-                       serv_info.serv_rev_level % 100
-               );
+               else if (!strcasecmp(keyname, "CURRENT_ROOM")) {
+                       escputs(WCC->wc_roomname);
+               }
+               ((char*) keyname)[keylen] = ch;//// TODO
+               
        }
 
-       else if (!strcasecmp(keyname, "SERV_BBS_CITY")) {
-               escputs(serv_info.serv_bbs_city);
+}
+
+extern char *static_dirs[PATH_MAX];  /**< Disk representation */
+
+
+void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
+{
+       if (Template->nTokensUsed + 1 >= Template->TokenSpace) {
+               if (Template->TokenSpace <= 0) {
+                       Template->Tokens = (WCTemplateToken**)malloc(
+                               sizeof(WCTemplateToken*) * 10);
+                       Template->TokenSpace = 10;
+               }
+               else {
+                       WCTemplateToken **NewTokens;
+                       NewTokens= (WCTemplateToken**)malloc(
+                               sizeof(WCTemplateToken*) * 
+                               Template->TokenSpace * 2);
+                       memcpy(NewTokens, Template->Tokens, 
+                              sizeof(WCTemplateToken) * Template->nTokensUsed);
+                       free(Template->Tokens);
+                       Template->TokenSpace *= 2;
+                       Template->Tokens = NewTokens;
+               }
+               
+
        }
+       Template->Tokens[(Template->nTokensUsed)++] = NewToken;
+}
+
+WCTemplateToken *NewTemlpateSubstitute(const char *pStart, const char *pTmplStart, const char *pTmplEnd)
+{
+       WCTemplateToken *NewToken = (WCTemplateToken*)malloc(sizeof(WCTemplateToken));
+
+       NewToken->pTokenStart = pTmplStart;
+       NewToken->TokenStart = pTmplStart - pStart;
+       NewToken->TokenEnd =  (pTmplEnd - pStart) - NewToken->TokenStart;
+       NewToken->pTokenEnd = pTmplEnd;
+       
+       NewToken->pName = pTmplStart + 2;
+       NewToken->NameEnd = NewToken->TokenEnd - 2;
+       NewToken->HaveParameters = 0;;
+       NewToken->nParameters = 0;
+       NewToken->ParamStart[0] = 0;
+       NewToken->ParamEnd[0] = 0;
+       return NewToken;
+}
+
+void FreeWCTemplate(void *vFreeMe)
+{
+       int i;
+       WCTemplate *FreeMe = (WCTemplate*)vFreeMe;
 
-       else if (!strcasecmp(keyname, "CURRENT_USER")) {
-               escputs(WCC->wc_fullname);
+       if (FreeMe->TokenSpace > 0) {
+               for (i = 0; i < FreeMe->nTokensUsed; i ++) {
+                       free(FreeMe->Tokens[i]);
+               }
+               free(FreeMe->Tokens);
        }
+       free(FreeMe);
+}
 
-       else if (!strcasecmp(keyname, "CURRENT_ROOM")) {
-               escputs(WCC->wc_roomname);
+void EvaluateToken(StrBuf *Target, WCTemplateToken *Token)
+{
+
+
+       
+       print_value_of(Token->pName, Token->NameEnd);
+}
+
+
+void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target)
+{
+       int done = 0;
+       int i;
+       const char *pData, *pS;
+       long len;
+
+       pS = pData = ChrPtr(Tmpl->Data);
+       len = StrLength(Tmpl->Data);
+       i = 0;
+       while (!done) {
+               if (i >= Tmpl->nTokensUsed) {
+                       StrBufAppendBufPlain(Target, pData, len, 0);
+                       done = 1;
+               }
+               else {
+                       StrBufAppendBufPlain(
+                               Target, pData, 
+                               Tmpl->Tokens[i]->pTokenStart - pData, 0);
+                       EvaluateToken(Target, Tmpl->Tokens[i]);
+                       pData = Tmpl->Tokens[i++]->pTokenEnd + 1;
+               }
        }
 
 }
 
-extern char *static_dirs[PATH_MAX];  /**< Disk representation */
+
 
 /**
  * \brief Display a variable-substituted template
  * \param templatename template file to load
  */
-void do_template(void *templatename) {
-       char flat_filename[PATH_MAX];
+void *load_template(const char *templatename, long len) {
+       HashList *pCache;
+       HashList *Static;
+       HashList *StaticLocal;
+       StrBuf *flat_filename;
        char filename[PATH_MAX];
-       FILE *fp;
-       char inbuf[1024];
-       char outbuf[sizeof inbuf];
-       char key[sizeof inbuf];
-       int i, pos;
+       int fd;
+       struct stat statbuf;
+       const char *pS, *pE, *pch, *Err;
+       int pos;
        struct stat mystat;
+       WCTemplate *NewTemplate;
 
-       strcpy(flat_filename, templatename);
-       if (WC->is_mobile)
-               strcat(flat_filename, ".m.html");
-       else
-               strcat(flat_filename, ".html");
+       flat_filename = NewStrBufPlain(templatename, len);
+       if (WC->is_mobile) {
+               Static = WirelessTemplateCache;
+               StaticLocal = WirelessLocalTemplateCache;
+               StrBufAppendBufPlain(flat_filename, HKEY(".m.html"), 0);
+       }
+       else {
+               Static = TemplateCache;
+               StaticLocal = LocalTemplateCache;
+               StrBufAppendBufPlain(flat_filename, HKEY(".html"), 0);
+       }
        
        strcpy(filename, static_dirs[1]);
-       strcat(filename, flat_filename);
+       strcat(filename, ChrPtr(flat_filename));
+       pCache = StaticLocal;
        if (stat(filename, &mystat) == -1)
        {
+               pCache = Static;
                strcpy(filename, static_dirs[0]);
-               strcat(filename, flat_filename);
+               strcat(filename, ChrPtr(flat_filename));
        }
 
-       fp = fopen(filename, "r");
-       if (fp == NULL) {
+       fd = open(filename, O_RDONLY);
+       if (fd <= 0) {
                wprintf(_("ERROR: could not open template "));
                wprintf("'%s' - %s<br />\n",
                        (const char*)templatename, strerror(errno));
-               return;
+               return NULL;
        }
 
-       strcpy(inbuf, "");
-
-       while (fgets(inbuf, sizeof inbuf, fp) != NULL) {
-               int len;
+       if (fstat(fd, &statbuf) == -1) {
+               wprintf(_("ERROR: could not stat template "));
+               wprintf("'%s' - %s<br />\n",
+                       (const char*)templatename, strerror(errno));
+               return NULL;
+       }
 
-               strcpy(outbuf, "");
-               len = strlen(inbuf);
-               while (len > 0) {
-                       pos = (-1);
-                       for (i=len; i>=0; --i) {
-                               if ((inbuf[i]=='<')&&(inbuf[i+1]=='?')) pos = i;
-                       }
-                       if (pos < 0) {
-                               wprintf("%s", inbuf);
-                               strcpy(inbuf, "");
-                               len = 0;
-                       }
-                       else {
-                               strncpy(outbuf, inbuf, pos);
-                               outbuf[pos] = 0;
-                               wprintf("%s", outbuf);
-                               memmove(inbuf, &inbuf[pos], len - pos +1);
-                               len -= pos;
-                               pos = 1;
-                               for (i=len; i>=0; --i) {
-                                       if (inbuf[i]=='>') pos = i;
-                               }
-                               strncpy(key, &inbuf[2], pos-2);
-                               key[pos-2] = 0;
-                               print_value_of(key, pos-2);
-                               pos++;
-                               memmove(inbuf, &inbuf[pos], len - pos + 1);
-                               len -= pos;
+       NewTemplate = (WCTemplate *) malloc(sizeof(WCTemplate));
+       NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size);
+       NewTemplate->nTokensUsed = 0;
+       NewTemplate->TokenSpace = 0;
+       NewTemplate->Tokens = NULL;
+       if (StrBufReadBLOB(NewTemplate->Data, &fd, 1, statbuf.st_size, &Err) < 0) {
+               close(fd);
+               FreeWCTemplate(NewTemplate);
+               wprintf(_("ERROR: reading template "));
+               wprintf("'%s' - %s<br />\n",
+                       (const char*)templatename, strerror(errno));
+               return NULL;
+       }
+       close(fd);
+
+       pS = pch = ChrPtr(NewTemplate->Data);
+       pE = pS + StrLength(NewTemplate->Data);
+       while (pch < pE) {
+               const char *pts, *pte;
+               int InQuotes = 0;
+               int InDoubleQuotes = 0;
+               pos = (-1);
+               for (; pch < pE; pch ++) {
+                       if ((*pch=='<')&&(*(pch + 1)=='?'))
+                               break;
+               }
+               if (pch >= pE)
+                       continue;
+               pts = pch;
+               for (; pch < pE - 1; pch ++) {
+                       if (*pch == '"')
+                               InDoubleQuotes = ! InDoubleQuotes;
+                       else if (*pch == '\'')
+                               InQuotes = ! InQuotes;
+                       else if ((!InQuotes  && !InDoubleQuotes) &&
+                                ((*pch!='\\')&&(*(pch + 1)=='>'))) {
+                               pch ++;
+                               break;
                        }
                }
+               if (pch + 1 >= pE)
+                       continue;
+               pte = pch;
+               PutNewToken(NewTemplate, NewTemlpateSubstitute(pS, pts, pte));
+               pch ++;
+       }
+       Put(pCache, filename, strlen(filename), NewTemplate, FreeWCTemplate);
+       return NewTemplate;
+}
+
+/**
+ * \brief Display a variable-substituted template
+ * \param templatename template file to load
+ */
+void DoTemplate(const char *templatename, long len) 
+{
+       HashList *Static;
+       HashList *StaticLocal;
+       void *vTmpl;
+
+       if (WC->is_mobile) {
+               Static = WirelessTemplateCache;
+               StaticLocal = WirelessLocalTemplateCache;
+       }
+       else {
+               Static = TemplateCache;
+               StaticLocal = LocalTemplateCache;
        }
 
-       fclose(fp);
+       if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
+           !GetHash(Static, templatename, len, &vTmpl)) {
+               vTmpl = load_template(templatename, len); 
+               //////TODO: lock this!
+       }
+       if (vTmpl == NULL) 
+               return;
+       ProcessTemplate(vTmpl, WC->WBuf);
+       
 }
 
+void 
+InitModule_SUBST
+(void)
+{
 
+}
 
 /*@}*/

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 7ca5e3ff09eb40b914e996c64d51ec71335d0d4e..21fc2f41633e3cac388ece3fab389b755f9d7f3a 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -470,6 +470,10 @@ extern time_t if_modified_since;
 extern int follow_xff;
 extern HashList *HandlerHash;
 extern HashList *PreferenceHooks;
+extern HashList *WirelessTemplateCache;
+extern HashList *WirelessLocalTemplateCache;
+extern HashList *TemplateCache;
+extern HashList *LocalTemplateCache;
 
 void InitialiseSemaphores(void);
 void begin_critical_section(int which_one);
@@ -612,7 +616,8 @@ void SVCALLBACK(char *keyname, var_callback_fptr fcn_ptr);
 void SVCallback(char *keyname, size_t keylen,  var_callback_fptr fcn_ptr);
 #define svcallback(a, b) SVCallback(a, sizeof(a) - 1, b)
 
-void do_template(void *templatename);
+void DoTemplate(const char *templatename, long len);
+#define do_template(a) DoTemplate(a, sizeof(a) -1);
 
 
 int lingering_close(int fd);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 315f26727c641e8c2cd7a317e903056bb1c7617f..b6cdd996068d3349e8ee02c9577d292c47d7c2e3 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -617,6 +617,10 @@ int main(int argc, char **argv)
 
        HandlerHash = NewHash(1, NULL);
        PreferenceHooks = NewHash(1, NULL);
+       WirelessTemplateCache = NewHash(1, NULL);
+       WirelessLocalTemplateCache = NewHash(1, NULL);
+       TemplateCache = NewHash(1, NULL);
+       LocalTemplateCache = NewHash(1, NULL);
 
        initialise_modules();