Changeset 1201

Timestamp:

2008-10-01 21:50:22 (3 months ago)

Author:

gaspard

Message:

commit d3c99f242a0406c8e3aa8b4f65603d2653b76c8c
Author: Gaspard Bucher <gaspard@teti.ch>

Small change to pagination in order to use "nodes in site limit 5 paginate p" instead of "nodes in site limit 5 paginate param:p".
This makes it easier to get/set pagination key and avoids different syntax from zafu <r:nodes in='site' limit='5' paginate='p'>.

Files:

• trunk/lib/node_query.rb (modified) (1 diff)
• trunk/lib/parser/lib/rules/zena.rb (modified) (2 diffs)
• trunk/test/fixtures/files/Node-test.zafu (modified) (1 diff)

trunk/lib/node_query.rb

@@ -271 +271 @@
-        @errors << "invalid paginate clause '#{paginate}' (used without limit)"
-        nil
-
+param:
-        @page_size = [2,page_size.to_i].max
-        " OFFSET \#{((#{fld}.to_i > 0 ? #{fld}.to_i : 1)-1)*#{page_size.to_i}}"

trunk/lib/parser/lib/rules/zena.rb

@@ -2192 +2192 @@
-        page_size = params[:limit].to_i
-        page_size = 20 if page_size < 1
-param:
+
-      else
-        [:limit, :offset].each do |k|
@@ -2453 +2453 @@
-        end
-        
-query.pagination_key && (pagination_key = query.pagination_key[/param:([a-zA-Z_]+)/,1]
+(pagination_key = query.pagination_key
-          out "<% set_#{pagination_key}_nodes = #{query.finder(:count)}; set_#{pagination_key}_count = (set_#{pagination_key}_nodes / #{query.page_size.to_f}).ceil; set_#{pagination_key} = [1,params[:#{pagination_key}].to_i].max -%>"
-          @context[:paginate] = pagination_key

trunk/test/fixtures/files/Node-test.zafu

@@ -44 +44 @@
-  <p><b do='[p_nodes]'/> nodes</p>
-  <p>
-
+update='pagir' 
-    <r:show var='p'/>/<r:show var='p_count'/>
-
+update='pagir' 
-  </p>
-<ul>