X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fblogview_renderer.c;h=d6ddf9c2599e42f94b40e40b8cb33a9fff3ea5e6;hb=067d72c217aeb029f1ee2583b69a54b0083e9f9b;hp=d125e2ccd7dee523f86f0eb5f612b92aaadc2a1c;hpb=d71b13162bd106b2720a2d5993c118ba16661595;p=citadel.git
diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index d125e2ccd..d6ddf9c25 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -222,15 +222,18 @@ 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);
+ struct blogpost *l1 = (struct blogpost *)(s1);
+ struct blogpost *l2 = (struct blogpost *)(s2);
+
+ wc_printf("Sort function called on %d, %d
\n", l1->top_level_id, l2->top_level_id);
+ return(0);
- if (*l1 > *l2) return(-1);
- if (*l1 < *l2) return(+1);
+ if (l1->msgs[0] > l2->msgs[0]) return(-1);
+ if (l1->msgs[0] < l2->msgs[0]) return(+1);
return(0);
}
- */
@@ -245,7 +248,6 @@ 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;
@@ -253,23 +255,22 @@ int blogview_render(SharedMessageStatus *Stat, void **ViewSpecific, long oper)
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;
+ 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++] = bp;
+ blogposts[num_blogposts++] = (struct blogpost *) Data;
}
-
DeleteHashPos(&it);
if (num_blogposts > 0) {
+ qsort(blogposts, num_blogposts, sizeof(struct blogpost *), blogview_sortfunc);
for (i=0; itop_level_id);
wc_printf("; top level msgnum is %ld", blogposts[i]->msgs[0]);