* add a comment token '--', whichs content will show up in the output if -T is active

* fix typo

diff --git a/webcit/subst.c b/webcit/subst.c
index ed060b173c901dfb83f0e1caaeb75648bc4416cd..2bcb8949ffe6b1fef69cebe9f2f7c729f0f94306 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -34,7 +34,7 @@ HashList *Defines;
 
 int DumpTemplateI18NStrings = 0;
 int LoadTemplates = 0;
-int dbg_bactrace_template_errors = 0;
+int dbg_backtrace_template_errors = 0;
 WCTemplputParams NoCtx;
 StrBuf *I18nDump = NULL;
 
@@ -238,7 +238,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
        FreeStrBuf(&Info);
        FreeStrBuf(&Error);
 /*
-       if (dbg_bactrace_template_errors)
+       if (dbg_backtrace_template_errors)
                wc_backtrace(); 
 */
 }
@@ -273,7 +273,7 @@ void LogError (StrBuf *Target, const char *Type, const char *Format, ...)
        FreeStrBuf(&Info);
        FreeStrBuf(&Error);
 /*
-       if (dbg_bactrace_template_errors)
+       if (dbg_backtrace_template_errors)
                wc_backtrace(); 
 */
 }
@@ -2166,6 +2166,23 @@ const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCT
 
 }
 
+
+void tmplput_Comment(StrBuf *Target, WCTemplputParams *TP)
+{
+       if (LoadTemplates != 0)
+       {
+               StrBuf *Comment;
+               const char *pch;
+               long len;
+
+               GetTemplateTokenString(Target, TP, 2, &pch, &len);
+               Comment = NewStrBufPlain(pch, len);
+               StrBufAppendTemplate(Target, TP, Comment, 1);
+
+               FreeStrBuf(&Comment);
+       }
+}
+
 /*-----------------------------------------------------------------------------
  *                      Iterators
  */
@@ -3149,6 +3166,7 @@ InitModule_SUBST
 (void)
 {
        memset(&NoCtx, 0, sizeof(WCTemplputParams));
+       RegisterNamespace("--", 0, 2, tmplput_Comment, NULL, CTX_NONE);
        RegisterNamespace("SORT:ICON", 1, 2, tmplput_SORT_ICON, NULL, CTX_NONE);
        RegisterNamespace("SORT:ORDER", 1, 2, tmplput_SORT_ORDER, NULL, CTX_NONE);
        RegisterNamespace("SORT:NEXT", 1, 2, tmplput_SORT_NEXT, NULL, CTX_NONE);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index cfc1cb083b65ebe621c5c40fac768d35be3e4c36..160844cdf9dc2c253721f485dd423189311344cc 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -59,7 +59,7 @@ const char foobuf[32];
 const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
 #endif 
 extern int dbg_analyze_msg;
-extern int dbg_bactrace_template_errors;
+extern int dbg_backtrace_template_errors;
 extern int DumpTemplateI18NStrings;
 extern StrBuf *I18nDump;
 void InitTemplateCache(void);
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
                case 'T':
                        LoadTemplates = atoi(optarg);
                        dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
-                       dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+                       dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
                        break;
                case 'Z':
                        DisableGzip = 1;