celsius-primo 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4277500e7234aac3afa225684ede09aaf77e99fc
-  data.tar.gz: d7d6546d49383c0f645b65e23ffb2d092af3c6c8
+  metadata.gz: 4efed52d11b5b38d7bbe6a76fe4196b3cac0e617
+  data.tar.gz: 7eef803681d80fb6392a8cc38bc0aa700cf836d9
 SHA512:
-  metadata.gz: 5f9eac504685fced5f04eab16a437d283d1931285627a761e4cfeab099c7b95cab6124dbb2c30dc49286af9ad2ce7d565c113e80cbc18af1da0f877905e8ea34
-  data.tar.gz: 4d795059e87617ccec01c34e4b962e42546c744be9bc9ab4a042f9740d7040535876a58fe710d803ba794f2db589c0167409c691136dad060331b8250c0b7158
+  metadata.gz: bfdb2a0f4066ee4744353f9ca2b0465776304ff1014f0a46b8eabf96eec744da9abbdac173114fe310e9d4b51b3f589e2c54abf3d3c0c8e1e32eef21cce78844
+  data.tar.gz: 4603cab36760f66831bbd13e5cc2d896cd421bbdde5a0f5da90aacbdfae4dcf22974ac86ced8b61cf31f45173ae98ffc32b60a7c9ea7011117d5f11601089897

data/Gemfile

@@ -14,3 +14,4 @@ gem "pry-syntax-hacks",   "~> 0.0.6"
 
 gem "celsius", path: "~/github/ubpb/celsius"
 gem "deep_merger", path: "~/github/ubpb/deep_merger"
+gem "hashie", github: "intridea/hashie"

data/celsius-primo.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "celsius",       ">= 0.4.3"
   spec.add_dependency "httpi",         ">= 2.1.0", "< 3.0.0"
+  spec.add_dependency "hashie"
   spec.add_dependency "ox",            ">= 2.1.0"
 
   spec.add_development_dependency "bundler",   "~> 1.7"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",     ">= 3.0.0", "< 4.0.0"
+  spec.add_development_dependency "rspec",     ">= 3.0.0", "< 3.2.0"
   spec.add_development_dependency "simplecov", ">= 0.8.0"
   spec.add_development_dependency "vcr",       ">= 2.9.0",  "< 3.0.0"
   spec.add_development_dependency "webmock",   ">= 1.19.0", "< 2.0.0"

data/lib/celsius/primo/soap_api/searcher/search_brief/search_request_transformation/add_sort_by_list.rb

@@ -9,28 +9,33 @@ class Celsius::Primo::SoapApi::Searcher::SearchBrief::SearchRequestTransformatio
   #
   def call
     if sort_fields = (Celsius::Hash.deep_find_key(source, :sort) || []).first
-      # map sort field values to primo equivalents
-      primo_sort_fields = sort_fields.map(&transformation.method(:sort_field_mapping))
-
-      # memoize this node to shorten further lines
       primo_search_request = transformation.inner_search_request.locate("PrimoSearchRequest").first
+      insert_sort_by_node(primo_search_request, sort_fields)
+    end
+  end
 
-      # Order matters, SortField *must* be inserted after <Languages>
-      index_of_languages = primo_search_request.nodes.index do |node|
-        node.value == "Languages"
-      end
-
-      # primo can only handle *one* sort field
-      sort_by_list = Ox.parse(
-        <<-xml
-          <SortByList>
-            <SortField>#{primo_sort_fields.first}</SortField>
-          </SortByList>
-        xml
-      )
 
-      # insert the SortByList at the appropriate position
-      primo_search_request.nodes.insert(index_of_languages + 1, sort_by_list)
+  #
+  private
+  #
+  def insert_sort_by_node(primo_search_request, sort_fields)
+    # Order matters, SortField *must* be inserted after <Languages>
+    index_of_languages = primo_search_request.nodes.index do |node|
+      node.value == "Languages"
     end
+
+    # primo can only handle *one* sort field
+    sort_field = transformation.sort_field_mapping(sort_fields.first)
+
+    sort_by_list = Ox.parse(
+      <<-xml
+        <SortByList>
+          <SortField>#{sort_field}</SortField>
+        </SortByList>
+      xml
+    )
+
+    # insert the SortByList at the appropriate position
+    primo_search_request.nodes.insert(index_of_languages + 1, sort_by_list)
   end
 end

