RubyGems - enju_oai - Versions diffs - 0.2.0.beta.2 → 0.2.0.beta.4 - Mend

enju_oai 0.2.0.beta.2 → 0.2.0.beta.4

Files changed (34) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328bd3be1f0de895dc62fe0af4fd666ea0fcb55a
-  data.tar.gz: 62f6aa1220faa8d7a239c5730a7dca972565724a
+  metadata.gz: 55b6718033fbd86ed2a0f09fe92ebc36248c0b10
+  data.tar.gz: 206d37c1ed22ee28ac26455c2e5e3b108e742bad
 SHA512:
-  metadata.gz: e156fc49edc35a863b1e0dbaecd0022b137931872b7d9c750485d8ce427df3412374bcfdf4d9b64cdd96e11aa0c4d862407a33ec3ced2e5fb703573391c514dd
-  data.tar.gz: 5d8ec84ed2afd8fa3c888642284da00131e3219a64f051173e8596dd201aceed718c8b79f5bea8920672ac81f8e5ceea83dc3b561c8a92740d31fc315aa4bb68
+  metadata.gz: e38dfee2edc5aadd5891e4683079578f5fbbfb88f91cef1887cd2b617b999c4e8c45ce9b4ba31d19c91cdd4d262364d02cf82fd8aaca8ab70df3ac0f384dcf6a
+  data.tar.gz: 0ec947d28b285b4022448edfc0aab2e33b93aa8f6d6bb0882ed30e977bf72c14bff7d9f1e2fa0280a9b19a909f09b9c48315e8b23eeffcd1ae91ba13c58cb510

data/app/controllers/oai_controller.rb CHANGED Viewed

@@ -21,6 +21,7 @@ class OaiController < ApplicationController
       search = Manifestation.search do
         order_by :updated_at, :desc
         paginate cursor: token, per_page: oai_per_page
+        with(:updated_at).between(from_time..until_time)
       end
       @manifestations = search.execute!.results

data/app/views/oai/_record_dcndl.xml.builder CHANGED Viewed

@@ -1,26 +1,29 @@
 xml_builder.tag! "rdf:RDF",
-  "xmlns:rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-  "xmlns:dcterms": "http://purl.org/dc/terms/",
-  "xmlns:dcndl": "http://ndl.go.jp/dcndl/terms/",
-  "xmlns:dc": "http://purl.org/dc/elements/1.1/",
-  "xmlns:rdfs": "http://www.w3.org/2000/01/rdf-schema#",
-  "xmlns:owl": "http://www.w3.org/2002/07/owl#",
-  "xmlns:foaf": "http://xmlns.com/foaf/0.1/" do
-  get_record_url = manifestations_url format: "oai", verb: 'GetRecord', metadataPrefix: 'dcndl', identifier: manifestation.oai_identifier
-  xml_builder.tag! "dcndl:BibAdminResource", "rdf:about": get_record_url do
-    xml_builder.tag! "dcndl:record", "rdf:resource": get_record_url
+  "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+  "xmlns:dcterms" => "http://purl.org/dc/terms/",
+  "xmlns:dcndl" => "http://ndl.go.jp/dcndl/terms/",
+  "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
+  "xmlns:rdfs" => "http://www.w3.org/2000/01/rdf-schema#",
+  "xmlns:owl" => "http://www.w3.org/2002/07/owl#",
+  "xmlns:foaf" => "http://xmlns.com/foaf/0.1/" do
+  get_record_url = oai_provider_url format: "xml", verb: 'GetRecord', metadataPrefix: 'dcndl', identifier: manifestation.oai_identifier
+  xml_builder.tag! "dcndl:BibAdminResource", "rdf:about" => get_record_url do
+    xml_builder.tag! "dcndl:record", "rdf:resource" => get_record_url + "#material"
     xml_builder.tag! "dcndl:bibRecordCategory", ENV['DCNDL_BIBRECORDCATEGORY']
   end
-  xml_builder.tag! "dcndl:BibResource", "rdf:about": get_record_url + "#material" do
+  xml_builder.tag! "dcndl:BibResource", "rdf:about" => get_record_url + "#material" do
+    xml_builder.tag! "rdfs:seeAlso", "rdf:resource" => manifestation_url(manifestation)
     manifestation.identifiers.each do |identifier|
       case identifier.identifier_type.try(:name)
       when 'isbn'
-        xml_builder.tag! "rdfs:seeAlso", "rdf:resource": "http://iss.ndl.go.jp/isbn/#{ identifier.body }"
-        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/ISBN"
+        xml_builder.tag! "rdfs:seeAlso", "rdf:resource" => "http://iss.ndl.go.jp/isbn/#{ identifier.body }"
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/ISBN"
       when 'issn'
-        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/ISSN"
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/ISSN"
+      when 'doi'
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/DOI"
       when 'ncid'
-        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype": "http://ndl.go.jp/dcndl/terms/NIIBibID"
+        xml_builder.tag! "dcterms:identifier", identifier.body, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/NIIBibID"
       end
     end
     xml_builder.tag! "dcterms:title", manifestation.original_title
@@ -32,54 +35,161 @@ xml_builder.tag! "rdf:RDF",
         end
       end
     end
