libis-tools 0.9.33 → 0.9.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32b22bd78028e1293d30915d975d512069554bd
-  data.tar.gz: 809de259211204db9256b6715c310767d65c17ee
+  metadata.gz: 496a0d1ff8e44103253381ff293cb4190bb52671
+  data.tar.gz: 7e2dac37a49a4d41ecbb275e1e953361c07b8b4c
 SHA512:
-  metadata.gz: 1ccbb3668e98bac56777effbb0cf04f05fc38b057533946133663adcc43fa7577ffbd325603323d2b3ae2a14b7cf2d18016974d8902bd65d10c51e3d856dc366
-  data.tar.gz: b6e3803215de5687653e8273e287a0360a56dd96f446bf4c1d5ec6679ff641162dc2c34cbe967ecd294c9a38bc3023d349b4947f1ebb290611561f90c62d4f6b
+  metadata.gz: be3562b03f747eaef60425ca78313dc749783001a2e12169ff3bcc39d77d4ca710d18f88431301ab243a040fb4041a590066543da91ed60fd8c3606823b10226
+  data.tar.gz: 1144422bae5e26520405cf34e913550995817353b803f0d14cf13e32bea7852458ced3ed97f03a1a4eb8a093fd2f0e023e740e875a6c8b20bdd6f148cdfdd9ad

data/lib/libis/tools/metadata/mappers/kuleuven.rb

@@ -190,14 +190,15 @@ module Libis
             #   end
             # }
             # ALMA: 690 02 ax0 => 650 _7 ax6 $2 == 'KADOC'
-            all_tags('650_7', '6a') { |t|
-              next unless t._2 == 'KADOC'
-              if t._6 =~ /^\(ODIS-(PS|ORG)\)(\d+)$/
-                xml['dc'].identifier(odis_link($1, $2, CGI::escape(t._a)), 'xsi:type' => 'dcterms:URI')
-              # else
-              #   xml['dc'].identifier t._a
-              end
-            }
+            # all_tags('650_7', '6a') { |t|
+            #   next unless t._2 == 'KADOC'
+            #   if t._6 =~ /^\(ODIS-(PS|ORG)\)(\d+)$/
+            #     xml['dc'].identifier(odis_link($1, $2, CGI::escape(t._a)), 'xsi:type' => 'dcterms:URI')
+            #   # else
+            #   #   xml['dc'].identifier t._a
+            #   end
+            # }
+            # Verhuisd naar subject op vraag van KADOC (Luc Schokkaert)
           end
 
           def marc2dc_identifier_856(xml)
@@ -564,11 +565,13 @@ module Libis
           end
 
           def marc2dc_subject_650__7(xml)
-            # KADOC: ODIS-TW zoals ODIS-PS
             all_tags('650_7', '26a') { |t|
-              next unless t._2 == 'KADOC' and t._6 =~ /^\(ODIS-(TW)\)(\d)+$/
-              # xml['dc'].identifier('xsi:type' => 'dcterms:URI').text odis_link($1, $2, CGI::escape(t._a))
-              xml['dc'].subject list_s(t._a, element($2, prefix: '[', postfix: ']'))
+              next unless t._2 == 'KADOC'
+              if t._6 =~ /^\(ODIS-(PS|ORG)\)(\d+)$/
+                xml['dc'].subject(odis_link($1, $2, CGI::escape(t._a)), 'xsi:type' => 'dcterms:URI')
+              elsif t._6 =~ /^\(ODIS-(TW)\)(\d)+$/
+                xml['dc'].subject list_s(t._a, element(t._6, prefix: '[', postfix: ']'))
+              end
             }
           end
 
@@ -1609,7 +1612,6 @@ module Libis
             # KADOC: ODIS-GEO zoals ODIS-PS
             all_tags('650_7', '26a') { |t|
               next unless t._2 == 'KADOC' and t._6 =~ /^\(ODIS-(GEO)\)(\d)+$/
-              # xml['dc'].identifier('xsi:type' => 'dcterms:URI').text odis_link($1, $2, CGI::escape(t._a))
               xml['dc'].coverage list_s(t._a, element(t._6, prefix: '[', postfix: ']'))
             }
           end

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.33'
+    VERSION = '0.9.34'
   end
 end

data/spec/metadata/marc21_spec.rb

@@ -114,11 +114,11 @@ describe 'Marc21Record' do
   <dc:identifier>urn:ControlNumber:9921543960101471</dc:identifier>
   <dc:identifier>(BeLVLBS)002154396LBS01-Aleph</dc:identifier>
   <dc:identifier>8389207</dc:identifier>
-  <dc:identifier xsi:type="dcterms:URI">http://www.odis.be/lnk/or_9284#Bisdom+Antwerpen+%281961-heden%29</dc:identifier>
-  <dc:identifier xsi:type="dcterms:URI">http://www.odis.be/lnk/or_24894#Studiecentrum+voor+Zielzorg+en+Predicatie</dc:identifier>
   <dc:title>Anecdota Graeca, sacra et profana /</dc:title>
   <dc:creator>Wolf, Johann Christoph, 1683-1739, (author)</dc:creator>
   <dc:subject xsi:type="http://purl.org/dc/terms/UDC">276 =75 Griekse patrologie</dc:subject>
+  <dc:subject xsi:type="dcterms:URI">http://www.odis.be/lnk/or_9284#Bisdom+Antwerpen+%281961-heden%29</dc:subject>
+  <dc:subject xsi:type="dcterms:URI">http://www.odis.be/lnk/or_24894#Studiecentrum+voor+Zielzorg+en+Predicatie</dc:subject>
   <dc:temporal>1701-1750</dc:temporal>
   <dc:description>Ded. Petrus Theodorus Seelmann; Erdmannus Neumeister; Thomas Claussen; Joannes Grammius\n    \nElk deel heeft eigen titelp. in roodzwartdruk, met drukkersmerk</dc:description>
   <dc:date>1722 - 1724</dc:date>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.33
+  version: 0.9.34
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler