Changeset 654bb6066f0a41076097ffd2498c04805e4d7276

Timestamp:

08/26/10 21:50:23 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

19a2630635324aeed23f74061133ba433a639cd4

Parents:

62c7c77e091368d89d5f9699dd6185177dd37f4b

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/26/10 21:50:23)

Message:

[http::article,threads] Fixes for pagination

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Location:

http

Files:

• article.cc (modified) (1 diff)
• threads.cc (modified) (2 diffs)

http/article.cc

@@ -115 +115 @@
                         tlate::thread_value::ptr tv
                                 (new tlate::thread_value(tn, u));
+                        size_t tvl = tv->size();
                         tv->slice_window(start, length);
                         am->insert("thread", tv);
 
                         tlate::data_model::ptr pg(new tlate::data_model);
-                        pg->insert("first", start);
+                        pg->insert("first", start + 1);
                         pg->insert("last", start + tv->size());
                         pg->insert("size", tv->size());
                         pg->insert("max_size", length);
+                        pg->insert("total", tvl);
 
-                        if (length > tv->size())
+                        if (start + length < tvl)
                         {
                                 ::uri u = req->get_uri();

http/threads.cc

@@ -110 +110 @@
 
                         size_t cur = 0;
-                        bool more = false;
+                        size_t total = 0;
                         for (std::list<db::thread_node::ptr>::const_iterator
                                      it = thrs.begin();
                              it != thrs.end(); it++)
                         {
+                                total++;
+                                if (cur >= start + length) continue;
                                 cur++;
-                                if (cur >= start + length)
-                                {
-                                        more = true;
-                                        break;
-                                }
                                 if (cur > start)
                                         tl->push_back
@@ -128 +125 @@
 
                         tlate::data_model::ptr pg(new tlate::data_model);
-                        pg->insert("first", start);
-                        pg->insert("last", cur - 1);
+                        pg->insert("first", start + 1);
+                        pg->insert("last", cur);
                         pg->insert("size", cur - start);
                         pg->insert("max_size", length);
-
-                        if (more)
+                        pg->insert("total", total);
+                        if (cur < total)
                         {
                                 ::uri u = req->get_uri();