Changeset 2103

Timestamp:

04/25/08 11:36:53 (22 months ago)

Author:

fumiakiy

Message:

Implemented PHP version of pager related tags. Dynamically published archives can now be pagination-enabled by adding these tags and specify "auto" to limit and offset.

Location:

branches/release-36

Files:

• lib/MT/CMS/Blog.pm (modified) (1 diff)
• lib/MT/Template/ContextHandlers.pm (modified) (1 diff)
• php/lib/block.mtentries.php (modified) (2 diffs)
• php/lib/block.mtifcurrentpage.php (added)
• php/lib/block.mtifmoreresults.php (added)
• php/lib/block.mtifpreviousresults.php (added)
• php/lib/block.mtpagerblock.php (added)
• php/lib/function.mtcurrentpage.php (added)
• php/lib/function.mtnextlink.php (added)
• php/lib/function.mtpagerlink.php (added)
• php/lib/function.mtpreviouslink.php (added)
• php/lib/function.mttotalpages.php (added)
• php/lib/mtdb_base.php (modified) (6 diffs)

branches/release-36/lib/MT/CMS/Blog.pm

@@ -2211 +2211 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   # anything else is handed to mtview.php for resolution
-  RewriteRule ^(.*)\$ $mtview_server_url [L,QSA]
+  # passthrough query parameters
+  RewriteRule ^(.*)(\\?.*)\?\$ $mtview_server_url\$2 [L,QSA]
 </IfModule>
 

branches/release-36/lib/MT/Template/ContextHandlers.pm

@@ -561 +561 @@
                 my $limit = $_[0]->stash('limit');
                 my $offset = $_[0]->stash('offset');
-                $limit ? $offset / $limit + 1 : 1
+                $limit ? $offset / $limit + 1 : 1;
             },
             TotalPages => sub {
                 my $limit = $_[0]->stash('limit');
+                return 1 unless $limit;
                 my $count = $_[0]->stash('count');
                 require POSIX;

branches/release-36/php/lib/block.mtentries.php

@@ -39 +39 @@
     }
 
+    if ( isset($args['offset']) && ($args['offset'] == 'auto') ) {
+        $l = 0;
+        if ( $args['limit'] ) {
+            if ( $args['limit'] == 'auto' ) {
+                if ( $_REQUEST['limit'] )
+                    $l = $_REQUEST['limit'];
+                else {
+                    $blog_id = intval($ctx->stash('blog_id'));
+                    $blog = $ctx->mt->db->fetch_blog($blog_id);
+                    $l = $blog['blog_entries_on_index'];
+                }
+            }
+            else
+                $l = $args['limit'];
+        }
+        if ( !$l )
+            $l = 20;
+        $ctx->stash('__pager_limit', $l);
+        if ( $_REQUEST['offset'] )
+            $ctx->stash('__pager_offset', $_REQUEST['offset']);
+    }
+
     $entries = $ctx->stash('entries');
     if (!isset($entries)) {
@@ -77 +99 @@
             $args['tag'] or $args['tags'] or $args['tags'] = is_array($tag) ? $tag['tag_name'] : $tag;
         }
-        $entries =& $ctx->mt->db->fetch_entries($args);
+        if ( isset($args['offset']) && ($args['offset'] == 'auto') )
+            $total_count = 0;
+        $entries =& $ctx->mt->db->fetch_entries($args, $total_count);
+        if ( isset($args['offset']) && ($args['offset'] == 'auto') )
+            $ctx->stash('__pager_total_count', $total_count);
         $ctx->stash('entries', $entries);
     }

branches/release-36/php/lib/mtdb_base.php

@@ -413 +413 @@
     }
 
-    function &fetch_entries($args) {
+    function &fetch_entries($args, &$total_count = NULL) {
         if ($sql = $this->include_exclude_blogs($args)) {
             $blog_filter = 'and entry_blog_id ' . $sql;
@@ -422 +422 @@
         }
 
+        $pagination = 0;
         # automatically include offset if in request
         if ($args['offset'] == 'auto') {
+            $pagination = 1;
             $args['offset'] = 0;
             if ($args['limit'] || $args['lastn']) {
@@ -801 +803 @@
             $post_select_limit = $rco;
             $no_resort = 1;
+        } elseif ( !is_null($total_count) ) {
+            $orig_limit = $limit;
+            $orig_offset = $offset;
         } else {
             $sql = $this->apply_limit_sql($sql . " <LIMIT>", $limit, $offset);
@@ -810 +815 @@
         $entries = array();
         $j = 0;
-        $offset = $post_select_offset ? $post_select_offset : 0;
+        $offset = $post_select_offset ? $post_select_offset : $orig_offset;
         $limit = $post_select_limit ? $post_select_limit : 0;
         $id_list = array();
+        $_total_count = 0;
         while (true) {
             $e = $this->query_fetch(ARRAY_A);
@@ -826 +832 @@
                 }
             }
+            $_total_count++;
+            if ( !is_null($total_count) ) {
+                if ( ($orig_limit > 0)
+                  && ( ($_total_count-$offset) > $orig_limit) ) {
+                    // collected all the entries; only count numbers;
+                    continue;
+                }
+            }
             if ($offset && ($j++ < $offset)) continue;
             $e['entry_authored_on'] = $this->db2ts($e['entry_authored_on']);
@@ -833 +847 @@
             $this->_comment_count_cache[$e['entry_id']] = $e['entry_comment_count'];
             $this->_ping_count_cache[$e['entry_id']] = $e['entry_ping_count'];
-            if (($limit > 0) && (count($entries) >= $limit)) break;
+            if ( is_null($total_count) ) {
+                // the request does not want total count; break early
+                if (($limit > 0) && (count($entries) >= $limit)) break;
+            }
+        }
+        if ( !is_null($total_count) ) {
+            $total_count = $_total_count;
         }