data/lib/celsius/primo/soap_api/searcher/search_brief/search_result_transformation/add_missing_facets.rb

@@ -1,17 +1,31 @@
 require "celsius/transformation/step"
-require "ox"
+require "hashie/extensions/deep_locate"
 
 class Celsius::Primo::SoapApi::Searcher::SearchBrief::SearchResultTransformation::
   AddMissingFacets < Celsius::Transformation::Step
 
-  #
-  # Sometimes, requested facets do not show up in search result, so we have to (re)add them
-  #
+  # handle primo bug where requested facets don't show up in search response
   def call
     (search_request["facets"] || {}).each do |facet_name, requested_facet|
+      # case 1 - there is no facet at all
       unless target["facets"][facet_name]
         if requested_facet["terms"]
-          target["facets"][facet_name] = empty_search_result_terms_facet
+          target["facets"][facet_name] = search_result_terms_facet
+        end
+      end
+    end
+
+    # case 2 - there is a facet, but the requested facet is not included
+    facet_queries = deep_locate(-> (key, value, object) {
+      key == "match" && value.keys.any? { |key_| key_.start_with?("facet") }
+    }, search_request)
+
+    facet_queries.each do |facet_query|
+      facet_query["match"].tap do |match|
+        target["facets"][match.keys.first]["terms"].tap do |facet_terms|
+          if facet_terms.none? { |term| term["term"] == match.values.first }
+            facet_terms << { "term" => match.values.first, "count" => 1 }
+          end
         end
       end
     end
@@ -20,36 +34,14 @@ class Celsius::Primo::SoapApi::Searcher::SearchBrief::SearchResultTransformation
   #
   private
   #
-  def empty_search_result_terms_facet
+  def search_result_terms_facet(terms = [])
     {
       "_type" => "terms",
-      "terms" => []
+      "terms" => terms
     }
   end
 
-=begin
-  # handle primo bug where requested facets don't show up in search response
-  process "//match", source: -> { @search_request} do |match, target|
-    if (target_facet_name = match.nodes.first.value).start_with?("facet_")
-      target_facet_value =  match.nodes.first.text
-      target_facet_count = find_all(@search_brief_return, "SEGMENTS/JAGROOT/RESULT/DOCSET/DOC").length
-
-      # case 1 - there is no facet at all
-      unless find(target, "facets/#{target_facet_name}")
-        find(target, "facets") << element(target_facet_name) do |target_facet|
-          target_facet << element("_type", text: "terms")
-          target_facet << array("terms")
-        end
-      end
-
-      # case 2 - there is a facet, but the requested facet is not included
-      unless find_all(target, "facets/#{target_facet_name}/terms/terms/term").map(&:text).include?(target_facet_value)
-        array(find(target, "facets/#{target_facet_name}/terms")) do |term|
-          term << element("term", text: target_facet_value)
-          term << element("count", text: target_facet_count.to_s, type: "integer")
-        end
-      end
-    end
+  def deep_locate(*args)
+    Hashie::Extensions::DeepLocate.deep_locate(*args)
   end
-=end
 end

data/lib/celsius/primo/soap_api/searcher/search_brief/search_result_transformation/process_records.rb

@@ -38,20 +38,19 @@ class Celsius::Primo::SoapApi::Searcher::SearchBrief::SearchResultTransformation
   #
   def add_place_of_publication!(record)
     if record["publisher"] && !record["placeOfPublication"]
-      record["placeOfPublication"] = []
-      record["publisher"] = ensure_array(record["publisher"])
+      places_seperated_from_publishers = ensure_array(record["publisher"]).map do |publisher|
+        publisher.match(/(\A[^:]*):(.*)/).captures.map(&:strip)
+      end
 
-      record["publisher"].each.with_index do |publisher, index|
-        publisher.match(/(\A[^:]*):(.*)/) do |match|
-          _place_of_publication, _publisher = match.captures.map(&:strip)
+      places_of_publication, publishers = [], []
 