-    xml_builder.tag! "dcterms:creator" do
+    if manifestation.title_alternative?
+      xml_builder.tag! "dcndl:alternative" do
+        xml_builder.tag! "rdf:Description" do
+          xml_builder.tag! "rdf:value", manifestation.title_alternative
+          if manifestation.title_alternative_transcription?
+            xml_builder.tag! "dcndl:transcription", manifestation.title_alternative_transcription
+          end
+        end
+      end
+    end
+    if manifestation.volume_number_string?
+      xml_builder.tag! "dcndl:volume" do
+        xml_builder.tag! "rdf:Description" do
+          xml_builder.tag! "rdf:value", manifestation.volume_number_string
+        end
+      end
+    elsif manifestation.volume_number?
+      xml_builder.tag! "dcndl:volume" do
+        xml_builder.tag! "rdf:Description" do
+          xml_builder.tag! "rdf:value", manifestation.volume_number
+        end
+      end
+    end
+    manifestation.series_statements.each do |series_statement|
+      xml_builder.tag! "dcndl:seriesTitle" do
+        xml_builder.tag! "rdf:Description" do
+          xml_builder.tag! "rdf:value", series_statement.original_title
+          if series_statement.title_transcription?
+            xml_builder.tag! "dcndl:transcription", series_statement.title_transcription
+          end
+        end
+      end
+    end
+    if manifestation.edition_string?
+      xml_builder.tag! "dcndl:edition", manifestation.edition_string
+    elsif manifestation.edition?
+      xml_builder.tag! "dcndl:edition", manifestation.edition
+    end
+    unless manifestation.creators.empty?
       manifestation.creators.each do |creator|
-        xml_builder.tag! "foaf:Agent" do
-          xml_builder.tag! "foaf:name", creator.full_name
+        xml_builder.tag! "dcterms:creator" do
+          xml_builder.tag! "foaf:Agent" do
+            xml_builder.tag! "foaf:name", creator.full_name
+            if creator.full_name_transcription?
+             xml_builder.tag! "dcndl:transcription", creator.full_name_transcription
+            end
+          end
         end
       end
-      xml_builder.tag! "dc:creator", manifestation.statement_of_responsibility
     end
-    xml_builder.tag! "dcterms:publisher" do
-      manifestation.publishers.each do |publisher|
+    xml_builder.tag! "dc:creator", manifestation.statement_of_responsibility unless manifestation.statement_of_responsibility.blank?
+    manifestation.series_statements.each do |series_statement|
+      xml_builder.tag! "dcndl:seriesCreator", series_statement.creator_string
+    end
+    manifestation.contributors.each do |contributor|
+      xml_builder.tag! "dcndl:contributor", contributor.full_name
+    end
+    manifestation.publishers.each do |publisher|
+      xml_builder.tag! "dcterms:publisher" do
         xml_builder.tag! "foaf:Agent" do
-          xml_builder.tag! "foaf:name", publisher.full_name
+          if publisher.corporate_name
+            xml_builder.tag! "foaf:name", publisher.corporate_name
+            xml_builder.tag! "dcndl:transcription", publisher.corporate_name_transcription if publisher.corporate_name_transcription?
+          elsif publisher.full_name
+            xml_builder.tag! "foaf:name", publisher.full_name
+            xml_builder.tag! "dcndl:transcription", publisher.full_name_transcription if publisher.full_name_transcription?
+          end
+          xml_builder.tag! "dcterms:description", publisher.note if publisher.note?
+          xml_builder.tag! "dcndl:location", publisher.place if publisher.place?
         end
       end
     end
-    xml_builder.tag! "dcterms:issued", manifestation.pub_date, "rdf:datatype": "http://purl.org/dc/terms/W3CDTF"
-    xml_builder.tag! "dcndl:materialType", "rdf:resource": "http://ndl.go.jp/ndltype/Book"
-  end
-  unless manifestation.attachment.blank?
-    xml_builder.fulltextURL manifestation_url(id: manifestation.id, format: :download)
-  end
-  %w( ISBN ISSN NCID ).each do |identifier|
-    manifestation.identifier_contents(identifier.downcase).each do |val|
-      xml_builder.tag! identifier, val
+    manifestation.publishers.each do |publisher|
+      xml_builder.tag! "dcndl:publicationPlace", publisher.country.alpha_2 if publisher.country.try(:name) != "unknown"
     end
