publish_my_data 0.0.12 → 0.0.13

data/app/models/publish_my_data/dataset.rb

@@ -23,7 +23,7 @@ module PublishMyData
     field :data_dump, RDF::VOID.dataDump, :is_uri => true # full download URI
 
      # what the data is about
-    field :theme, RDF::DCAT.theme
+    field :theme, RDF::DCAT.theme, :is_uri => true
     field :tags, RDF::DCAT.keyword, :multivalued => true # values are string literals
 
     # field :spatial_coverage, RDF::DC.spatial # value is a URI for region covered, e.g. England.
@@ -56,7 +56,7 @@ module PublishMyData
     end
 
     def theme_obj
-      Theme.find(self.theme) rescue nil
+      Theme.find(self.theme.to_s) rescue nil
     end
 
     class << self

data/lib/publish_my_data/paginator.rb

@@ -59,9 +59,10 @@ module PublishMyData
     # returns a Kaminari paginatable array, or a plain old array
     # Note that this uses the :return_graph => false option for criteria execution to avoid duplicate graphs in the results
     # (which could mess with the pagination counts)
-    def paginate
+    # optionally pass an integer to use for the total count.
+    def paginate(total_count=nil)
       if self.pagination_params.format == :html && pagination_params.per_page && pagination_params.page
-        count = criteria.count #this has to happen first, before we modify the criteria with limit/offset
+        count = total_count || criteria.count #this has to happen first, before we modify the criteria with limit/offset
         add_limit_and_offset_criteria(criteria)
         paginatable = Kaminari.paginate_array(criteria.resources(:return_graph => false).to_a, total_count: count).page(self.pagination_params.page).per(self.pagination_params.per_page)
       else

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end