-          record["placeOfPublication"][index] = _place_of_publication
-          record["publisher"][index] = _publisher
-        end
+      places_seperated_from_publishers.each.with_index do |place_and_publisher, index|
+        places_of_publication[index] = place_and_publisher.first
+        publishers[index] = place_and_publisher.last
       end
 
-      record["placeOfPublication"] = collapse_array(record["placeOfPublication"])
-      record["publisher"] = collapse_array(record["publisher"])
+      record["placeOfPublication"] = collapse_array(places_of_publication)
+      record["publisher"] = collapse_array(publishers)
     end
   end
   

data/lib/celsius/primo/version.rb

@@ -1,5 +1,5 @@
 module Celsius
   module Primo
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/assets/adapter/search/scenarios/missing_facets/search_request.yml

@@ -0,0 +1,66 @@
+---
+facets:
+  facet_tlevel:
+    terms:
+      field: facet_tlevel
+      shard_size: 75
+  facet_creator:
+    terms:
+      field: facet_creator
+      shard_size: 75
+  facet_local31:
+    terms:
+      field: facet_local31
+      shard_size: 75
+  facet_topic:
+    terms:
+      field: facet_topic
+      shard_size: 75
+  facet_creationdate:
+    terms:
+      field: facet_creationdate
+      shard_size: 75
+  facet_domain:
+    terms:
+      field: facet_domain
+      shard_size: 75
+  facet_lang:
+    terms:
+      field: facet_lang
+      shard_size: 75
+  facet_local15:
+    terms:
+      field: facet_local15
+      shard_size: 75
+  facet_local32:
+    terms:
+      field: facet_local32
+      shard_size: 75
+  facet_local33:
+    terms:
+      field: facet_local33
+      shard_size: 75
+from: 0
+size: 20
+sort:
+- _score
+query:
+  bool:
+    must:
+    - query_string:
+        default_operator: AND
+        fields:
+        - _all
+        query: linux
+    - query_string:
+        default_operator: AND
+        fields:
+        - creator
+        query: kofler
+    - query_string:
+        default_operator: AND
+        fields:
+        - _all
+        query: mysql
+    - match:
+        facet_topic: MySQL

data/spec/assets/adapter/search/scenarios/missing_facets/search_result.yml