-  end
-  if manifestation.root_series_statement
-    xml_builder.jtitle manifestation.root_series_statement.original_title
-  end
-  xml_builder.volume manifestation.volume_number_string
-  xml_builder.issue manifestation.issue_number_string
-  xml_builder.spage manifestation.start_page
-  xml_builder.epage manifestation.end_page
-  xml_builder.dateofissued manifestation.pub_date
-  #TODO: junii2: source
-  if manifestation.language.blank? or manifestation.language.name == 'unknown'
-    xml_builder.language "und"
-  else
-    xml_builder.language manifestation.language.iso_639_2
-  end
-  %w( pmid doi NAID ichushi ).each do |identifier|
-    manifestation.identifier_contents(identifier.downcase).each do |val|
-      xml_builder.tag! identifier, val
+    xml_builder.tag! "dcterms:issued", manifestation.pub_date, "rdf:datatype" => "http://purl.org/dc/terms/W3CDTF" if manifestation.pub_date?
+    xml_builder.tag! "dcterms:description", manifestation.description if manifestation.description?
+    manifestation.subjects.each do |subject|
+      xml_builder.tag! "dcterms:subject" do
+        xml_builder.tag! "rdf:Description" do
+          xml_builder.tag! "rdf:value", subject.term
+          xml_builder.tag! "dcndl:transcription", subject.term_transcription if subject.term_transcription?
+        end
+      end
+    end
+    manifestation.classifications.each do |classification|
+      case classification.classification_type.name
+      when 'ndlc'
+        xml_builder.tag! "dcterms:subject", "rdf:resource" => "http://id.ndl.go.jp/class/ndlc/"+classification.category
+      when 'ndc9'
+        xml_builder.tag! "dcterms:subject", "rdf:resource" => "http://id.ndl.go.jp/class/ndc9/"+classification.category
+      when 'ddc'
+        xml_builder.tag! "dcterms:subject", "rdf:resource" => "http://dewey.info/class/"+classification.category
+      when 'ndc8'
+        xml_builder.tag! "dc:subject", classification.category, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/NDC8"
+      when 'ndc'
+        xml_builder.tag! "dc:subject", classification.category, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/NDC"
+      when 'lcc'
+        xml_builder.tag! "dc:subject", classification.category, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/LCC"
+      when 'udc'
+        xml_builder.tag! "dc:subject", classification.category, "rdf:datatype" => "http://ndl.go.jp/dcndl/terms/UDC"
+      end
+    end
+    xml_builder.tag! "dcterms:language", manifestation.language.iso_639_2, "rdf:datatype" => "http://purl.org/dc/terms/ISO639-2"
+    xml_builder.tag! "dcndl:price", manifestation.price if manifestation.price?
+    if manifestation.extent? or manifestation.dimensions?
+      xml_builder.tag! "dcterms:extent", [ manifestation.extent, manifestation.dimensions ].compact.join(" ; ")
+    end
+    material_type = nil
+    case manifestation.carrier_type.name
+    when "volume"
+      material_type = :book
+    when "online_resource"
+      material_type = :electronic_resource
+    end
+    case manifestation.manifestation_content_type.name
+    when "text"
+      material_type = :book
+    when "tactile_text"
+      material_type = :braille
+    when "cartographic_image"
+      material_type = :map
+    when "performed_music"
+      material_type = :music
+    when "notated_music"
+      material_type = :music_score
+    when "still_image"
+      material_type = :still_image
+    when "two_dimensional_moving_image"
+      material_type = :moving_image
+    when "sounds"
+      material_type = :sound
+    end
+    case material_type
+    when :book
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/Book", "rdfs:label" => "図書"
+    when :electronic_resource
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/ElectronicResource", "rdfs:label" => "電子資料"
+    when :braille
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/Braille", "rdfs:label" => "点字"
+    when :map
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/Map", "rdfs:label" => "地図"
+    when :music
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/Music", "rdfs:label" => "音楽"
+    when :music_score
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://ndl.go.jp/ndltype/MusicScore", "rdfs:label" => "楽譜"
+    when :still_image
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://purl.org/dc/dcmitype/StillImage", "rdfs:label" => "静止画資料"
+    when :moving_image
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://purl.org/dc/dcmitype/MovingImage", "rdfs:label" => "映像資料"
+    when :sound
+      xml_builder.tag! "dcndl:materialType", "rdf:resource" => "http://purl.org/dc/dcmitype/Sound", "rdfs:label" => "録音資料"
+    end
+    if manifestation.serial and manifestation.frequency
+      xml_builder.tag! "dcndl:publicationPeriodicity", manifestation.frequency.name
     end
   end
-  #TODO: junii2: isVersionOf, hasVersion, isReplaceBy, replaces, isRequiredBy, requires, isPartOf, hasPart, isReferencedBy, references, isFormatOf, hasFormat
-  #TODO: junii2: coverage, spatial, NIIspatial, temporal, NIItemporal
-  #TODO: junii2: rights
-  #TODO: junii2: textversion
-  #TODO: junii2: grantid, dateofgranted, degreename, grantor
 end

data/lib/enju_oai/oai_controller.rb CHANGED Viewed

@@ -87,7 +87,7 @@ module EnjuOai
           times[:from] = Time.zone.parse(from_t)
         end
         if /^[12]\d{3}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/ =~ until_t
-          times[:until] = Time.zone.parse(until_t).beginning_of_day
+          times[:until] = Time.zone.parse(until_t).end_of_day
         else
           times[:until] = Time.zone.parse(until_t)
         end

data/lib/enju_oai/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EnjuOai
-  VERSION = "0.2.0.beta.2"
+  VERSION = "0.2.0.beta.4"
 end

data/spec/cassette_library/oai/list_records_xml_builder/when_metadataPrefix_is_dcndl/renders_well-formed_XML.yml ADDED Viewed

