Stop processing if the viewer is only interested in a single post and that message...

[citadel.git] / webcit / blogview_renderer.c

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index d125e2ccd7dee523f86f0eb5f612b92aaadc2a1c..6492f20ad563b2b817ea0ef67c15f26df7b3adca 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,
@@ -176,15 +176,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
-        * 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).
+       /* 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);
@@ -221,22 +227,22 @@ int blogview_LoadMsgFromServer(SharedMessageStatus *Stat,
 
 
 /*
- * Sort a list of 'struct blogpost' objects by newest-to-oldest msgnum.
-int blogview_sortfunc(const void *s1, const void *s2) {
-       long *l1 = (long *)(s1);
-       long *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);
 }
- */
-
 
 
 /*
  * 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)
 {
@@ -245,16 +251,15 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
        const char *Key;
        void *Data;
        long len;
-       struct blogpost *bp;
        int i;
        struct blogpost **blogposts = NULL;
        int num_blogposts = 0;
        int num_blogposts_alloc = 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)) {
-               bp = (struct blogpost *) Data;
-
                if (num_blogposts >= num_blogposts_alloc) {
                        if (num_blogposts_alloc == 0) {
                                num_blogposts_alloc = 100;
@@ -264,17 +269,31 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
                        }
                        blogposts = realloc(blogposts, (num_blogposts_alloc * sizeof (struct blogpost *)));
                }
-               blogposts[num_blogposts++] = bp;
+               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) {
+
+               /* Sort newest-to-oldest */
+               qsort(blogposts, num_blogposts, sizeof(void *), blogview_sortfunc);
+
+               /* FIXME -- allow the user to select a starting point in the list */
+
+               /* 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<num_blogposts; ++i) {
-                       wc_printf("Top level ID is %d", blogposts[i]->top_level_id);
-                       wc_printf("; top level msgnum is %ld", blogposts[i]->msgs[0]);
                        blogpost_render(blogposts[i]);
                }
+
+               /* Done.  We are only freeing the array of pointers; the data itself
+                * will be freed along with the hash list.
+                */
                free(blogposts);
        }
 
@@ -292,6 +311,7 @@ int blogview_Cleanup(void **ViewSpecific)
        return 0;
 }
 
+
 void 
 InitModule_BLOGVIEWRENDERERS
 (void)