Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening...

[citadel.git] / webcit / jsonview_renderer.c

diff --git a/webcit/jsonview_renderer.c b/webcit/jsonview_renderer.c
index a7669e03a12b6e9887138c61412fb8220def5781..5a097b0a433406a2d70b00a4cd9814276a8e9f7e 100644 (file)
--- a/webcit/jsonview_renderer.c
+++ b/webcit/jsonview_renderer.c
@@ -2,25 +2,32 @@
 #include "webserver.h"
 #include "dav.h"
 
-int json_GetParamsGetServerCall(SharedMessageStatus * Stat,
-                               void **ViewSpecific, long oper, char *cmd, long len, char *filter, long flen) {
+int json_GetParamsGetServerCall(SharedMessageStatus *Stat, 
+                               void **ViewSpecific, 
+                               long oper, 
+                               char *cmd, 
+                               long len,
+                               char *filter,
+                               long flen)
+{
        Stat->defaultsortorder = 2;
        Stat->sortit = 1;
        Stat->load_seen = 1;
        /* Generally using maxmsgs|startmsg is not required
           in mailbox view, but we have a 'safemode' for clients
           (*cough* Exploder) that simply can't handle too many */
-       if (havebstr("maxmsgs"))
-               Stat->maxmsgs = ibstr("maxmsgs");
-       else
-               Stat->maxmsgs = 9999999;
-       if (havebstr("startmsg"))
-               Stat->startmsg = lbstr("startmsg");
-       snprintf(cmd, len, "MSGS %s|%s||1", (oper == do_search) ? "SEARCH" : "ALL", (oper == do_search) ? bstr("query") : "");
+       if (havebstr("maxmsgs"))  Stat->maxmsgs  = ibstr("maxmsgs");
+       else                      Stat->maxmsgs  = 9999999;
+       if (havebstr("startmsg")) Stat->startmsg = lbstr("startmsg");
+       snprintf(cmd, len, "MSGS %s|%s||1",
+                (oper == do_search) ? "SEARCH" : "ALL",
+                (oper == do_search) ? bstr("query") : ""
+               );
 
        return 200;
 }
-int json_MessageListHdr(SharedMessageStatus * Stat, void **ViewSpecific) {
+int json_MessageListHdr(SharedMessageStatus *Stat, void **ViewSpecific) 
+{
        /* TODO: make a generic function */
        hprintf("HTTP/1.1 200 OK\r\n");
        hprintf("Content-type: application/json; charset=utf-8\r\n");
@@ -31,13 +38,17 @@ int json_MessageListHdr(SharedMessageStatus * Stat, void **ViewSpecific) {
        return 0;
 }
 
-int json_RenderView_or_Tail(SharedMessageStatus * Stat, void **ViewSpecific, long oper) {
-       DoTemplate(HKEY("mailsummary_json"), NULL, NULL);
-
+int json_RenderView_or_Tail(SharedMessageStatus *Stat, 
+                           void **ViewSpecific, 
+                           long oper)
+{
+       DoTemplate(HKEY("mailsummary_json"),NULL, NULL);
+       
        return 0;
 }
 
-int json_Cleanup(void **ViewSpecific) {
+int json_Cleanup(void **ViewSpecific)
+{
        /* Note: wDumpContent() will output one additional </div> tag. */
        /* We ought to move this out into template */
        end_burst();
@@ -45,8 +56,19 @@ int json_Cleanup(void **ViewSpecific) {
        return 0;
 }
 
-void InitModule_JSONRENDERER(void) {
-       RegisterReadLoopHandlerset(VIEW_JSON_LIST, json_GetParamsGetServerCall, json_MessageListHdr, NULL,      /* TODO: is this right? */
-                                  ParseMessageListHeaders_Detail, NULL, json_RenderView_or_Tail, json_Cleanup, NULL);
+void 
+InitModule_JSONRENDERER
+(void)
+{
+       RegisterReadLoopHandlerset(
+               VIEW_JSON_LIST,
+               json_GetParamsGetServerCall,
+               json_MessageListHdr,
+               NULL, /* TODO: is this right? */
+               ParseMessageListHeaders_Detail,
+               NULL,
+               json_RenderView_or_Tail,
+               json_Cleanup,
+               NULL);
 
 }