@@ -0,0 +1,280 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://iss.ndl.go.jp/api/sru?maximumRecords=1&onlyBib=true&operation=searchRetrieve&query=(itemno=R100000002-I000008369884-00)&recordSchema=dcndl
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Sun, 18 Sep 2016 04:54:45 GMT
+      Etag:
+      - '"4e9fd394f0b81a7266e04bf44415452d"'
+      X-Runtime:
+      - '0.198450'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Status:
+      - '200'
+      Content-Type:
+      - application/xml; charset=utf-8
+      Set-Cookie:
+      - ROUTEID=.ps25; path=/
+      - TS01cb7804=011338590a0cb2c03b61db464ffc9673495ac0b88a40261a87a5e9d395a6f2aa09f17a348ac974ed75c561f1c3b51baebf40f36b74;
+        path=/; domain=.iss.ndl.go.jp
+      - TS01f3cfdf=011338590a752f9a56daa620c1a0261fe9fcdf06dc8c4d9a310f81b45f6b792d11e792feaba9d4a2ffd5944cb1f7114b939a1cca92abcac93b08a22f87c916da056e99611d04139bb85ff7c1863f037b0caddf7abc;
+        Path=/
+      - _front_session_id=54f274d513496bd24506018c477d22be; domain=.iss.ndl.go.jp;
+        path=/; expires=Sun, 18-Sep-2016 05:54:45 GMT; HttpOnly
+      - ndl.go.jp=rd2o00000000000000000000ffff0a024f68o80; path=/
+      - serverid=1101; path=/
+      Vary:
+      - Accept-Encoding,User-Agent
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Length:
+      - '2107'
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNlYXJj
+        aFJldHJpZXZlUmVzcG9uc2UgeG1sbnM9Imh0dHA6Ly93d3cubG9jLmdvdi96
+        aW5nL3Nydy8iPgogIDx2ZXJzaW9uPjEuMjwvdmVyc2lvbj4KICA8bnVtYmVy
+        T2ZSZWNvcmRzPjE8L251bWJlck9mUmVjb3Jkcz4KICA8bmV4dFJlY29yZFBv
+        c2l0aW9uPjA8L25leHRSZWNvcmRQb3NpdGlvbj4KICA8ZXh0cmFSZXNwb25z
+        ZURhdGE+CiZsdDtmYWNldHMmZ3Q7CiAgJmx0O2xzdCBuYW1lPSZxdW90O1JF
+        UE9TSVRPUllfTk8mcXVvdDsmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q7
+        UjEwMDAwMDAwMSZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q7UjEwMDAwMDAwMiZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7
+        CiAgJmx0Oy9sc3QmZ3Q7CiAgJmx0O2xzdCBuYW1lPSZxdW90O05EQyZxdW90
+        OyZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDswJnF1b3Q7Jmd0OzEmbHQ7
+        L2ludCZndDsKICAmbHQ7L2xzdCZndDsKICAmbHQ7bHN0IG5hbWU9JnF1b3Q7
+        SVNTVUVEX0RBVEUmcXVvdDsmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q7
+        MjAwNiZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgJmx0Oy9sc3QmZ3Q7CiAg
+        Jmx0O2xzdCBuYW1lPSZxdW90O0xJQlJBUlkmcXVvdDsmZ3Q7CiAgICAmbHQ7
+        aW50IG5hbWU9JnF1b3Q75LiJ6YeN55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0
+        OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvkuqzpg73l
+        upznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0
+        O2ludCBuYW1lPSZxdW90O+S9kOizgOecjOeri+Wbs+abuOmkqCZxdW90OyZn
+        dDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q75YW15bqr
+        55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZs
+        dDtpbnQgbmFtZT0mcXVvdDvljJfmtbfpgZPnq4vlm7Pmm7jppKgmcXVvdDsm
+        Z3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+WNg+iR
+        ieW4guS4reWkruWbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAg
+        ICAmbHQ7aW50IG5hbWU9JnF1b3Q75Y2D6JGJ55yM56uL5p2x6YOo5Zuz5pu4
+        6aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0m
+        cXVvdDvlkozmrYzlsbHnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsv
+        aW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+Wbveeri+WbveS8muWb
+        s+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5h
+        bWU9JnF1b3Q75Z+8546J55yM56uL54aK6LC35Zuz5pu46aSoJnF1b3Q7Jmd0
+        OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvlpKfliIbn
+        nIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0
+        O2ludCBuYW1lPSZxdW90O+Wkp+mYquW4gueri+Wbs+abuOmkqCZxdW90OyZn
+        dDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q75aSn6Ziq
+        5bqc56uL5Lit5aSu5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsK
+        ICAgICZsdDtpbnQgbmFtZT0mcXVvdDvlpYjoia/nnIznq4vlm7Pmm7jmg4Xl
+        oLHppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1l
+        PSZxdW90O+WuruWfjuecjOWbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQm
+        Z3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q75a6u5bSO55yM56uL5Zuz5pu4
+        6aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0m
+        cXVvdDvlr4zlsbHnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50
+        Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+WxseWPo+ecjOeri+WxseWP
+        o+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q75bGx5qKo55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEm
+        bHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvlspDpmJznnIzl
+        m7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBu
+        YW1lPSZxdW90O+WyoeWxseecjOeri+Wbs+abuOmkqCZxdW90OyZndDsxJmx0
+        Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q75bKp5omL55yM56uL
+        5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQg
+        bmFtZT0mcXVvdDvls7bmoLnnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZs
+        dDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+W3neW0juW4guer
+        i+S4reWOn+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAm
+        bHQ7aW50IG5hbWU9JnF1b3Q75bqD5bO25biC56uL5Lit5aSu5Zuz5pu46aSo
+        JnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVv
+        dDvlvrPls7bnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0
+        OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+aEm+efpeecjOWbs+abuOmkqCZx
+        dW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q7
+        5paw5r2f55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsK
+        ICAgICZsdDtpbnQgbmFtZT0mcXVvdDvmnbHkuqzpg73nq4vkuK3lpK7lm7Pm
+        m7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1l
+        PSZxdW90O+agg+acqOecjOeri+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9p
+        bnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q75qiq5rWc5biC5Lit5aSu
+        5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQg
+        bmFtZT0mcXVvdDvmspbnuITnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZs
+        dDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+a7i+izgOecjOer
+        i+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q754aK5pys55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEm
+        bHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvnnIznq4vplbfp
+        h47lm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2lu
+        dCBuYW1lPSZxdW90O+efs+W3neecjOeri+Wbs+abuOmkqCZxdW90OyZndDsx
+        Jmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q756aP5LqV55yM
+        56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtp
+        bnQgbmFtZT0mcXVvdDvnpo/lsqHluILnt4/lkIjlm7Pmm7jppKgmcXVvdDsm
+        Z3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+emj+Wy
+        oeecjOeri+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAm
+        bHQ7aW50IG5hbWU9JnF1b3Q756aP5bO255yM56uL5Zuz5pu46aSoJnF1b3Q7
+        Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvnp4vn
+        lLDnnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAg
+        Jmx0O2ludCBuYW1lPSZxdW90O+e+pOmmrOecjOeri+Wbs+abuOmkqCZxdW90
+        OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q76Iyo
+        5Z+O55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAg
+        ICZsdDtpbnQgbmFtZT0mcXVvdDvpnZLmo67nnIznq4vlm7Pmm7jppKgmcXVv
+        dDsmZ3Q7MSZsdDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+md
+        meWyoeW4gueri+S4reWkruWbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQm
+        Z3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q76Z2Z5bKh55yM56uL5Lit5aSu
+        5Zuz5pu46aSoJnF1b3Q7Jmd0OzEmbHQ7L2ludCZndDsKICAgICZsdDtpbnQg
+        bmFtZT0mcXVvdDvpppnlt53nnIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZs
+        dDsvaW50Jmd0OwogICAgJmx0O2ludCBuYW1lPSZxdW90O+mrmOefpeecjOer
+        i+Wbs+abuOmkqCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q76bOl5Y+W55yM56uL5Zuz5pu46aSoJnF1b3Q7Jmd0OzEm
+        bHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvpub/lhZDls7bn
+        nIznq4vlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICZsdDsv
+        bHN0Jmd0OwombHQ7L2ZhY2V0cyZndDsKICA8L2V4dHJhUmVzcG9uc2VEYXRh
+        PgogIDxyZWNvcmRzPgogICAgPHJlY29yZD4KICAgICAgPHJlY29yZFNjaGVt
+        YT5pbmZvOnNydy9zY2hlbWEvMS9kYy12MS4xPC9yZWNvcmRTY2hlbWE+CiAg
+        ICAgIDxyZWNvcmRQYWNraW5nPnN0cmluZzwvcmVjb3JkUGFja2luZz4KICAg
+        ICAgPHJlY29yZERhdGE+CiZsdDtyZGY6UkRGIHhtbG5zOnJkZnM9JnF1b3Q7
+        aHR0cDovL3d3dy53My5vcmcvMjAwMC8wMS9yZGYtc2NoZW1hIyZxdW90OyB4
+        bWxuczpkYz0mcXVvdDtodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4x
+        LyZxdW90OyB4bWxuczpkY3Rlcm1zPSZxdW90O2h0dHA6Ly9wdXJsLm9yZy9k
+        Yy90ZXJtcy8mcXVvdDsgeG1sbnM6cmRmPSZxdW90O2h0dHA6Ly93d3cudzMu
+        b3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMmcXVvdDsgeG1sbnM6b3ds
+        PSZxdW90O2h0dHA6Ly93d3cudzMub3JnLzIwMDIvMDcvb3dsIyZxdW90OyB4
+        bWxuczpkY25kbD0mcXVvdDtodHRwOi8vbmRsLmdvLmpwL2RjbmRsL3Rlcm1z
+        LyZxdW90OyB4bWxuczpmb2FmPSZxdW90O2h0dHA6Ly94bWxucy5jb20vZm9h
+        Zi8wLjEvJnF1b3Q7Jmd0OwogICZsdDtkY25kbDpCaWJBZG1pblJlc291cmNl
+        IHJkZjphYm91dD0mcXVvdDtodHRwOi8vaXNzLm5kbC5nby5qcC9ib29rcy9S
+        MTAwMDAwMDAyLUkwMDAwMDgzNjk4ODQtMDAmcXVvdDsmZ3Q7CiAgICAmbHQ7
+        ZGNuZGw6Y2F0YWxvZ2luZ1N0YXR1cyZndDtDNyZsdDsvZGNuZGw6Y2F0YWxv
+        Z2luZ1N0YXR1cyZndDsKICAgICZsdDtkY25kbDpiaWJSZWNvcmRDYXRlZ29y
+        eSZndDtSMTAwMDAwMDAyJmx0Oy9kY25kbDpiaWJSZWNvcmRDYXRlZ29yeSZn
+        dDsKICAgICZsdDtkY25kbDpyZWNvcmQgcmRmOnJlc291cmNlPSZxdW90O2h0
+        dHA6Ly9pc3MubmRsLmdvLmpwL2Jvb2tzL1IxMDAwMDAwMDItSTAwMDAwODM2
+        OTg4NC0wMCNtYXRlcmlhbCZxdW90Oy8mZ3Q7CiAgJmx0Oy9kY25kbDpCaWJB
+        ZG1pblJlc291cmNlJmd0OwogICZsdDtkY25kbDpCaWJSZXNvdXJjZSByZGY6
+        YWJvdXQ9JnF1b3Q7aHR0cDovL2lzcy5uZGwuZ28uanAvYm9va3MvUjEwMDAw
+        MDAwMi1JMDAwMDA4MzY5ODg0LTAwI21hdGVyaWFsJnF1b3Q7Jmd0OwogICAg
+        Jmx0O2RjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9JnF1b3Q7aHR0
+        cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9KUE5PJnF1b3Q7Jmd0OzIxMTQz
+        Njg4Jmx0Oy9kY3Rlcm1zOmlkZW50aWZpZXImZ3Q7CiAgICAmbHQ7ZGN0ZXJt
+        czppZGVudGlmaWVyIHJkZjpkYXRhdHlwZT0mcXVvdDtodHRwOi8vbmRsLmdv
+        LmpwL2RjbmRsL3Rlcm1zL0lTQk4mcXVvdDsmZ3Q7NC04ODM2Ny0xMzEtMyZs
+        dDsvZGN0ZXJtczppZGVudGlmaWVyJmd0OwogICAgJmx0O3JkZnM6c2VlQWxz
+        byByZGY6cmVzb3VyY2U9JnF1b3Q7aHR0cDovL2lkLm5kbC5nby5qcC9qcG5v
+        LzIxMTQzNjg4JnF1b3Q7LyZndDsKICAgICZsdDtyZGZzOnNlZUFsc28gcmRm
+        OnJlc291cmNlPSZxdW90O2h0dHA6Ly9pc3MubmRsLmdvLmpwL2lzYm4vNDg4
+        MzY3MTMxMyZxdW90Oy8mZ3Q7CiAgICAmbHQ7ZGN0ZXJtczp0aXRsZSZndDvm
+        g4XloLHmpJzntKLmvJTnv5ImbHQ7L2RjdGVybXM6dGl0bGUmZ3Q7CiAgICAm
+        bHQ7ZGM6dGl0bGUmZ3Q7CiAgICAgICZsdDtyZGY6RGVzY3JpcHRpb24mZ3Q7
+        CiAgICAgICAgJmx0O3JkZjp2YWx1ZSZndDvmg4XloLHmpJzntKLmvJTnv5Im
+        bHQ7L3JkZjp2YWx1ZSZndDsKICAgICAgICAmbHQ7ZGNuZGw6dHJhbnNjcmlw
+        dGlvbiZndDvjgrjjg6fjgqbjg5vjgqYg44Kx44Oz44K144KvIOOCqOODs+OC
+        t+ODpeOCpiZsdDsvZGNuZGw6dHJhbnNjcmlwdGlvbiZndDsKICAgICAgJmx0
+        Oy9yZGY6RGVzY3JpcHRpb24mZ3Q7CiAgICAmbHQ7L2RjOnRpdGxlJmd0Owog
+        ICAgJmx0O2RjbmRsOnNlcmllc1RpdGxlJmd0OwogICAgICAmbHQ7cmRmOkRl
+        c2NyaXB0aW9uJmd0OwogICAgICAgICZsdDtyZGY6dmFsdWUmZ3Q75paw44O7
+        5Zuz5pu46aSo5a2m44K344Oq44O844K6IDsgNiZsdDsvcmRmOnZhbHVlJmd0
+        OwogICAgICAgICZsdDtkY25kbDp0cmFuc2NyaXB0aW9uJmd0O+OCt+ODsyDj
+        g4jjgrfjg6fjgqvjg7Pjgqzjgq8g44K344Oq44O844K6Jmx0Oy9kY25kbDp0
+        cmFuc2NyaXB0aW9uJmd0OwogICAgICAmbHQ7L3JkZjpEZXNjcmlwdGlvbiZn
+        dDsKICAgICZsdDsvZGNuZGw6c2VyaWVzVGl0bGUmZ3Q7CiAgICAmbHQ7ZGNu
+        ZGw6ZWRpdGlvbiZndDsz6KiCJmx0Oy9kY25kbDplZGl0aW9uJmd0OwogICAg
+        Jmx0O2RjdGVybXM6Y3JlYXRvciZndDsKICAgICAgJmx0O2ZvYWY6QWdlbnQg
+        cmRmOmFib3V0PSZxdW90O2h0dHA6Ly9pZC5uZGwuZ28uanAvYXV0aC9lbnRp
+        dHkvMDA5ODU5ODYmcXVvdDsmZ3Q7CiAgICAgICAgJmx0O2ZvYWY6bmFtZSZn
+        dDvljp/nlLAsIOaZuuWtkCwgMTk0Ny0mbHQ7L2ZvYWY6bmFtZSZndDsKICAg
+        ICAgICAmbHQ7ZGNuZGw6dHJhbnNjcmlwdGlvbiZndDvjg4/jg6njg4AsIOOD
+        iOODouOCsyZsdDsvZGNuZGw6dHJhbnNjcmlwdGlvbiZndDsKICAgICAgJmx0
+        Oy9mb2FmOkFnZW50Jmd0OwogICAgJmx0Oy9kY3Rlcm1zOmNyZWF0b3ImZ3Q7
+        CiAgICAmbHQ7ZGN0ZXJtczpjcmVhdG9yJmd0OwogICAgICAmbHQ7Zm9hZjpB
+        Z2VudCByZGY6YWJvdXQ9JnF1b3Q7aHR0cDovL2lkLm5kbC5nby5qcC9hdXRo
+        L2VudGl0eS8wMTA2ODUxMCZxdW90OyZndDsKICAgICAgICAmbHQ7Zm9hZjpu
+        YW1lJmd0O+axn+iNiSwg55Sx5L2zJmx0Oy9mb2FmOm5hbWUmZ3Q7CiAgICAg
+        ICAgJmx0O2RjbmRsOnRyYW5zY3JpcHRpb24mZ3Q744Ko44Kw44K1LCDjg6bj
+        gqsmbHQ7L2RjbmRsOnRyYW5zY3JpcHRpb24mZ3Q7CiAgICAgICZsdDsvZm9h
+        ZjpBZ2VudCZndDsKICAgICZsdDsvZGN0ZXJtczpjcmVhdG9yJmd0OwogICAg
+        Jmx0O2RjdGVybXM6Y3JlYXRvciZndDsKICAgICAgJmx0O2ZvYWY6QWdlbnQg
+        cmRmOmFib3V0PSZxdW90O2h0dHA6Ly9pZC5uZGwuZ28uanAvYXV0aC9lbnRp
+        dHkvMDEwNTk0NjAmcXVvdDsmZ3Q7CiAgICAgICAgJmx0O2ZvYWY6bmFtZSZn
+        dDvlsI/lsbEsIOaGsuWPuCwgMTk3MS0mbHQ7L2ZvYWY6bmFtZSZndDsKICAg
+        ICAgICAmbHQ7ZGNuZGw6dHJhbnNjcmlwdGlvbiZndDvjgrPjg6Tjg54sIOOC
+        seODs+OCuCZsdDsvZGNuZGw6dHJhbnNjcmlwdGlvbiZndDsKICAgICAgJmx0
+        Oy9mb2FmOkFnZW50Jmd0OwogICAgJmx0Oy9kY3Rlcm1zOmNyZWF0b3ImZ3Q7
+        CiAgICAmbHQ7ZGN0ZXJtczpjcmVhdG9yJmd0OwogICAgICAmbHQ7Zm9hZjpB
+        Z2VudCByZGY6YWJvdXQ9JnF1b3Q7aHR0cDovL2lkLm5kbC5nby5qcC9hdXRo
+        L2VudGl0eS8wMDE0Nzk3OCZxdW90OyZndDsKICAgICAgICAmbHQ7Zm9hZjpu
+        YW1lJmd0O+mrmOWxsSwg5q2j5LmfLCAxOTQxLSZsdDsvZm9hZjpuYW1lJmd0
+        OwogICAgICAgICZsdDtkY25kbDp0cmFuc2NyaXB0aW9uJmd0O+OCv+OCq+OD
+        pOODniwg44Oe44K144OkJmx0Oy9kY25kbDp0cmFuc2NyaXB0aW9uJmd0Owog
+        ICAgICAmbHQ7L2ZvYWY6QWdlbnQmZ3Q7CiAgICAmbHQ7L2RjdGVybXM6Y3Jl
+        YXRvciZndDsKICAgICZsdDtkY3Rlcm1zOmNyZWF0b3ImZ3Q7CiAgICAgICZs
+        dDtmb2FmOkFnZW50IHJkZjphYm91dD0mcXVvdDtodHRwOi8vaWQubmRsLmdv
+        LmpwL2F1dGgvZW50aXR5LzAwMTQ2MTYzJnF1b3Q7Jmd0OwogICAgICAgICZs
+        dDtmb2FmOm5hbWUmZ3Q75qSN5p2+LCDosp7lpKssIDE5NDgtJmx0Oy9mb2Fm
+        Om5hbWUmZ3Q7CiAgICAgICAgJmx0O2RjbmRsOnRyYW5zY3JpcHRpb24mZ3Q7
+        44Km44Ko44Oe44OELCDjgrXjg4DjgqombHQ7L2RjbmRsOnRyYW5zY3JpcHRp
+        b24mZ3Q7CiAgICAgICZsdDsvZm9hZjpBZ2VudCZndDsKICAgICZsdDsvZGN0
+        ZXJtczpjcmVhdG9yJmd0OwogICAgJmx0O2RjOmNyZWF0b3ImZ3Q75Y6f55Sw
+        5pm65a2QIOe3qCZsdDsvZGM6Y3JlYXRvciZndDsKICAgICZsdDtkYzpjcmVh
+        dG9yJmd0O+WOn+eUsOaZuuWtkCwg5rGf6I2J55Sx5L2zLCDlsI/lsbHmhrLl
+        j7gsIOa+pOS6lea4hSDlhbHokZcmbHQ7L2RjOmNyZWF0b3ImZ3Q7CiAgICAm
+        bHQ7ZGNuZGw6c2VyaWVzQ3JlYXRvciZndDvpq5jlsbHmraPkuZ8sIOakjead
+        vuiynuWkqyDnm6Pkv64mbHQ7L2RjbmRsOnNlcmllc0NyZWF0b3ImZ3Q7CiAg
+        ICAmbHQ7ZGN0ZXJtczpwdWJsaXNoZXImZ3Q7CiAgICAgICZsdDtmb2FmOkFn
+        ZW50Jmd0OwogICAgICAgICZsdDtmb2FmOm5hbWUmZ3Q75qi55p2R5oi/Jmx0
+        Oy9mb2FmOm5hbWUmZ3Q7CiAgICAgICAgJmx0O2RjbmRsOnRyYW5zY3JpcHRp
+        b24mZ3Q744K444Ol44K944Oz44Oc44KmJmx0Oy9kY25kbDp0cmFuc2NyaXB0
+        aW9uJmd0OwogICAgICAgICZsdDtkY25kbDpsb2NhdGlvbiZndDvmnbHkuqwm
+        bHQ7L2RjbmRsOmxvY2F0aW9uJmd0OwogICAgICAmbHQ7L2ZvYWY6QWdlbnQm
+        Z3Q7CiAgICAmbHQ7L2RjdGVybXM6cHVibGlzaGVyJmd0OwogICAgJmx0O2Rj
+        bmRsOnB1YmxpY2F0aW9uUGxhY2UgcmRmOmRhdGF0eXBlPSZxdW90O2h0dHA6
+        Ly9wdXJsLm9yZy9kYy90ZXJtcy9JU08zMTY2JnF1b3Q7Jmd0O0pQJmx0Oy9k
+        Y25kbDpwdWJsaWNhdGlvblBsYWNlJmd0OwogICAgJmx0O2RjdGVybXM6ZGF0
+        ZSZndDsyMDA2LjEwJmx0Oy9kY3Rlcm1zOmRhdGUmZ3Q7CiAgICAmbHQ7ZGN0
+        ZXJtczppc3N1ZWQgcmRmOmRhdGF0eXBlPSZxdW90O2h0dHA6Ly9wdXJsLm9y
+        Zy9kYy90ZXJtcy9XM0NEVEYmcXVvdDsmZ3Q7MjAwNiZsdDsvZGN0ZXJtczpp
+        c3N1ZWQmZ3Q7CiAgICAmbHQ7ZGN0ZXJtczpzdWJqZWN0Jmd0OwogICAgICAm
+        bHQ7cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0mcXVvdDtodHRwOi8vaWQu
+        bmRsLmdvLmpwL2F1dGgvbmRsc2gvMDA1NzUwMTAmcXVvdDsmZ3Q7CiAgICAg
+        ICAgJmx0O3JkZjp2YWx1ZSZndDvmg4XloLHmpJzntKImbHQ7L3JkZjp2YWx1
+        ZSZndDsKICAgICAgJmx0Oy9yZGY6RGVzY3JpcHRpb24mZ3Q7CiAgICAmbHQ7
+        L2RjdGVybXM6c3ViamVjdCZndDsKICAgICZsdDtkY3Rlcm1zOnN1YmplY3Qg
+        cmRmOnJlc291cmNlPSZxdW90O2h0dHA6Ly9pZC5uZGwuZ28uanAvY2xhc3Mv
+        bmRsYy9VTDQxJnF1b3Q7LyZndDsKICAgICZsdDtkY3Rlcm1zOnN1YmplY3Qg
+        cmRmOnJlc291cmNlPSZxdW90O2h0dHA6Ly9pZC5uZGwuZ28uanAvY2xhc3Mv
+        bmRjOS8wMDcuNTgmcXVvdDsvJmd0OwogICAgJmx0O2RjdGVybXM6bGFuZ3Vh
+        Z2UgcmRmOmRhdGF0eXBlPSZxdW90O2h0dHA6Ly9wdXJsLm9yZy9kYy90ZXJt
+        cy9JU082MzktMiZxdW90OyZndDtqcG4mbHQ7L2RjdGVybXM6bGFuZ3VhZ2Um
+        Z3Q7CiAgICAmbHQ7ZGN0ZXJtczpleHRlbnQmZ3Q7MjAzcCA7IDIxY20mbHQ7
+        L2RjdGVybXM6ZXh0ZW50Jmd0OwogICAgJmx0O2RjbmRsOnByaWNlJmd0OzE5
+        MDDlhoYmbHQ7L2RjbmRsOnByaWNlJmd0OwogICAgJmx0O2RjdGVybXM6YXVk
+        aWVuY2UmZ3Q75LiA6IisJmx0Oy9kY3Rlcm1zOmF1ZGllbmNlJmd0OwogICAg
+        Jmx0O2RjbmRsOm1hdGVyaWFsVHlwZSByZGY6cmVzb3VyY2U9JnF1b3Q7aHR0
+        cDovL25kbC5nby5qcC9uZGx0eXBlL0Jvb2smcXVvdDsgcmRmczpsYWJlbD0m
+        cXVvdDvlm7Pmm7gmcXVvdDsvJmd0OwogICAgJmx0O2RjdGVybXM6YWNjZXNz
+        UmlnaHRzJmd0O1MwMVA5OVU5OSZsdDsvZGN0ZXJtczphY2Nlc3NSaWdodHMm
+        Z3Q7CiAgJmx0Oy9kY25kbDpCaWJSZXNvdXJjZSZndDsKJmx0Oy9yZGY6UkRG
+        Jmd0OwogICAgICA8L3JlY29yZERhdGE+CiAgICAgIDxyZWNvcmRQb3NpdGlv
+        bj4xPC9yZWNvcmRQb3NpdGlvbj4KICAgIDwvcmVjb3JkPgogIDwvcmVjb3Jk
+        cz4KPC9zZWFyY2hSZXRyaWV2ZVJlc3BvbnNlPgo=
+    http_version:
+  recorded_at: Sun, 18 Sep 2016 04:54:45 GMT
+recorded_with: VCR 3.0.3

