X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fblogview_renderer.c;h=b57d9d963c6629e4790587128c1c625d166737e4;hb=aeade41982c6c9a3e745a3b3c8262a3ec6952670;hp=6ae055ece1a84d7a9252ffa1dbd74193cea202cf;hpb=3d1fe95321f318ae8882fcfde1ac63f0954c91fa;p=citadel.git diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c index 6ae055ece..b57d9d963 100644 --- a/webcit/blogview_renderer.c +++ b/webcit/blogview_renderer.c @@ -1,36 +1,103 @@ /* * Blog view renderer module for WebCit * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2012 by the citadel.org team * - * This program is free 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. + * This program is open source software. You can redistribute it and/or + * 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" + + +typedef struct __BLOG { + HashList *BLOG; + long p; + int gotonext; + StrBuf *Charset; + StrBuf *Buf; +} BLOG; + /* - * Data which gets passed around between the various functions in this module - * + * Generate a permalink for a post + * (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); + } +} + + +/* + * Render a single blog post and (optionally) its comments + */ +void blogpost_render(struct blogpost *bp, int with_comments) +{ + const StrBuf *Mime; + int i; + + WC->bptlid = bp->top_level_id; /* This is used in templates; do not remove it */ + + /* Always show the top level post, unless we somehow ended up with an empty list */ + if (bp->num_msgs > 0) { + read_message(WC->WBuf, HKEY("view_blog_post"), bp->msgs[0], NULL, &Mime); + } + + 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"); + for (i=1; inum_msgs; ++i) { + read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime); + } + do_template("view_blog_comment_box"); + } + + 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\n"); + } +} + + +/* + * Destructor for "struct blogpost" */ -struct blogview { - 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 */ -}; +void blogpost_destroy(struct blogpost *bp) { + if (bp->alloc_msgs > 0) { + free(bp->msgs); + } + free(bp); +} /* @@ -40,11 +107,19 @@ int blogview_GetParamsGetServerCall(SharedMessageStatus *Stat, void **ViewSpecific, long oper, char *cmd, - long len) + long len, + char *filter, + long flen) { - struct blogview *BLOG = malloc(sizeof(struct blogview)); - memset(BLOG, 0, sizeof(struct blogview)); - *ViewSpecific = BLOG; + BLOG *BL = (BLOG*) malloc(sizeof(BLOG)); + BL->BLOG = 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 */ @@ -53,7 +128,8 @@ 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; } @@ -67,75 +143,188 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat, int is_new, int i) { - struct blogview *BLOG = (struct blogview *) *ViewSpecific; + BLOG *BL = (BLOG*) *ViewSpecific; + struct blogpost *bp = NULL; - if (BLOG->alloc_msgs == 0) { - BLOG->alloc_msgs = 1000; - BLOG->msgs = malloc(BLOG->alloc_msgs * sizeof(long)); - memset(BLOG->msgs, 0, (BLOG->alloc_msgs * sizeof(long)) ); + 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. + */ + if ((BL->p != 0) && + (BL->p != Msg->reply_inreplyto_hash) && + (BL->p != Msg->reply_references_hash)) { + return 200; } - /* Check our buffer size */ - if (BLOG->num_msgs >= BLOG->alloc_msgs) { - BLOG->alloc_msgs *= 2; - BLOG->msgs = realloc(BLOG->msgs, (BLOG->alloc_msgs * sizeof(long))); - memset(&BLOG->msgs[BLOG->num_msgs], 0, ((BLOG->alloc_msgs - BLOG->num_msgs) * sizeof(long)) ); + /* + * Add our little bundle of blogworthy wonderfulness to the hash table + */ + if (Msg->reply_references_hash == 0) { + bp = malloc(sizeof(struct blogpost)); + if (!bp) return(200); + memset(bp, 0, sizeof (struct blogpost)); + bp->top_level_id = Msg->reply_inreplyto_hash; + Put(BL->BLOG, + (const char *)&Msg->reply_inreplyto_hash, + sizeof(Msg->reply_inreplyto_hash), + bp, + (DeleteHashDataFunc)blogpost_destroy); + } + else { + GetHash(BL->BLOG, + (const char *)&Msg->reply_references_hash, + sizeof(Msg->reply_references_hash), + (void *)&bp); } - BLOG->msgs[BLOG->num_msgs++] = Msg->msgnum; + /* + * Now we have a 'struct 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. + */ + if (bp != NULL) { + if (bp->alloc_msgs == 0) { + bp->alloc_msgs = 1000; + bp->msgs = malloc(bp->alloc_msgs * sizeof(long)); + memset(bp->msgs, 0, (bp->alloc_msgs * sizeof(long)) ); + } + if (bp->num_msgs >= bp->alloc_msgs) { + bp->alloc_msgs *= 2; + bp->msgs = realloc(bp->msgs, (bp->alloc_msgs * sizeof(long))); + memset(&bp->msgs[bp->num_msgs], 0, + ((bp->alloc_msgs - bp->num_msgs) * sizeof(long)) ); + } + bp->msgs[bp->num_msgs++] = Msg->msgnum; + if ((Msg->Flags & MSGFLAG_READ) != 0) { + syslog(LOG_DEBUG, "****************** unread %ld", Msg->msgnum); + + bp->unread_oments++; + } + } + else { + syslog(LOG_DEBUG, "** comment %ld is unparented", Msg->msgnum); + } return 200; } -int blogview_sortfunc(const void *s1, const void *s2) { - long l1; - long l2; - - l1 = *(long *)(s1); - l2 = *(long *)(s2); +/* + * Sort a list of 'struct blogpost' pointers by newest-to-oldest msgnum. + * 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; - if (l1 > l2) return(+1); - if (l1 < l2) return(-1); + if ( (*one)->msgs[0] > (*two)->msgs[0] ) return(-1); + if ( (*one)->msgs[0] < (*two)->msgs[0] ) return(+1); return(0); } -int blogview_RenderView_or_Tail(SharedMessageStatus *Stat, - void **ViewSpecific, - long oper) +/* + * All blogpost entries are now in the hash list. + * Sort them, select the desired range, and render what we want to see. + */ +int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper) { - struct blogview *BLOG = (struct blogview *) *ViewSpecific; + BLOG *BL = (BLOG*) *ViewSpecific; + HashPos *it; + const char *Key; + void *Data; + long len; int i; - const StrBuf *Mime; + struct blogpost **blogposts = NULL; + int num_blogposts = 0; + int num_blogposts_alloc = 0; + int with_comments = 0; + int firstp = 0; + int maxp = 0; + + /* Comments are shown if we are only viewing a single blog post */ + with_comments = (BL->p != 0); + + firstp = atoi(BSTR("firstp")); /* start reading at... */ + maxp = atoi(BSTR("maxp")); /* max posts to show... */ + if (maxp < 1) maxp = 5; /* default; move somewhere else? */ - wc_printf("
"); - if (Stat->nummsgs > 0) { - lprintf(9, "sorting %d messages\n", BLOG->num_msgs); - qsort(BLOG->msgs, (size_t)(BLOG->num_msgs), sizeof(long), blogview_sortfunc); + //// bp->unread_oments++; + + /* Iterate through the hash list and copy the data pointers into an array */ + it = GetNewHashPos(BL->BLOG, 0); + while (GetNextHashPos(BL->BLOG, it, &len, &Key, &Data)) { + if (num_blogposts >= num_blogposts_alloc) { + if (num_blogposts_alloc == 0) { + num_blogposts_alloc = 100; + } + else { + num_blogposts_alloc *= 2; + } + blogposts = realloc(blogposts, (num_blogposts_alloc * sizeof (struct blogpost *))); + } + blogposts[num_blogposts++] = (struct blogpost *) Data; } + DeleteHashPos(&it); + + /* Now we have our array. It is ONLY an array of pointers. The objects to + * 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); - for (i=0; (inum_msgs); ++i) { - if (BLOG->msgs[i] > 0L) { - read_message(WC->WBuf, HKEY("view_message"), BLOG->msgs[i], NULL, &Mime); + /* 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=start_here; i 0) && (i == start_here)) { + int j = i - maxp; + if (j < 0) j = 0; + wc_printf("\n", _("Newer posts")); + } + if (i < (start_here + maxp)) { + blogpost_render(blogposts[i], with_comments); + } + else if (i == (start_here + maxp)) { + wc_printf("\n", _("Older posts")); + } + } + + /* Done. We are only freeing the array of pointers; the data itself + * will be freed along with the hash list. + */ + free(blogposts); } - wc_printf("
\n"); return(0); } int blogview_Cleanup(void **ViewSpecific) { - struct blogview *BLOG = (struct blogview *) *ViewSpecific; - - if (BLOG->alloc_msgs != 0) { - free(BLOG->msgs); - } - free(BLOG); + BLOG *BL = (BLOG*) *ViewSpecific; + FreeStrBuf(&BL->Buf); + FreeStrBuf(&BL->Charset); + DeleteHash(&BL->BLOG); + free(BL); wDumpContent(1); return 0; } @@ -149,9 +338,11 @@ InitModule_BLOGVIEWRENDERERS VIEW_BLOG, blogview_GetParamsGetServerCall, NULL, + NULL, NULL, blogview_LoadMsgFromServer, - blogview_RenderView_or_Tail, + blogview_render, blogview_Cleanup ); + RegisterNamespace("BLOG:PERMALINK", 0, 0, tmplput_blog_permalink, NULL, CTX_NONE); }