X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fblogview_renderer.c;h=9432181e75d93746d53364cd486e1de0a692c27d;hb=4c6685eb57da55c219abe466fe03d714e42390ef;hp=6492f20ad563b2b817ea0ef67c15f26df7b3adca;hpb=ece7533e4775cac35ec317f748b2f0b2ef94c626;p=citadel.git
diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 6492f20ad..9432181e7 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -1,26 +1,29 @@
/*
* 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"
+
+
+typedef struct __BLOG {
+ HashList *BLOG;
+ long p;
+ int gotonext;
+ StrBuf *Charset;
+ StrBuf *Buf;
+} BLOG;
/*
@@ -29,67 +32,55 @@
* 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);
- }
+ StrBuf *buf = NewStrBufPlain(HKEY("/readfwd?go="));
+ StrBufUrlescAppend(buf, WC->CurRoom.name, 0);
+ StrBufAppendPrintf(buf, "?p=%d", WC->bptlid);
+ StrBufAppendTemplate(Target, TP, buf, 0);
+ FreeStrBuf(&buf);
}
/*
- * 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(" | %s", _("permalink"));
+ wc_printf("
\n\n");
}
-
}
@@ -111,10 +102,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->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 */
@@ -123,47 +123,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.
*/
@@ -173,33 +138,39 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
int is_new,
int i)
{
- HashList *BLOG = (HashList *) *ViewSpecific;
- struct bltr b;
+ BLOG *BL = (BLOG*) *ViewSpecific;
struct blogpost *bp = NULL;
- int p = 0;
- 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) {
+ 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 = b.id;
- Put(BLOG, (const char *)&b.id, sizeof(b.id), bp, (DeleteHashDataFunc)blogpost_destroy);
+ 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(BLOG, (const char *)&b.refs , sizeof(b.refs), (void *)&bp);
+ GetHash(BL->BLOG,
+ (const char *)&Msg->reply_references_hash,
+ sizeof(Msg->reply_references_hash),
+ (void *)&bp);
}
/*
@@ -220,6 +191,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;
@@ -246,7 +223,7 @@ static int blogview_sortfunc(const void *a, const void *b) {
*/
int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
{
- HashList *BLOG = (HashList *) *ViewSpecific;
+ BLOG *BL = (BLOG*) *ViewSpecific;
HashPos *it;
const char *Key;
void *Data;
@@ -255,11 +232,45 @@ 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;
- /* Iterate through the hash list and copy the data pointers into an array */
+ /* Comments are shown if we are only viewing a single blog post */
+ 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? */
+
+ it = GetNewHashPos(BL->BLOG, 0);
- it = GetNewHashPos(BLOG, 0);
- while (GetNextHashPos(BLOG, it, &len, &Key, &Data)) {
+ 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.
+ */
+ struct blogpost *unread_bp = NULL;
+ int unread_count = 0;
+ while (GetNextHashPos(BL->BLOG, it, &len, &Key, &Data)) {
+ struct blogpost *one_bp = (struct 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->BLOG, it, 0);
+ }
+
+ /* Iterate through the hash list and copy the data pointers into an array */
+ while (GetNextHashPos(BL->BLOG, it, &len, &Key, &Data)) {
if (num_blogposts >= num_blogposts_alloc) {
if (num_blogposts_alloc == 0) {
num_blogposts_alloc = 100;
@@ -276,19 +287,39 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
/* 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 -- 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;
+ 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
@@ -303,10 +334,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->BLOG);
+ free(BL);
wDumpContent(1);
return 0;
}
@@ -320,10 +353,11 @@ InitModule_BLOGVIEWRENDERERS
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:PERMALINK", 0, 1, tmplput_blog_permalink, NULL, CTX_NONE);
}