data/spec/controllers/oai_controller_spec.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 RSpec.describe OaiController, type: :controller do
   fixtures :all
@@ -31,6 +31,13 @@ RSpec.describe OaiController, type: :controller do
         response.should render_template("oai/list_records")
       end
+      it "should limit from/until parameter with ListRecords" do
+        FactoryGirl.create(:manifestation, updated_at: DateTime.new(2016,5,1))
+        get :provider, format: 'xml', verb: 'ListRecords', metadataPrefix: 'junii2', from: '2016-05-01', until: '2016-05-02'
+        expect(assigns(:manifestations)).not_to be_blank
+        expect(assigns(:manifestations).size).to eq 1
+      end
       it "should not assign all manifestations as @manifestations in oai format with ListIdentifiers without metadataPrefix" do
         get :provider, format: 'xml', :verb => 'ListIdentifiers'
         assigns(:manifestations).should_not be_nil

data/spec/dummy/app/models/user.rb CHANGED Viewed

@@ -5,3 +5,7 @@ class User < ActiveRecord::Base
   include EnjuSeed::EnjuUser
 end
+Item.include(EnjuLibrary::EnjuItem)
+Manifestation.include(EnjuOai::OaiModel)
+Manifestation.include(EnjuSubject::EnjuManifestation)

