median 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    median (0.0.2)
+    median (0.0.3)
       activesupport (~> 3.2.3)
       nokogiri (~> 1.5.2)
       savon (~> 0.9.9)

data/lib/median/primo/record.rb

@@ -34,82 +34,15 @@ class Median::Primo::Record
     @links = Links.new(xml)
   end
 
-  def dedub?
-    self.id.present? ? self.id.downcase.start_with?('dedupmrg') : false
-  end
-
-  def local_resource?
-    !online_resource?
-  end
-
-  def online_resource?
-    online_resource_categories = ['online_resource', 'online resource', 'remote search resource', 'sfx resource']
-    online_resource_categories.include?(self.delivery_category)
-  end
-
-  def versions?
-    versions > 1
-  end
-
-  def series?
-    type.try(:downcase) == 'serie' or delivery_category == 'structural metadata'
-  end
-
-  private
+  protected
 
   class Links
     include Median::XmlSupport
 
-    field :openurl,         xpath: './LINKS/openurl', process: :force_sfx_menu_language
+    field :openurl,         xpath: './LINKS/openurl'
     field :backlink,        xpath: './LINKS/backlink'
     field :thumbnail,       xpath: './LINKS/thumbnail'
-    field :resource_links,  xpath: './LINKS/linktorsrc', multiple: true
-
-    def filtered_resource_links
-      filter_ezb_links(self.resource_links)
-    end
-
-    def default_resource_link
-      filtered_resource_links.first
-    end
-
-    def resource_link?
-      self.resource_links.present?
-    end
-
-
-    private
-
-    def filter_ezb_links(links)
-      ezb_link = get_ezb_link(links)
-      ezb_link.present? ? [ezb_link] : links
-    end
-
-    def get_ezb_link(links)
-      links.each do |link|
-        return link if link.include? 'uni-regensburg.de/ezeit'
-      end
-      nil
-    end
-
-    def force_sfx_menu_language(openurl)
-      openurl.gsub(/req\.language=.+&/, '') # remove the language setting to force thedefault
-    end
+    field :resource_links,  xpath: './/record/links/linktorsrc', multiple: true
   end
 
-  #
-  # GetIt links are broken in the SOAP API. The links always point to the first result.
-  #
-  #class GetItLinks < Array
-  #  def initialize(xml)
-  #    super()
-  #    nodes = xml.xpath('./GETIT')
-  #    nodes.each do |node|
-  #      #puts node.inspect
-  #      #self << {getit1: node.attribute('GetIt1').try(:value), getit2: node.attribute('GetIt2').try(:value)}
-  #      #puts self
-  #    end
-  #  end
-  #end
-
 end

data/lib/median/primo/search_request.rb

@@ -2,23 +2,22 @@ class Median::Primo::SearchRequest
 
   PRECISION_OPTIONS = {contains: 'contains', exact: 'exact', begins_with: 'begins_with'}
 
-  def initialize(request_params)
+  def initialize(options)
     # set search term
-    self.search_term = request_params[:q]
+    self.search_term = options[:search_term]
     # set the index field
-    self.index_field = request_params[:if]
+    self.index_field = options[:index_field]
     # set the precision
-    self.precision   = request_params[:po]
+    self.precision   = options[:precision]
     # page and page size
-    self.page        = request_params[:p]
-    self.page_size   = request_params[:ps]
+    self.page        = options[:page]
+    self.page_size   = options[:page_size]
     # set facets
-    self.facets      = request_params[:f]
-    # doc id in case we do a fullview search
-    # for a single record
-    self.doc_id      = request_params[:id]
-    # search scope
-    self.scope       = request_params[:scope]
+    self.facets      = options[:facets]
+    # doc id in case we do a fullview search for a single record
+    self.doc_id      = options[:doc_id]
+    # search locations
+    self.locations   = options[:locations]
   end
 
   # search term
@@ -74,10 +73,10 @@ class Median::Primo::SearchRequest
     @doc_id
   end
 
-  # search scope
-  attr_writer :scope
-  def scope
-    @scope || 'default'
+  # search locations
+  attr_writer :locations
+  def locations
+    @locations || []
   end
 
   # Facets
@@ -174,7 +173,7 @@ class Median::Primo::SearchRequest
         <SortByList>
           <SortField>rank</SortField>
         </SortByList>
-        #{scopes_xml}
+        #{locations_xml}
       </PrimoSearchRequest>
       <institution>PAD</institution>
       <group>GUEST</group>
@@ -199,20 +198,15 @@ class Median::Primo::SearchRequest
     end.join('')
   end
 
-  def scopes_xml
-    if self.scope == 'catalog'
-      return <<-xml
-        <Locations>
-          <uic:Location type="local" value="scope:(PAD_ALEPH_MM)"/>
-        </Locations>
-      xml
-    else
-      return <<-xml
-        <Locations>
-          <uic:Location type="local" value="scope:(PAD_ALEPH_MM)"/>
-          <uic:Location type="adaptor" value="primo_central_multiple_fe" />
-        </Locations>
-      xml
-    end
+  def locations_xml
+    locations = self.locations.map do |l|
+      "<uic:Location type=\"#{l[:type]}\" value=\"#{l[:value]}\"/>"
+    end.join
+
+    return <<-xml
+      <Locations>
+        #{locations}
+      </Locations>
+    xml
   end
 end

data/lib/median/primo/search_result.rb

@@ -45,20 +45,4 @@ class Median::Primo::SearchResult
     has_previous_page? ? search_request.page - 1 : 1
   end
 
-  protected
-
-  # show only configured facets in the configured order
-  #def filter_facets(facets)
-  #  configured_facets_names = Primo.config.facets
-  #  return facets if configured_facets_names.blank?
-  #
-  #  new_facets = []
-  #  configured_facets_names.each do |facet_name|
-  #    facets.each do |facet|
-  #      new_facets << facet if facet.name == facet_name
-  #    end
-  #  end
-  #  new_facets
-  #end
-
 end

data/lib/median/version.rb

@@ -1,3 +1,3 @@
 module Median
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: median
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1093772393699786230
+      hash: -3480515468127621782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24