@@ -0,0 +1,158 @@
+---
+took: 
+hits:
+  hits:
+  - _type: record
+    _source:
+      control:
+        sourcerecordid: 000831395
+        sourceid: PAD_ALEPH
+        recordid: PAD_ALEPH000831395
+        originalsourceid: PAD01
+        ilsapiid: PAD01000831395
+        sourcesystem: Aleph
+      display:
+        type: print
+        title: 'MySQL : Einführung, Programmierung, Referenz'
+        creator: Kofler, Michael
+        publisher: 'München [u.a.] : Addison-Wesley'
+        creationdate: '2001'
+        format: '624 S. : Ill., graph. Darst.'
+        subject: MySQL
+        language: ger
+        lds01: '{"ht_number":null,"label":"Linux Specials","volume_count":null,"label_additions":null}'
+        lds02: 'MySQL : Einführung, Programmierung, Referenz'
+        lds10: TWY9467
+      search:
+        creatorcontrib:
+        - Kofler, Michael
+        - Kofler, M.
+        - Kofler, Michaėlʹ
+        title:
+        - 'MySQL : Einführung, Programmierung, Referenz'
+        - Linux Specials
+        subject: MySQL
+        general: TWY
+        sourceid: PAD_ALEPH
+        recordid: PAD_ALEPH000831395
+        isbn:
+        - 3-8273-1762-2
+        - '9783827317629'
+        - '3827317622'
+        rsrctype: print
+        format: '624 S. : Ill., graph. Darst.'
+        creationdate: '2001'
+        searchscope: PAD_ALEPH
+        scope: PAD_ALEPH
+        lsr02: 'false'
+        lsr03: 'false'
+        lsr04: 'true'
+        lsr05: HT012953391
+        lsr09: '20010522'
+        lsr10:
+        - TWY9467
+        - TWY9467+1
+        - TWY9467+2
+        - TWY9467+3
+        lsr15: TWY
+        lsr31: monograph
+        lsr32: other
+        lsr33: print
+        lsr34: 'München [u.a.] : Addison-Wesley'
+      sort:
+        title: 'MySQL : Einführung, Programmierung, Referenz'
+        creationdate: '2001'
+        author: Kofler, Michael
+        lso01: '20010522'
+        lso03: TWY
+        lso48: PAD01000831395
+      facets:
+        language: ger
+        creationdate: '2001'
+        topic: MySQL
+        toplevel: printmedia
+        rsrctype:
+        - other
+        - books
+        creatorcontrib: Kofler, Michael
+        format: '624 S. : Ill., graph. Darst.'
+        lfc15: TWY
+        lfc31: monograph
+        lfc32: other
+        lfc33: print
+        frbrgroupid: '282131342'
+        frbrtype: '6'
+      delivery:
+        delcategory: physical_item
+      addata:
+        lad01: '{"author_statement":["Michael Kofler"],"person_creator_display":["Kofler,
+          Michael"]}'
+    _id: PAD_ALEPH000831395
+    creator: Kofler, Michael
+    created: '2001'
+    description: 
+    edition: 
+    format: '624 S. : Ill., graph. Darst.'
+    identifier:
+    - PAD01000831395
+    - PAD_ALEPH000831395
+    isbn:
+    - 3-8273-1762-2
+    - '9783827317629'
+    - '3827317622'
+    issn: 
+    language: ger
+    title: 'MySQL : Einführung, Programmierung, Referenz'
+    publisher: Addison-Wesley
+    subject: MySQL
+    placeOfPublication: München [u.a.]
+  total: 1
+facets:
+  facet_tlevel:
+    _type: terms
+    terms:
+    - term: printmedia
+      count: 1
+  facet_creator:
+    _type: terms
+    terms:
+    - term: Kofler, Michael
+      count: 1
+  facet_local31:
+    _type: terms
+    terms:
+    - term: monograph
+      count: 1
+  facet_topic:
+    _type: terms
+    terms:
+    - term: MySQL
+      count: 1
+  facet_creationdate:
+    _type: terms
+    terms:
+    - term: '2001'
+      count: 1
+  facet_domain:
+    _type: terms
+    terms: []
+  facet_lang:
+    _type: terms
+    terms:
+    - term: ger
+      count: 1
+  facet_local15:
+    _type: terms
+    terms:
+    - term: TWY
+      count: 1
+  facet_local32:
+    _type: terms
+    terms:
+    - term: other
+      count: 1
+  facet_local33:
+    _type: terms
+    terms:
+    - term: print
+      count: 1

data/spec/assets/adapter/search/{search_result_with_multiple_publishers.yml → scenarios/result_with_multiple_publishers/search_result.yml}

@@ -3127,12 +3127,26 @@ facets:
   facet_topic:
     _type: terms
     terms:
-    - term: SHELL
-      count: 5
     - term: Rechnernetz
       count: 10
     - term: Personalcomputer
       count: 5
+    - term: Computer science
+      count: 9
+    - term: Unternehmen
+      count: 4
+    - term: Eingebettetes System
+      count: 5
+    - term: Kernel
+      count: 5
+    - term: Programmierung
+      count: 6
+    - term: Python
+      count: 4
+    - term: Software Engineering
+      count: 12
+    - term: SHELL
+      count: 5
     - term: Web-Seite
       count: 7
     - term: c
@@ -3143,34 +3157,22 @@ facets:
       count: 8
     - term: Operating systems (Computers)
       count: 14
-    - term: Computer science
-      count: 9
     - term: Treiber
       count: 5
-    - term: Unternehmen
+    - term: Server
       count: 4
     - term: UNIX
       count: 23
-    - term: Eingebettetes System
-      count: 5
     - term: Open Source
       count: 6
     - term: Computersicherheit
       count: 6
     - term: Systemverwaltung
       count: 6
-    - term: Kernel
-      count: 5
-    - term: Programmierung
-      count: 6
     - term: Softwareentwicklung
       count: 7
     - term: Betriebssystem
       count: 9
-    - term: Python
-      count: 4
-    - term: Software engineering
-      count: 12
     - term: Gestaltung
       count: 5
     - term: Computer network architectures