data/spec/dummy/config/application.rb CHANGED Viewed

@@ -5,6 +5,7 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 require 'enju_oai'
 require 'enju_nii'
+require 'enju_ndl'
 require 'enju_leaf'
 require 'globalize'
 require 'globalize-accessors'

data/spec/dummy/db/migrate/149_create_message_templates.rb ADDED Viewed

@@ -0,0 +1,18 @@
+class CreateMessageTemplates < ActiveRecord::Migration
+  def self.up
+    create_table :message_templates do |t|
+      t.string :status, :null => false
+      t.text :title, :null => false
+      t.text :body, :null => false
+      t.integer :position
+      t.string :locale, :default => I18n.default_locale.to_s
+      t.timestamps
+    end
+    add_index :message_templates, :status, :unique => true
+  end
+  def self.down
+    drop_table :message_templates
+  end
+end

data/spec/dummy/db/migrate/154_create_messages.rb ADDED Viewed

@@ -0,0 +1,23 @@
+class CreateMessages < ActiveRecord::Migration
+  def self.up
+    create_table :messages, :force => true do |t|
+      t.datetime :read_at
+      t.integer  :receiver_id, :sender_id
+      t.string   :subject, :null => false
+      t.text     :body
+      t.integer :message_request_id
+      t.integer :parent_id
+      t.timestamps
+    end
+    add_index :messages, :sender_id
+    add_index :messages, :receiver_id
+    add_index :messages, :message_request_id
+    add_index :messages, :parent_id
+  end
+  def self.down
+    drop_table :messages
+  end
+end