blacklight_oai_provider 0.0.1pre1 → 0.0.1pre2

data/VERSION

@@ -1 +1 @@
-0.0.1pre1
+0.0.1pre2

data/lib/blacklight_oai_provider/solr_document_wrapper.rb

@@ -1,7 +1,7 @@
 module BlacklightOaiProvider
   class SolrDocumentWrapper < ::OAI::Provider::Model
     attr_reader :model, :timestamp_field
-    attr_accessor :options, :extra_controller_params
+    attr_accessor :options
     def initialize(controller, options = {})
       @controller = controller
 
@@ -10,37 +10,36 @@ module BlacklightOaiProvider
 
       @timestamp_field = @options[:timestamp]
       @limit = @options[:limit]
-      @extra_controller_params = {}
     end
 
     def sets
     end
 
     def earliest
-      Time.parse @controller.get_search_results({:sort => @timestamp_field +' asc', :rows => 1}, extra_controller_params).last.first.get(@timestamp_field)
+      Time.parse @controller.get_search_results(@controller.params, {:sort => @timestamp_field +' asc', :rows => 1}).last.first.get(@timestamp_field)
     end
 
     def latest
-      Time.parse @controller.get_search_results({:sort => @timestamp_field +' desc', :rows => 1}, extra_controller_params).last.first.get(@timestamp_field)
+      Time.parse @controller.get_search_results(@controller.params, {:sort => @timestamp_field +' desc', :rows => 1}).last.first.get(@timestamp_field)
     end
 
     def find(selector, options={})
       return next_set(options[:resumption_token]) if options[:resumption_token]
 
       if :all == selector
-        response, records = @controller.get_search_results({:sort => @timestamp_field + ' asc', :per_page => @limit}, extra_controller_params)
+        response, records = @controller.get_search_results(@controller.params, {:sort => @timestamp_field + ' asc', :per_page => @limit})
 
         if @limit && response.total >= @limit
           return select_partial(OAI::Provider::ResumptionToken.new(options.merge({:last => 0})))
         end
       else                                                    
-        records = @controller.get_search_results({:phrase_filters => {:id => selector.split('/', 2).last}}, extra_controller_params).last.first
+        records = @controller.get_search_results(@controller.params, {:phrase_filters => {:id => selector.split('/', 2).last}}).last.first
       end
       records
     end
 
     def select_partial token
-      records = @controller.get_search_results({:sort => @timestamp_field + ' asc', :per_page => @limit, :page => token.last}, extra_controller_params).last
+      records = @controller.get_search_results(@controller.params, {:sort => @timestamp_field + ' asc', :per_page => @limit, :page => token.last}).last
 
       raise ::OAI::ResumptionTokenException.new unless records
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_oai_provider
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre1
+  version: 0.0.1pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153081380 !ruby/object:Gem::Requirement
+  requirement: &2153049680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153081380
+  version_requirements: *2153049680
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: &2153080820 !ruby/object:Gem::Requirement
+  requirement: &2153049140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153080820
+  version_requirements: *2153049140
 - !ruby/object:Gem::Dependency
   name: oai
-  requirement: &2153080220 !ruby/object:Gem::Requirement
+  requirement: &2153048520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153080220
+  version_requirements: *2153048520
 description: 
 email:
 - chris_beer@wgbh.org