diff --git a/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb b/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb index 86093aa..753accc 100644 --- a/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb +++ b/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb @@ -28,7 +28,7 @@ class VirtuosoPlugin::TriplesTemplate < Article def to_html(options = {}) article = self proc do - render :file => 'content_viewer/triples_template', :locals => {:article => article} + render :file => 'content_viewer/triples_template', :locals => {:article => article, :page => params[:npage]} end end @@ -36,11 +36,17 @@ class VirtuosoPlugin::TriplesTemplate < Article @plugin ||= VirtuosoPlugin.new(self) end + attr_reader :results + def template_content(page=1) begin - results = plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page}) + @results ||= plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page}) liquid_template = Liquid::Template.parse(template) - rendered_template = liquid_template.render('results' => results) + rendered_template = liquid_template.render('results' => results, + 'total_pages' => results.total_pages, + 'current_page' => results.current_page, + 'per_page' => results.per_page, + 'total_entries' => results.total_entries) transform_html(rendered_template) rescue => ex logger.info ex.to_s diff --git a/plugins/virtuoso/views/content_viewer/triples_template.html.erb b/plugins/virtuoso/views/content_viewer/triples_template.html.erb index 51dcf21..c5b593e 100644 --- a/plugins/virtuoso/views/content_viewer/triples_template.html.erb +++ b/plugins/virtuoso/views/content_viewer/triples_template.html.erb @@ -3,5 +3,7 @@
- <%= article.template_content %> + <%= article.template_content(page) %>
+ +<%= will_paginate(article.results, :param_name => 'npage')%> -- libgit2 0.21.2