Another minor commit

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 1320c5497a92b95555e96da34fba958fb4fd2858..8a3d4b64997275962c6a052e1ac45fed05d0d607 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -5,7 +5,7 @@
  *
  * 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
+ * published by the Free Software Foundation -- either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -44,11 +44,9 @@ void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP) {
 
 
 /*
- * Destructor for 'struct blogpost' which does the rendering first.
- * By rendering from here, we eliminate the need for a separate iterator, although
- * we might run into trouble when we get around to displaying newest-to-oldest...
+ * Render (maybe) a single blog post and (maybe) its comments
  */
-void blogpost_render_and_destroy(struct blogpost *bp) {
+void blogpost_render(struct blogpost *bp) {
        const StrBuf *Mime;
        int p = 0;
        int i;
@@ -87,16 +85,21 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
                }
        }
 
-
-       if (bp->alloc_msgs > 0) {
-               free(bp->msgs);
-       }
-
        /* offer the comment box */
        if (p == bp->top_level_id) {
                do_template("blog_comment_box");
        }
 
+}
+
+
+/*
+ * Destructor for "struct blogpost"
+ */
+void blogpost_destroy(struct blogpost *bp) {
+       if (bp->alloc_msgs > 0) {
+               free(bp->msgs);
+       }
        free(bp);
 }
 
@@ -146,12 +149,12 @@ struct bltr blogview_learn_thread_references(long msgnum)
                {
                        if (!strncasecmp(ChrPtr(Buf), "msgn=", 5)) {
                                StrBufCutLeft(Buf, 5);
-                               bltr.id = abs(HashLittle(ChrPtr(Buf), StrLength(Buf)));
+                               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 = abs(HashLittle(ChrPtr(r), StrLength(r)));
+                               bltr.refs = ThreadIdHash(r);
                        }
                }
        }
@@ -178,17 +181,15 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
 
        /* 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
-        * that message ID is neither the id nor the refs.  Actually, that might *be*
-        * the way to display only a single message (with or without comments).
+        * that message ID is neither the id nor the refs.
         */
 
        if (b.refs == 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_render_and_destroy);
+               bp->top_level_id = b.id;
+               Put(BLOG, (const char *)&b.id, sizeof(b.id), bp, (DeleteHashDataFunc)blogpost_destroy);
        }
        else {
                GetHash(BLOG, (const char *)&b.refs , sizeof(b.refs), (void *)&bp);
@@ -220,25 +221,59 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
 
 /*
  * Sort a list of 'struct blogpost' objects by newest-to-oldest msgnum.
+ * With big thanks to whoever wrote http://www.c.happycodings.com/Sorting_Searching/code14.html
  */
-int blogview_sortfunc(const void *s1, const void *s2) {
-       long *l1 = (long *)(s1);
-       long *l2 = (long *)(s2);
+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);
 }
 
 
+/*
+ * 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.
+ */
 int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
 {
-       /* HashList *BLOG = (HashList *) *ViewSpecific; */
+       HashList *BLOG = (HashList *) *ViewSpecific;
+       HashPos *it;
+       const char *Key;
+       void *Data;
+       long len;
+       int i;
+       struct blogpost **blogposts = NULL;
+       int num_blogposts = 0;
+       int num_blogposts_alloc = 0;
+
+       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[num_blogposts++] = (struct blogpost *) Data;
+       }
+       DeleteHashPos(&it);
 
-       /*
-        * No code needed here -- we render during disposition.
-        * Maybe this is the location where we want to handle pretty permalinks.
-        */
+       if (num_blogposts > 0) {
+               qsort(blogposts, num_blogposts, sizeof(void *), blogview_sortfunc);
+
+               /* FIXME this is where we handle date ranges etc */
+               for (i=0; i<num_blogposts; ++i) {
+                       blogpost_render(blogposts[i]);
+               }
+               free(blogposts);
+       }
 
        return(0);
 }
@@ -254,6 +289,7 @@ int blogview_Cleanup(void **ViewSpecific)
        return 0;
 }
 
+
 void 
 InitModule_BLOGVIEWRENDERERS
 (void)