X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fblogview_renderer.c;h=70fa908ae97b9e787a0c554a1cac6cba6e3d2e55;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=8a3d4b64997275962c6a052e1ac45fed05d0d607;hpb=a6414c098607ac9f10a5f50a3a63368d6d62e972;p=citadel.git
diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 8a3d4b649..70fa908ae 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -20,7 +20,7 @@
#include "webcit.h"
#include "webserver.h"
-#include "groupdav.h"
+#include "dav.h"
/*
@@ -44,52 +44,45 @@ void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
/*
- * Render (maybe) a single blog post and (maybe) its comments
+ * Render a single blog post and (optionally) its comments
*/
-void blogpost_render(struct blogpost *bp) {
+void blogpost_render(struct blogpost *bp, int with_comments)
+{
const StrBuf *Mime;
- int p = 0;
int i;
- p = atoi(BSTR("p")); /* are we looking for a specific post? */
- WC->bptlid = bp->top_level_id;
+ WC->bptlid = bp->top_level_id; /* This is used in templates; do not remove it */
- if ( ((p == 0) || (p == bp->top_level_id)) && (bp->num_msgs > 0) ) {
- /* Show the top level post */
+ /* 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 (p == 0) {
- /* Show 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");
- }
- else if (bp->num_msgs < 2) {
- wc_printf(_("%d comments"), 0);
- }
- else {
- 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);
- }
+ 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");
}
- /* offer the comment box */
- if (p == bp->top_level_id) {
- do_template("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");
}
-
}
@@ -111,7 +104,9 @@ 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;
@@ -176,14 +171,21 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
HashList *BLOG = (HashList *) *ViewSpecific;
struct bltr b;
struct blogpost *bp = NULL;
+ int p = 0;
b = blogview_learn_thread_references(Msg->msgnum);
- /* FIXME an optimization here -- one we ought to perform -- is to exit this
- * function immediately if the viewer is only interested in a single post and
+ /* 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)) {
+ return 200;
+ }
+ /*
+ * Add our little bundle of blogworthy wonderfulness to the hash table
+ */
if (b.refs == 0) {
bp = malloc(sizeof(struct blogpost));
if (!bp) return(200);
@@ -214,13 +216,16 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
}
bp->msgs[bp->num_msgs++] = Msg->msgnum;
}
+ else {
+ syslog(LOG_DEBUG, "** comment %ld is unparented", Msg->msgnum);
+ }
return 200;
}
/*
- * Sort a list of 'struct blogpost' objects by newest-to-oldest msgnum.
+ * 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) {
@@ -235,7 +240,7 @@ static int blogview_sortfunc(const void *a, const void *b) {
/*
* All blogpost entries are now in the hash list.
- * Sort them, (FIXME cull by date range if needed,) and render what we want to see.
+ * Sort them, select the desired range, and render what we want to see.
*/
int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
{
@@ -248,30 +253,74 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
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 */
+ if (atoi(BSTR("p"))) with_comments = 1;
+
+ firstp = atoi(BSTR("firstp")); /* start reading at... */
+ maxp = atoi(BSTR("maxp")); /* max posts to show... */
+ if (maxp < 1) maxp = 5; /* default; move somewhere else? */
+ /* Iterate through the hash list and copy the data pointers into an array */
it = GetNewHashPos(BLOG, 0);
while (GetNextHashPos(BLOG, it, &len, &Key, &Data)) {
if (num_blogposts >= num_blogposts_alloc) {
if (num_blogposts_alloc == 0) {
num_blogposts_alloc = 100;
- blogposts = malloc((num_blogposts_alloc * sizeof (struct blogpost *)));
}
else {
num_blogposts_alloc *= 2;
- blogposts = realloc(blogposts, (num_blogposts_alloc * sizeof (struct blogpost *)));
}
+ 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);
- /* FIXME this is where we handle date ranges etc */
+ /* 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);
}
@@ -298,6 +347,7 @@ InitModule_BLOGVIEWRENDERERS
VIEW_BLOG,
blogview_GetParamsGetServerCall,
NULL,
+ NULL,
NULL,
blogview_LoadMsgFromServer,
blogview_render,