X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fblogview_renderer.c;h=0a0510a295af2128adbfdfdc070e5115f4618fd3;hb=3cf89d4ed1bf883353080ec945a28c0022461a4b;hp=16a5116be578c45b2084ab17a64b926c840fe6a2;hpb=4c7985f6945d38925446376e99a3a0606b58aa74;p=citadel.git diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c index 16a5116be..0a0510a29 100644 --- a/webcit/blogview_renderer.c +++ b/webcit/blogview_renderer.c @@ -1,26 +1,84 @@ /* * Blog view renderer module for WebCit * - * Copyright (c) 1996-2011 by the citadel.org team + * Copyright (c) 1996-2012 by the citadel.org team * * This program is open source software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation -- either version 3 of the - * License, or (at your option) any later version. + * modify it under the terms of the GNU General Public License, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" #include "webserver.h" -#include "groupdav.h" +#include "dav.h" + +CtxType CTX_BLOGPOST = CTX_NONE; + +typedef struct __BLOG { + HashList *BLOGPOSTS; + long p; + int gotonext; + StrBuf *Charset; + StrBuf *Buf; +} BLOG; + +/* + * Array type for a blog post. The first message is the post; the rest are comments + */ +typedef struct _blogpost { + int top_level_id; + long *msgs; /* Array of msgnums for messages we are displaying */ + int num_msgs; /* Number of msgnums stored in 'msgs' */ + int alloc_msgs; /* Currently allocated size of array */ + int unread_oments; +}blogpost; + + +/* + * XML sitemap generator -- go through the message list for a Blog room + */ +void sitemap_do_blog(void) { + wcsession *WCC = WC; + blogpost oneBP; + int num_msgs = 0; + int i; + SharedMessageStatus Stat; + message_summary *Msg = NULL; + StrBuf *Buf = NewStrBuf(); + StrBuf *FoundCharset = NewStrBuf(); + WCTemplputParams SubTP; + + memset(&Stat, 0, sizeof Stat); + memset(&oneBP, 0, sizeof(blogpost)); + memset(&SubTP, 0, sizeof(WCTemplputParams)); + StackContext(NULL, &SubTP, &oneBP, CTX_BLOGPOST, 0, NULL); + + Stat.maxload = INT_MAX; + Stat.lowest_found = (-1); + Stat.highest_found = (-1); + num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL); + if (num_msgs < 1) return; + + for (i=0; isumm); + if (Msg != NULL) { + ReadOneMessageSummary(Msg, FoundCharset, Buf); + /* Show only top level posts, not comments */ + if ((Msg->reply_inreplyto_hash != 0) && (Msg->reply_references_hash == 0)) { + oneBP.top_level_id = Msg->reply_inreplyto_hash; + DoTemplate(HKEY("view_blog_sitemap"), WCC->WBuf, &SubTP); + } + } + } + UnStackContext(&SubTP); + FreeStrBuf(&Buf); + FreeStrBuf(&FoundCharset); +} + /* @@ -28,30 +86,40 @@ * (Call with NULL arguments to make this function wcprintf() the permalink * instead of writing it to the template) */ -void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) { - char perma[SIZ]; - - strcpy(perma, "/readfwd?go="); - urlesc(&perma[strlen(perma)], sizeof(perma)-strlen(perma), (char *)ChrPtr(WC->CurRoom.name)); - snprintf(&perma[strlen(perma)], sizeof(perma)-strlen(perma), "?p=%d", WC->bptlid); - if (!Target) { - wc_printf("%s", perma); - } - else { - StrBufAppendPrintf(Target, "%s", perma); - } +void tmplput_blog_toplevel_id(StrBuf *Target, WCTemplputParams *TP) { + blogpost *bp = (blogpost*) CTX(CTX_BLOGPOST); + char buf[SIZ]; + snprintf(buf, SIZ, "%d", bp->top_level_id); + StrBufAppendTemplateStr(Target, TP, buf, 0); } +void tmplput_blog_comment_count(StrBuf *Target, WCTemplputParams *TP) { + blogpost *bp = (blogpost*) CTX(CTX_BLOGPOST); + char buf[SIZ]; + snprintf(buf, SIZ, "%d", bp->num_msgs -1); + StrBufAppendTemplateStr(Target, TP, buf, 0); +} +void tmplput_blog_comment_unread_count(StrBuf *Target, WCTemplputParams *TP) { + blogpost *bp = (blogpost*) CTX(CTX_BLOGPOST); + char buf[SIZ]; + snprintf(buf, SIZ, "%d", bp->unread_oments); + StrBufAppendTemplateStr(Target, TP, buf, 0); +} + + /* * Render a single blog post and (optionally) its comments */ -void blogpost_render(struct blogpost *bp, int with_comments) +void blogpost_render(blogpost *bp, int with_comments) { + wcsession *WCC = WC; + WCTemplputParams SubTP; const StrBuf *Mime; int i; - WC->bptlid = bp->top_level_id; /* This is used in templates; do not remove it */ + memset(&SubTP, 0, sizeof(WCTemplputParams)); + StackContext(NULL, &SubTP, bp, CTX_BLOGPOST, 0, NULL); /* Always show the top level post, unless we somehow ended up with an empty list */ if (bp->num_msgs > 0) { @@ -60,36 +128,26 @@ void blogpost_render(struct blogpost *bp, int with_comments) if (with_comments) { /* Show any existing comments, then offer the comment box */ - wc_printf("\n"); - wc_printf(_("%d comments"), bp->num_msgs - 1); - wc_printf(" | %s", _("permalink")); - wc_printf("
\n"); + DoTemplate(HKEY("view_blog_show_commentlink"), WCC->WBuf, &SubTP); + for (i=1; inum_msgs; ++i) { read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime); } - do_template("blog_comment_box"); + DoTemplate(HKEY("view_blog_comment_box"), WCC->WBuf, &SubTP); } else { /* Show only the number of comments */ - wc_printf("top_level_id); - urlescputs(ChrPtr(WC->CurRoom.name)); - wc_printf("#comments\">"); - wc_printf(_("%d comments"), bp->num_msgs - 1); - wc_printf(" | %s", _("permalink")); - wc_printf("


\n"); + DoTemplate(HKEY("view_blog_show_no_comments"), WCC->WBuf, &SubTP); } + UnStackContext(&SubTP); } /* - * Destructor for "struct blogpost" + * Destructor for "blogpost" */ -void blogpost_destroy(struct blogpost *bp) { +void blogpost_destroy(blogpost *bp) { if (bp->alloc_msgs > 0) { free(bp->msgs); } @@ -104,10 +162,19 @@ int blogview_GetParamsGetServerCall(SharedMessageStatus *Stat, void **ViewSpecific, long oper, char *cmd, - long len) + long len, + char *filter, + long flen) { - HashList *BLOG = NewHash(1, NULL); - *ViewSpecific = BLOG; + BLOG *BL = (BLOG*) malloc(sizeof(BLOG)); + BL->BLOGPOSTS = NewHash(1, lFlathash); + + /* are we looking for a specific post? */ + BL->p = lbstr("p"); + BL->gotonext = havebstr("gotonext"); + BL->Charset = NewStrBuf(); + BL->Buf = NewStrBuf(); + *ViewSpecific = BL; Stat->startmsg = (-1); /* not used here */ Stat->sortit = 1; /* not used here */ @@ -116,47 +183,12 @@ int blogview_GetParamsGetServerCall(SharedMessageStatus *Stat, /* perform a "read all" call to fetch the message list -- we'll cut it down later */ rlid[2].cmd(cmd, len); - + if (BL->gotonext) + Stat->load_seen = 1; return 200; } -/* - * Given a msgnum, populate the id and refs fields of - * a "struct bltr" by fetching them from the Citadel server - */ -struct bltr blogview_learn_thread_references(long msgnum) -{ - StrBuf *Buf; - StrBuf *r; - int len; - struct bltr bltr = { 0, 0 } ; - Buf = NewStrBuf(); - r = NewStrBuf(); - serv_printf("MSG0 %ld|1", msgnum); /* top level citadel headers only */ - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) == 1) { - while (len = StrBuf_ServGetln(Buf), - ((len >= 0) && - ((len != 3) || strcmp(ChrPtr(Buf), "000") ))) - { - if (!strncasecmp(ChrPtr(Buf), "msgn=", 5)) { - StrBufCutLeft(Buf, 5); - bltr.id = ThreadIdHash(Buf); - } - else if (!strncasecmp(ChrPtr(Buf), "wefw=", 5)) { - StrBufCutLeft(Buf, 5); /* trim the field name */ - StrBufExtract_token(r, Buf, 0, '|'); - bltr.refs = ThreadIdHash(r); - } - } - } - FreeStrBuf(&Buf); - FreeStrBuf(&r); - return(bltr); -} - - /* * This function is called for every message in the list. */ @@ -166,37 +198,43 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat, int is_new, int i) { - HashList *BLOG = (HashList *) *ViewSpecific; - struct bltr b; - struct blogpost *bp = NULL; - int p = 0; + BLOG *BL = (BLOG*) *ViewSpecific; + blogpost *bp = NULL; - b = blogview_learn_thread_references(Msg->msgnum); + ReadOneMessageSummary(Msg, BL->Charset, BL->Buf); /* Stop processing if the viewer is only interested in a single post and * that message ID is neither the id nor the refs. */ - p = atoi(BSTR("p")); /* are we looking for a specific post? */ - if ((p != 0) && (p != b.id) && (p != b.refs)) { + if ((BL->p != 0) && + (BL->p != Msg->reply_inreplyto_hash) && + (BL->p != Msg->reply_references_hash)) { return 200; } /* * Add our little bundle of blogworthy wonderfulness to the hash table */ - if (b.refs == 0) { - bp = malloc(sizeof(struct blogpost)); + if (Msg->reply_references_hash == 0) { + bp = malloc(sizeof(blogpost)); if (!bp) return(200); - memset(bp, 0, sizeof (struct blogpost)); - bp->top_level_id = b.id; - Put(BLOG, (const char *)&b.id, sizeof(b.id), bp, (DeleteHashDataFunc)blogpost_destroy); + memset(bp, 0, sizeof (blogpost)); + bp->top_level_id = Msg->reply_inreplyto_hash; + Put(BL->BLOGPOSTS, + (const char *)&Msg->reply_inreplyto_hash, + sizeof(Msg->reply_inreplyto_hash), + bp, + (DeleteHashDataFunc)blogpost_destroy); } else { - GetHash(BLOG, (const char *)&b.refs , sizeof(b.refs), (void *)&bp); + GetHash(BL->BLOGPOSTS, + (const char *)&Msg->reply_references_hash, + sizeof(Msg->reply_references_hash), + (void *)&bp); } /* - * Now we have a 'struct blogpost' to which we can add a message. It's either the + * Now we have a 'blogpost' to which we can add a message. It's either the * blog post itself or a comment attached to it; either way, the code is the same from * this point onward. */ @@ -213,6 +251,12 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat, ((bp->alloc_msgs - bp->num_msgs) * sizeof(long)) ); } bp->msgs[bp->num_msgs++] = Msg->msgnum; + if ((Msg->Flags & MSGFLAG_READ) != 0) { + bp->unread_oments++; + } + } + else { + syslog(LOG_DEBUG, "** comment %ld is unparented", Msg->msgnum); } return 200; @@ -224,8 +268,8 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat, * With big thanks to whoever wrote http://www.c.happycodings.com/Sorting_Searching/code14.html */ static int blogview_sortfunc(const void *a, const void *b) { - struct blogpost * const *one = a; - struct blogpost * const *two = b; + blogpost * const *one = a; + blogpost * const *two = b; if ( (*one)->msgs[0] > (*two)->msgs[0] ) return(-1); if ( (*one)->msgs[0] < (*two)->msgs[0] ) return(+1); @@ -239,23 +283,61 @@ static int blogview_sortfunc(const void *a, const void *b) { */ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper) { - HashList *BLOG = (HashList *) *ViewSpecific; + wcsession *WCC = WC; + BLOG *BL = (BLOG*) *ViewSpecific; HashPos *it; const char *Key; void *Data; long len; int i; - struct blogpost **blogposts = NULL; + blogpost **blogposts = NULL; int num_blogposts = 0; int num_blogposts_alloc = 0; int with_comments = 0; + int firstp = 0; + int maxp = 0; + WCTemplputParams SubTP; + blogpost oneBP; + + memset(&SubTP, 0, sizeof(WCTemplputParams)); + memset(&oneBP, 0, sizeof(blogpost)); /* Comments are shown if we are only viewing a single blog post */ - if (atoi(BSTR("p"))) with_comments = 1; + with_comments = (BL->p != 0); + + firstp = ibstr("firstp"); /* start reading at... */ + maxp = ibstr("maxp"); /* max posts to show... */ + if (maxp < 1) maxp = 5; /* default; move somewhere else? */ + putlbstr("maxp", maxp); + + it = GetNewHashPos(BL->BLOGPOSTS, 0); + + if ((BL->gotonext) && (BL->p == 0)) { + /* did we come here via gotonext? lets find out whether + * this blog has just one blogpost with new comments just display + * this one. + */ + blogpost *unread_bp = NULL; + int unread_count = 0; + while (GetNextHashPos(BL->BLOGPOSTS, it, &len, &Key, &Data)) { + blogpost *one_bp = (blogpost *) Data; + if (one_bp->unread_oments > 0) { + unread_bp = one_bp; + unread_count++; + } + } + if (unread_count == 1) { + blogpost_render(unread_bp, 1); + + DeleteHashPos(&it); + return 0; + } + + RewindHashPos(BL->BLOGPOSTS, it, 0); + } /* Iterate through the hash list and copy the data pointers into an array */ - it = GetNewHashPos(BLOG, 0); - while (GetNextHashPos(BLOG, it, &len, &Key, &Data)) { + while (GetNextHashPos(BL->BLOGPOSTS, it, &len, &Key, &Data)) { if (num_blogposts >= num_blogposts_alloc) { if (num_blogposts_alloc == 0) { num_blogposts_alloc = 100; @@ -263,9 +345,9 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper) else { num_blogposts_alloc *= 2; } - blogposts = realloc(blogposts, (num_blogposts_alloc * sizeof (struct blogpost *))); + blogposts = realloc(blogposts, (num_blogposts_alloc * sizeof (blogpost *))); } - blogposts[num_blogposts++] = (struct blogpost *) Data; + blogposts[num_blogposts++] = (blogpost *) Data; } DeleteHashPos(&it); @@ -273,17 +355,37 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper) * which they point are still owned by the hash list. */ if (num_blogposts > 0) { - + int start_here = 0; /* Sort newest-to-oldest */ qsort(blogposts, num_blogposts, sizeof(void *), blogview_sortfunc); - /* FIXME -- allow the user to select a starting point in the list */ + /* allow the user to select a starting point in the list */ + for (i=0; itop_level_id == firstp) { + start_here = i; + } + } /* FIXME -- allow the user (or a default setting) to select a maximum number of posts to display */ /* Now go through the list and render what we've got */ - for (i=0; i 0) && (i == start_here)) { + int j = i - maxp; + if (j < 0) j = 0; + + StackContext(NULL, &SubTP, &blogposts[j], CTX_BLOGPOST, 0, NULL); + DoTemplate(HKEY("view_blog_post_start"), WCC->WBuf, &SubTP); + UnStackContext(&SubTP); + } + if (i < (start_here + maxp)) { + blogpost_render(blogposts[i], with_comments); + } + else if (i == (start_here + maxp)) { + StackContext(NULL, &SubTP, &blogposts[i], CTX_BLOGPOST, 0, NULL); + DoTemplate(HKEY("view_blog_post_stop"), WCC->WBuf, &SubTP); + UnStackContext(&SubTP); + } } /* Done. We are only freeing the array of pointers; the data itself @@ -298,10 +400,12 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper) int blogview_Cleanup(void **ViewSpecific) { - HashList *BLOG = (HashList *) *ViewSpecific; - - DeleteHash(&BLOG); + BLOG *BL = (BLOG*) *ViewSpecific; + FreeStrBuf(&BL->Buf); + FreeStrBuf(&BL->Charset); + DeleteHash(&BL->BLOGPOSTS); + free(BL); wDumpContent(1); return 0; } @@ -311,14 +415,20 @@ void InitModule_BLOGVIEWRENDERERS (void) { + RegisterCTX(CTX_BLOGPOST); + RegisterReadLoopHandlerset( VIEW_BLOG, blogview_GetParamsGetServerCall, NULL, + NULL, NULL, blogview_LoadMsgFromServer, blogview_render, blogview_Cleanup ); - RegisterNamespace("BLOG:PERMALINK", 0, 0, tmplput_blog_permalink, NULL, CTX_NONE); + + RegisterNamespace("BLOG:TOPLEVEL:MSGID", 0, 0, tmplput_blog_toplevel_id, NULL, CTX_BLOGPOST); + RegisterNamespace("BLOG:COMMENTS:COUNT", 0, 0, tmplput_blog_comment_count, NULL, CTX_BLOGPOST); + RegisterNamespace("BLOG:COMMENTS:UNREAD:COUNT", 0, 0, tmplput_blog_comment_unread_count, NULL, CTX_BLOGPOST); }