libis-tools 0.9.25 → 0.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f083609ed0179998247ee56ec2432182fb1bbd32
-  data.tar.gz: 8418e85cae3c4dfb7d6dc7f8c178da71bed58d2e
+  metadata.gz: cfb982a51111d107e3556e974ae13c6785f57fc3
+  data.tar.gz: 9f2704b0359750d4be83c1ee426c5ac5f912ecd7
 SHA512:
-  metadata.gz: 84f969688fad37af3321f1b9631af1ad0b4deacac4cce100a9eee783775e55aaeec5c3175bd9b38b007f9f998ffb75039ecec08d4c73739db12b5164cc309cc8
-  data.tar.gz: 4e0109dca780dce283e969c3b749932fe218a6d790db1108ca1d976768a67206a920278cc01cc1a42bf5858179fa6ead7048b4e3e27bd7b8b490e41ccffe57c2
+  metadata.gz: a1ecf9fd301c96620532433966b6f88d24f3b442be563f9006bc5570b714d96b0035a5d7ad84551bf01c80557bcd54396c88116606f07c22907df3562765f3e1
+  data.tar.gz: 63af44158eadedc92367164e86a6b0065f80f1c4416c9b18615de6602f60cff7184531d95cc0da3a9d5ed32ddfb217823033ec3484160df1bacddd0661a0cd33

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

@@ -124,7 +124,9 @@ module Libis
 
           def marc2dc_identifier_029(xml)
             # "Siglum: " [MARC 029 __ $a]
-            each_field('029__', 'a') { |f| xml['dc'].identifier element(f, prefix: 'Siglum: ') }
+            # each_field('029__', 'a') { |f| xml['dc'].identifier element(f, prefix: 'Siglum: ') }
+            # ALMA: 029 __ a => 028 00 a
+            each_field('02800', 'a') { |f| xml['dc'].identifier element(f, prefix: 'Siglum: ') }
           end
 
           def marc2dc_identifier_700(xml)
@@ -139,7 +141,7 @@ module Libis
 
           def marc2dc_identifier_752(xml)
             # [MARC 752 __ $0]
-            each_field('752#_', '0') { |f| xml['dc'].identifier f }
+            each_field('752__', '0') { |f| xml['dc'].identifier f }
           end
 
           def marc2dc_identifier_020(xml)
@@ -179,8 +181,17 @@ module Libis
 
           def marc2dc_identifier_690(xml)
             # [MARC 690 02 $0]
-            all_tags('69002', '0a') { |t|
-              if t._0 =~ /^\(ODIS-(PS|ORG)\)(\d)+$/
+            # all_tags('69002', '0a') { |t|
+            #   if t._0 =~ /^\(ODIS-(PS|ORG)\)(\d)+$/
+            #     xml['dc'].identifier('xsi:type' => 'dcterms:URI').text odis_link($1, $2, CGI::escape(t._a))
+            #   else
+            #     xml['dc'].identifier t._a
+            #   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('xsi:type' => 'dcterms:URI').text odis_link($1, $2, CGI::escape(t._a))
               else
                 xml['dc'].identifier t._a
@@ -208,15 +219,23 @@ module Libis
 
           def marc2dc_title_245_0(xml)
             # [MARC 245 0# $a] " " [MARC 245 0# $b] " [" [MARC 245 0# $h] "]"
-            all_tags('2450#', 'a b h') { |t|
-              xml['dc'].title list_s(t._ab, opt_s(t._h))
+            # all_tags('2450#', 'a b h') { |t|
+            #   xml['dc'].title list_s(t._ab, opt_s(t._h))
+            # }
+            # ALMA: 245 ## Zh => 245 ## 6 [$h skipped, ': ' before $ skipped]
+            all_tags('2450#', 'a b') { |t|
+              xml['dc'].title element(t._ab, join: ' : ')
             }
           end
 
           def marc2dc_title_245_1(xml)
             # [MARC 245 1# $a] " " [MARC 245 1# $b] " [" [MARC 245 1# $h] "]"
-            all_tags('2451#', 'a b h') { |t|
-              xml['dc'].title element(t._ab, opt_s(t._h), join: ' ')
+            # all_tags('2451#', 'a b h') { |t|
+            #   xml['dc'].title element(t._ab, opt_s(t._h), join: ' ')
+            # }
+            # ALMA: 245 ## Zh => 245 ## 6 [$h skipped, ': ' before $ skipped]
+            all_tags('2451#', 'a b') { |t|
+              xml['dc'].title element(t._ab, join: ' : ')
             }
           end
 
@@ -237,13 +256,19 @@ module Libis
 
           def marc2dc_ispartof_243(xml)
             # [MARC 243 1# $a]
-            each_field('2431#', 'a') { |f| xml['dcterms'].isPartOf f }
+            # each_field('2431#', 'a') { |f| xml['dcterms'].isPartOf f }
+            # ALMA: 243 ## a => 830 ## a
+            each_field('8301#', 'a') { |f| xml['dcterms'].isPartOf f }
           end
 
           def marc2dc_ispartof_440(xml)
             # [MARC 440 _# $a] " : " [MARC 440 _# $b] " , " [MARC 440 _# $v]
-            all_tags('440_#', 'a b v') { |t|
-              xml['dcterms'].isPartOf element({parts: t._ab, join: ' : '}, t._v, join: ' , ')
+            # all_tags('440_#', 'a b v') { |t|
+            #   xml['dcterms'].isPartOf element({parts: t._ab, join: ' : '}, t._v, join: ' , ')
+            # }
+            # ALMA: 440 _# ab => 490 1_ a [$b replaced with ' : ']
+            all_tags('4901_', 'a v') { |t|
+              xml['dcterms'].isPartOf element(t._a, t._v, join: ' , ')
             }
           end
 
@@ -327,7 +352,11 @@ module Libis
 
           def marc2dc_alternative_246_19(xml)
             # [MARC 246 19 $a] ". " [MARC 246 19 $b]
-            all_tags('24619', 'a b') { |t|
+            # all_tags('24619', 'a b') { |t|
+            #   xml['dcterms'].alternative element(t._ab, join: '. ')
+            # }
+            # ALMA: 246 19 => 246 33
+            all_tags('24633', 'a b') { |t|
               xml['dcterms'].alternative element(t._ab, join: '. ')
             }
           end
@@ -362,10 +391,18 @@ module Libis
 
           def marc2dc_creator_100_1(xml)
             # [MARC 100 1_ $a] " " [MARC 100 1_ $b] " ("[MARC 100 1_ $c] ") " "("[MARC 100 1_ $d]") ("[MARC 100 1_ $g]"), " [MARC 100 1_ $4]" ("[MARC 100 1_ $e]") (" [MARC 100 1_ $9]")"
-            all_tags('1001_', 'a b c d g e 9') { |t|
+            # all_tags('1001_', 'a b c d g e 9') { |t|
+            #   next unless check_name(t, :creator)
+            #   xml['dc'].creator element(list_s(t._ab, opt_r(t._c), opt_r(t._d), opt_r(t._g)),
+            #                             list_s(full_name(t), opt_r(t._e), opt_r(t._9)),
+            #                             join: ', ')
+            # }
+
+            # ALMA: 100 #_ 9 => 100 #_ 3
+            all_tags('1001_', 'a b c d g e 3') { |t|
               next unless check_name(t, :creator)
               xml['dc'].creator element(list_s(t._ab, opt_r(t._c), opt_r(t._d), opt_r(t._g)),
-                                        list_s(full_name(t), opt_r(t._e), opt_r(t._9)),
+                                        list_s(full_name(t), opt_r(t._e), opt_r(t._3)),
                                         join: ', ')
             }
           end
@@ -489,17 +526,28 @@ module Libis
 
           def marc2dc_subject_691(xml)
             # [MARC 691 E1 $8] " " [ MARC 691 E1 $a]
-            all_tags('691E1', 'a8') { |t|
+            # all_tags('691E1', 'a8') { |t|
+            #   attributes = {'xsi:type' => 'http://purl.org/dc/terms/UDC'}
+            #   x = taalcode(t._9)
+            #   attributes['xml:lang'] = x if x
+            #   xml['dc'].subject(attributes).text list_s(t._ax)
+            # }
+            # ALMA: 691 E1 8a => 650 _7 ax $2 == 'UDC' $9 skipped
+            all_tags('650_7', 'a x') { |t|
+              next unless t._2 == 'UDC'
               attributes = {'xsi:type' => 'http://purl.org/dc/terms/UDC'}
-              x = taalcode(t._9)
-              attributes['xml:lang'] = x if x
-              xml['dc'].subject(attributes).text list_s(t._ax)
+              xml['dc'].subject(attributes).text list_s(t._x) # should be t._ax by spec, but seems idiotic
             }
           end
 
           def marc2dc_subject_082(xml)
             # [MARC 082 14 $a] " " [MARC 082 14 $x]
-            all_tags('08214', 'a x') { |t|
+            # all_tags('08214', 'a x') { |t|
+            #   xml['dc'].subject('xsi:type' => 'http://purl.org/dc/terms/DDC', 'xml:lang' => 'en').text list_s(t._ax)
+            # }
+            # ALMA: 082 14 ax2 => 650 _7 ax4 $2 = 'DDC abridged'
+            all_tags('650_7', 'a x') { |t|
+              next unless t._2 == 'DDC abridged'
               xml['dc'].subject('xsi:type' => 'http://purl.org/dc/terms/DDC', 'xml:lang' => 'en').text list_s(t._ax)
             }
           end
@@ -507,7 +555,10 @@ module Libis
           def marc2dc_subject_690(xml)
             # [MARC 690 [xx]$a]
             # Set dedups the fields
-            Set.new(each_field('690##', 'a')) { |f| xml['dc'].subject f }
+            # Set.new(each_field('690##', 'a')) { |f| xml['dc'].subject f }
+            # ALMA: 690 ## => 650 _7
+            # Set.new(all_fields('650_7', 'a')).each { |f| xml['dc'].subject f }
+            # rule disbled gives duplicates and needs to be redefined by KUL cataloguing staff
           end
 
           def marc2dc_temporal(xml)
@@ -526,16 +577,24 @@ module Libis
 
           def marc2dc_temporal_362(xml)
             # [MARC 362 __ $a]
-            each_field('362__', 'a') { |f| xml['dc'].temporal f }
+            # each_field('362__', 'a') { |f| xml['dc'].temporal f }
+            # ALMA: 362 __ a => 362 0_ a
+            each_field('3620_', 'a') { |f| xml['dc'].temporal f }
           end
 
           def marc2dc_temporal_752(xml)
             # [MARC 752 9_ $9]
-            each_field('7529_', '9') { |f| xml['dc'].temporal f }
+            # each_field('7529_', '9') { |f| xml['dc'].temporal f }
+            # ALMA: 752 9_ 9 => 953 __ a
+            each_field('953__', 'a') { |f| xml['dc'].temporal f }
 
             # [MARC 752 _9 $a] " (" [MARC 752 _9 $9]")"
-            all_tags('752_9', 'a 9') { |t|
-              xml['dc'].temporal list_s(t._a, opt_r(t._9))
+            # all_tags('752_9', 'a 9') { |t|
+            #   xml['dc'].temporal list_s(t._a, opt_r(t._9))
+            # }
+            # ALMA: 752 _9 a9 => 953 __ bc
+            all_tags('953__', 'b c') { |t|
+              xml['dc'].temporal list_s(t._b, opt_r(t._c))
             }
           end
 
@@ -544,42 +603,74 @@ module Libis
 
             x = element(
                 # [MARC 047 __ $a] " (" [MARC 047 __ $9]")"
-                all_tags('047__', 'a 9').collect { |t|
-                  list_s(t._a, opt_r(t._9))
+                # all_tags('047__', 'a 9').collect { |t|
+                #   list_s(t._a, opt_r(t._9))
+                # },
+                # ALMA: 047 __ a9 => 947 __ ab
+                all_tags('947__', 'a b').collect { |t|
+                  list_s(t._a, opt_r(t._b))
                 },
                 # [MARC 598 __ $a]
-                all_fields('598__', 'a'),
+                # all_fields('598__', 'a'),
+                # ALMA: 598 __ a => 958 __ a
+                all_fields('958__', 'a'),
                 # [MARC 597 __ $a]
-                all_fields('597__', 'a'),
+                # all_fields('597__', 'a'),
+                # ALMA: 597 __ a => 957 __ a
+                all_fields('957__', 'a'),
                 # [MARC 500 __ $a]
                 all_fields('500__', 'a'),
                 # [MARC 520 2_ $a]
                 all_fields('5202_', 'a'),
                 # "Projectie: " [MARC 093 __ $a]
-                all_tags('093__', 'a').collect { |t| element(t._a, prefix: 'Projectie: ') },
+                # all_tags('093__', 'a').collect { |t| element(t._a, prefix: 'Projectie: ') },
+                # ALMA: 093 ## a => 954 __ a
+                all_tags('954__', 'a').collect { |t| element(t._a, prefix: 'Projectie: ') },
                 # "Equidistance " [MARC 094 __ $a*]
-                all_tags('094__', 'a').collect { |t| element(t.a_a, prefix: 'Equidistance ', join: ';') },
+                # all_tags('094__', 'a').collect { |t| element(t.a_a, prefix: 'Equidistance ', join: ';') },
+                # ALMA: 094 ## a => 954 __ b
+                all_tags('954__', 'b').collect { |t| element(t.a_b, prefix: 'Equidistance ', join: ';') },
                 # [MARC 502 __ $a] ([MARC 502 __ $9])
-                all_tags('502__', 'a 9').collect { |t|
-                  list_s(t._a, opt_r(t._9))
+                # all_tags('502__', 'a 9').collect { |t|
+                #   list_s(t._a, opt_r(t._9))
+                # },
+                # ALMA: 502 __ 9 => 502 __ g
+                all_tags('502__', 'a g').collect { |t|
+                  list_s(t._a, opt_r(t._g))
                 },
                 # [MARC 529 __ $a] ", " [MARC 529 __ $b] " (" [MARC 529 __ $c] ")"
-                all_tags('529__', 'a b 9').collect { |t|
+                # all_tags('529__', 'a b 9').collect { |t|
+                #   element(t._ab,
+                #           join: ', ',
+                #           postfix: opt_r(t._9))
+                # },
+                # ALMA: 529 __ ab9 => 957 __ abc
+                all_tags('957__', 'a b c').collect { |t|
                   element(t._ab,
                           join: ', ',
-                          postfix: opt_r(t._9))
+                          postfix: opt_r(t._c))
                 },
                 # [MARC 534 9_ $a]
-                all_fields('5349_', 'a'),
+                # all_fields('5349_', 'a'),
+                # ALMA: 534 9_ a => 534 __ t
+                all_fields('534__', 't'),
                 # [MARC 534 _9 $a] "(oorspronkelijke uitgever)"
-                all_fields('534_9', 'a').collect { |f| element(f, postfix: '(oorspronkelijke uitgever)') },
+                # all_fields('534_9', 'a').collect { |f| element(f, postfix: '(oorspronkelijke uitgever)') },
+                # ALMA: 534 _9 a => 534 __ c
+                all_fields('534__', 'c').collect { |f| element(f, postfix: '(oorspronkelijke uitgever)') },
                 # [MARC 545 __ $a]
                 all_fields('545__', 'a'),
                 # [MARC 562 __ $a]
-                all_fields('562__', 'a'),
+                # all_fields('562__', 'a'),
+                # ALMA: 562 __ a => 963 __ a
+                all_fields('963__', 'a'),
                 # [MARC 563 __ $a] " " [MARC 563 __ $9] " (" [MARC 563 __ $u] ")"
-                all_tags('563__', 'a 9 u').collect { |t|
-                  list_s(t._a9, opt_r(t._u))
+                # all_tags('563__', 'a 9 u').collect { |t|
+                #   list_s(t._a9, opt_r(t._u))
+                # },
+                # ALMA: 563 __ a9u => 563 __ a3u
+                all_tags('563__', 'a 3 u').collect { |t|
+                  list_s(t._a3, opt_r(t._u))
                 },
                 # [MARC 586 __ $a]
                 all_fields('586__', 'a'),
@@ -646,18 +737,31 @@ module Libis
 
           def marc2dc_tableofcontents_505_0_(xml)
             # [MARC 505 0_  $a] " "[MARC 505 0_ $t]" / " [MARC 505 0_ $r*] " ("[MARC 505 0_ $9*]")"
-            all_tags('5050_', 'a t r 9') { |t|
+            # all_tags('5050_', 'a t r 9') { |t|
+            #   xml['dcterms'].tableOfContents list_s(t._at,
+            #                                       repeat(t.a_r, prefix: '/ '),
+            #                                       opt_r(repeat(t.a_9)))
+            # }
+            # ALMA: 505 ## 9 => 505 ## g
+            all_tags('5050_', 'a t r g') { |t|
               xml['dcterms'].tableOfContents list_s(t._at,
-                                                  repeat(t.a_r, prefix: '/ '),
-                                                  opt_r(repeat(t.a_9)))
+                                                    repeat(t.a_r, prefix: '/ '),
+                                                    opt_r(repeat(t.a_g)))
             }
           end
 
           def marc2dc_tableofcontents_505_09(xml)
             # [MARC 505 09 $a*] "\n" [MARC 505 09 $9*] "\n" [MARC 505 09 $u*]
-            all_tags('50509', 'a u 9') { |t|
+            # all_tags('50509', 'a u 9') { |t|
+            #   xml['dcterms'].tableOfContents element(repeat(t.a_a),
+            #                                          repeat(t.a_9),
+            #                                          repeat(t.a_u),
+            #                                          join: "\n")
+            # }
+            # ALMA: 505 ## 9 => 505 ## g
+            all_tags('50509', 'a u g') { |t|
               xml['dcterms'].tableOfContents element(repeat(t.a_a),
-                                                     repeat(t.a_9),
+                                                     repeat(t.a_g),
                                                      repeat(t.a_u),
                                                      join: "\n")
             }
@@ -665,10 +769,16 @@ module Libis
 
           def marc2dc_tableofcontents_505_2_(xml)
             # [MARC 505 2_  $a] " "[MARC 505 2_ $t]" / " [MARC 505 2_ $r*] " ("[MARC 505 2_ $9*]")"
-            all_tags('5052_', 'a t r 9') { |t|
+            # all_tags('5052_', 'a t r 9') { |t|
+            #   xml['dcterms'].tableOfContents list_s(t._at,
+            #                                       repeat(t.a_r, prefix: '/ '),
+            #                                       opt_r(repeat(t.a_9)))
+            # }
+            # ALMA: 505 ## 9 => 505 ## g
+            all_tags('5052_', 'a t r g') { |t|
               xml['dcterms'].tableOfContents list_s(t._at,
-                                                  repeat(t.a_r, prefix: '/ '),
-                                                  opt_r(repeat(t.a_9)))
+                                                    repeat(t.a_r, prefix: '/ '),
+                                                    opt_r(repeat(t.a_g)))
             }
           end
 
@@ -676,8 +786,12 @@ module Libis
             # DCTERMS:AVAILABLE
 
             # [MARC 591 ## $9] ":" [MARC 591 ## $a] " (" [MARC 591 ## $b] ")"
-            all_tags('591##', 'a b 9') { |t|
-              xml['dcterms'].available element(t._9a, join: ':', postfix: opt_r(t._b, prefix: ' '))
+            # all_tags('591##', 'a b 9') { |t|
+            #   xml['dcterms'].available element(t._9a, join: ':', postfix: opt_r(t._b, prefix: ' '))
+            # }
+            # ALMA: 591 __ ab9 => 866 __ axz
+            all_tags('866##', 'a x z') { |t|
+              xml['dcterms'].available element(t._za, join: ':', postfix: opt_r(t._x, prefix: ' '))
             }
           end
 
@@ -703,11 +817,11 @@ module Libis
             all_tags('1000_', 'a b c d g 9') { |t|
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(list_s(t._ab,
-                                                 opt_r(t._c),
-                                                 opt_r(t._d),
-                                                 opt_r(t._g)),
+                                                   opt_r(t._c),
+                                                   opt_r(t._d),
+                                                   opt_r(t._g)),
                                             list_s(full_name(t),
-                                                 opt_r(t._9)),
+                                                   opt_r(t._9)),
                                             join: ', ')
             }
           end
@@ -717,12 +831,12 @@ module Libis
             all_tags('1001_', 'a b c d g e 9') { |t|
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(list_s(t._ab,
-                                                 opt_r(t._c),
-                                                 opt_r(t._d),
-                                                 opt_r(t._g)),
+                                                   opt_r(t._c),
+                                                   opt_r(t._d),
+                                                   opt_r(t._g)),
                                             list_s(full_name(t),
-                                                 opt_r(t._e),
-                                                 opt_r(t._9)),
+                                                   opt_r(t._e),
+                                                   opt_r(t._9)),
                                             join: ', ')
             }
           end
@@ -734,7 +848,7 @@ module Libis
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(t._abcd,
                                             list_s(t._g,
-                                                 opt_r(full_name(t), fix: '( |)')),
+                                                   opt_r(full_name(t), fix: '( |)')),
                                             t._e,
                                             join: ', ')
             }
@@ -746,7 +860,7 @@ module Libis
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(t._a,
                                             list_s(t._g,
-                                                 opt_r(full_name(t))),
+                                                   opt_r(full_name(t))),
                                             t._e,
                                             join: ', ')
             }
@@ -757,10 +871,10 @@ module Libis
             all_tags('7102_', 'a g 9 e') { |t|
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(list_s(t._a,
-                                                 opt_r(t._g)),
+                                                   opt_r(t._g)),
                                             list_s(full_name(t),
-                                                 opt_r(t._9),
-                                                 opt_r(t._e)),
+                                                   opt_r(t._9),
+                                                   opt_r(t._e)),
                                             join: ', ')
             }
           end
@@ -771,7 +885,7 @@ module Libis
               next unless check_name(t, :contributor)
               xml['dc'].contributor element(t._anc,
                                             list_s(t._d,
-                                                 opt_r(t._g)),
+                                                   opt_r(t._g)),
                                             join: ', ')
             }
           end
@@ -806,18 +920,29 @@ module Libis
 
           def marc2dc_publisher_260___(xml)
             # [MARC 260 __ $e] " " [MARC 260 __ $f] " " [MARC 260 __ $c] " " [MARC 260 __ $9] " uitgave: " [MARC 260 __ $g]
-            all_tags('260__', 'e f c 9 g') { |t|
-              xml['dc'].publisher list_s(t._c9,
-                                       element(t._g, prefix: 'uitgave: '))
+            # all_tags('260__', 'e f c 9 g') { |t|
+            #   xml['dc'].publisher list_s(t._efc9,
+            #                              element(t._g, prefix: 'uitgave: '))
+            # }
+            # ALMA: 260 _# 9 => 260 __ 3
+            all_tags('260__', 'e f c 3 g') { |t|
+              xml['dc'].publisher list_s(t._efc3,
+                                         element(t._g, prefix: 'uitgave: '))
             }
           end
 
           def marc2dc_publisher_260__9(xml)
             # [MARC 260 _9 $c] " " [MARC 260 _9 $9*] " (druk: ) " [MARC 260 _9 $g]
-            all_tags('260_9', 'c 9 g') { |t|
+            # all_tags('260_9', 'c 9 g') { |t|
+            #   xml['dc'].publisher list_s(t._c,
+            #                              repeat(t.a_9),
+            #                              element(t._g, prefix: 'druk: '))
+            # }
+            # ALMA: 260 _# 9 => 260 __ 3
+            all_tags('260_9', 'c 3 g') { |t|
               xml['dc'].publisher list_s(t._c,
-                                       repeat(t.a_9),
-                                       element(t._g, prefix: 'uitgave: '))
+                                         repeat(t.a_3),
+                                         element(t._g, prefix: 'druk: '))
             }
           end
 
@@ -827,7 +952,7 @@ module Libis
               next unless name_type(t) == :publisher
               xml['dc'].publisher element(t._abcd,
                                           list_s(t._g,
-                                               opt_r(full_name(t), fix: '( |)')),
+                                                 opt_r(full_name(t), fix: '( |)')),
                                           t._e,
                                           join: ', ',
                                           postfix: '(uitgever)')
@@ -838,7 +963,7 @@ module Libis
             # [MARC 710 29 $a] "  (" [MARC 710 29 $c] "), " [MARC 710 29 $9]  ","  [710 29 $g] "(drukker)"
             all_tags('71029', 'a c g 9 4') { |t|
               xml['dc'].publisher element(list_s(t._a,
-                                               opt_r(t._c)),
+                                                 opt_r(t._c)),
                                           t._9g,
                                           join: ', ',
                                           postfix: '(drukker)')
@@ -901,17 +1026,22 @@ module Libis
 
           def marc2dc_type_655_x9_a(xml)
             # [MARC 655 #9 $a]
-            each_field('655#9', 'a') { |f| xml['dc'].type f }
+            # each_field('655#9', 'a') { |f| xml['dc'].type f }
+            # ALMA: 655 _9 a => 955 __ a
+            each_field('955__', 'a') { |f| xml['dc'].type f }
           end
 
           def marc2dc_type_655_9x_a(xml)
             # [MARC 655 9# $a]
-            each_field('6559#', 'a') { |f| xml['dc'].type f }
+            # each_field('6559#', 'a') { |f| xml['dc'].type f }
+            # ALMA: 655 9_ a => 955 __ b
+            # Zie marc2dc_type_655_9__a
           end
 
           def marc2dc_type_655__4_z(xml)
             # [MARC 655 _4 $z]
-            each_field('655_4', 'z') { |f| xml['dc'].type f }
+            # each_field('655_4', 'z') { |f| xml['dc'].type f }
+            # ALMA: 655 _4 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_fmt(xml)
@@ -921,75 +1051,94 @@ module Libis
 
           def marc2dc_type_655_94_z(xml)
             # [MARC 655 94 $z]
-            each_field('65594', 'z') { |f| xml['dc'].type f }
+            # each_field('65594', 'z') { |f| xml['dc'].type f }
+            # ALMA: 655 94 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_655_9__a(xml)
             # [MARC 655 9_ $a]
-            each_field('6559_', 'a') { |f| xml['dc'].type f }
+            # each_field('6559_', 'a') { |f| xml['dc'].type f }
+            # ALMA: 655 9_ a => 955 __ b
+            each_field('955__', 'b') { |f| xml['dc'].type f }
           end
 
           def marc2dc_type_088_9__a(xml)
             # [MARC 088 9_ $a]
-            each_field('0889_', 'a') { |f| xml['dc'].type f } if each_field('088__', 'axy').empty?
+            # each_field('0889_', 'a') { |f| xml['dc'].type f } if each_field('088__', 'axy').empty?
+            # ALMA: 088 9_ a9 => 340 __ d3
+            # ALMA: 088 __ axyz9 => 340 __ a3 [$xyz skipped]
+            each_field('340__', 'd') { |f| xml['dc'].type f } if each_field('340__', 'a').empty?
           end
 
           def marc2dc_type_088____z(xml)
             # [MARC 088 __ $z]
-            each_field('088__', 'z') { |f| xml['dc'].type f }
+            # each_field('088__', 'z') { |f| xml['dc'].type f }
+            # ALMA: 088 __ axyz9 => 340 __ a3 [$xyz skipped]
           end
 
           def marc2dc_type_088____a(xml)
             # [MARC 088 __ $a]
-            each_field('088__', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # each_field('088__', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # ALMA: 088 __ axyz9 => 340 __ a3 [$xyz skipped]
+            each_field('340__', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
           end
 
           def marc2dc_type_655__4_a(xml)
             # [MARC 655 _4 $a]
-            each_field('655_4', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # each_field('655_4', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # ALMA: 655 _4 axyz => 653 _6 a [$xyz skipped]
+            each_field('653_6', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
           end
 
           def marc2dc_type_655_94_a(xml)
             # [MARC 655 94 $a]
-            each_field('65594', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # each_field('65594', 'a') { |f| xml['dc'].type('xml:lang' => 'en').text f }
+            # ALMA: 655 94 axyz => 635 _6 a [$xyz skipped]
+            # Case covered by marc2dc_type_655__4_a
           end
 
           def marc2dc_type_088____x(xml)
             # [MARC 088 __ $x]
-            each_field('088__', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # each_field('088__', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # ALMA: 088 __ axyz9 => 340 __ a3 [$xyz skipped]
           end
 
           def marc2dc_type_655__4_x(xml)
             # [MARC 655 _4 $x]
-            each_field('655_4', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # each_field('655_4', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # ALMA: 655 _4 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_655_94_x(xml)
             # [MARC 655 94 $x]
-            each_field('65594', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # each_field('65594', 'x') { |f| xml['dc'].type('xml:lang' => 'nl').text f }
+            # ALMA: 655 94 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_088____y(xml)
             # [MARC 088 __ $y]
-            each_field('088__', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # each_field('088__', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # ALMA: 088 __ axyz9 => 340 __ a3 [$xyz skipped]
           end
 
           def marc2dc_type_655__4_y(xml)
             # [MARC 655 _4 $y]
-            each_field('655_4', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # each_field('655_4', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # ALMA: 655 _4 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_655_94_y(xml)
             # [MARC 655 94 $y]
-            each_field('65594', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # each_field('65594', 'y') { |f| xml['dc'].type('xml:lang' => 'fr').text f }
+            # ALMA: 655 94 axyz => 653 _6 a [$xyz skipped]
           end
 
           def marc2dc_type_655__2(xml)
             # [MARC 655 #2 $a] " " [MARC 655 #2 $x*] " " [MARC 655 #2 $9]
             all_tags('655#2', 'a x 9') { |t|
               xml['dc'].type({'xsi:type' => 'http://purl.org/dc/terms/MESH'}).text list_s(t._a,
-                                                                                        repeat(t.a_x),
-                                                                                        t._9)
+                                                                                          repeat(t.a_x),
+                                                                                          t._9)
             }
           end
 
@@ -1006,9 +1155,14 @@ module Libis
 
           def marc2dc_spatial_752(xml)
             # [MARC 752 __ $a]  " " [MARC 752 __ $c] " " [MARC 752 __ $d] " (" [MARC 752 __ $9] ")"
-            all_tags('752__', 'a c d 9') { |t|
+            # all_tags('752__', 'a c d 9') { |t|
+            #   xml['dcterms'].spatial list_s(t._acd,
+            #                                 opt_r(t._9))
+            # }
+            # ALMA: 752 __ acd9 => 952 acde
+            all_tags('952__', 'a c d e') { |t|
               xml['dcterms'].spatial list_s(t._acd,
-                                          opt_r(t._9))
+                                            opt_r(t._e))
             }
           end
 
@@ -1040,8 +1194,8 @@ module Libis
             # [MARC 651 #0 $a] " " [MARC 651 #0 $x*] " " [MARC 651 #0 $y] " " [MARC 651 #0 $z]
             all_tags('651#0', 'a x y z') { |t|
               xml['dcterms'].spatial({'xsi:type' => 'http://purl.org/dc/terms/LCSH'}).text list_s(t._a,
-                                                                                                repeat(t.a_x),
-                                                                                                t._yz)
+                                                                                                  repeat(t.a_x),
+                                                                                                  t._yz)
             }
           end
 
@@ -1049,7 +1203,7 @@ module Libis
             # [MARC 651 #2 $a] " " [MARC 651 #2 $x*]
             all_tags('651#2', 'a x') { |t|
               xml['dcterms'].spatial({'xsi:type' => 'http://purl.org/dc/terms/LCSH'}).text list_s(t._a,
-                                                                                                repeat(t.a_x))
+                                                                                                  repeat(t.a_x))
             }
           end
 
@@ -1064,22 +1218,39 @@ module Libis
 
           def marc2dc_extent_300__(xml)
             # [MARC 300 __ $a*] " " [MARC 300 __ $b] " " [MARC 300__  $c*] " " [MARC 300 __ $e] " (" [MARC 300 __ $9] ")"
-            all_tags('300__', 'a b c e 9') { |t|
+            # all_tags('300__', 'a b c e 9') { |t|
+            #   xml['dcterms'].extent list_s(repeat(t.a_a),
+            #                              t._b,
+            #                              repeat(t.a_c),
+            #                              t._e,
+            #                              opt_r(t._9))
+            # }
+            # ALMA: 300 __ 9 => 300 __ g
+            all_tags('300__', 'a b c e g') { |t|
               xml['dcterms'].extent list_s(repeat(t.a_a),
-                                         t._b,
-                                         repeat(t.a_c),
-                                         t._e,
-                                         opt_r(t._9))
+                                           t._b,
+                                           repeat(t.a_c),
+                                           t._e,
+                                           opt_r(t._g))
             }
           end
 
           def marc2dc_extent_300_9(xml)
             # [MARC 300 9_ $a] " " [MARC 300 9_ $b] " " [MARC 300 9_ $c*] " " [MARC 300 9_ $e] " (" [MARC 300 9_ $9]")"
-            all_tags('3009_', 'a b c e 9') { |t|
-              xml['dcterms'].extent list_s(t._ab,
-                                         repeat(t.a_c),
-                                         t._e,
-                                         opt_r(t._9))
+            # all_tags('3009_', 'a b c e 9') { |t|
+            #   xml['dcterms'].extent list_s(t._ab,
+            #                              repeat(t.a_c),
+            #                              t._e,
+            #                              opt_r(t._9))
+            # }
+            # ALMA: 300 9_ ac => 300 9_ ac
+            # ALMA: 300 9_ b9 => 340 __ oc
+            # This change is not compatible with DC converter (only 1 tag per DC element). 2 DC elements generated instead.
+            all_tags('3009_', 'a c') { |t|
+              xml['dcterms'].extent list_s(t._a, repeat(t.a_c))
+            }
+            all_tags('340__', 'o c') { |t|
+              xml['dcterms'].extent list_s(t._o, opt_r(t._c))
             }
           end
 
@@ -1090,12 +1261,16 @@ module Libis
 
           def marc2dc_extent_309(xml)
             # [MARC 309 __ $a]
-            each_field('309__', 'a') { |f| xml['dcterms'].extent f }
+            # each_field('309__', 'a') { |f| xml['dcterms'].extent f }
+            # ALMA: 309 __ a => 306 __ a
+            # covered by marc2dc_extent_306
           end
 
           def marc2dc_extent_339(xml)
             # [MARC 339 __ $a*]
-            all_tags('339__', 'a') { |t| xml['dcterms'].extent repeat(t.a_a) }
+            # all_tags('339__', 'a') { |t| xml['dcterms'].extent repeat(t.a_a) }
+            # ALMA: 339 __ a => 340 __ d
+            all_tags('340__', 'd') { |t| xml['dcterms'].extent repeat(t.a_d) }
           end
 
           def marc2dc_accrualperiodicity(xml)
@@ -1104,7 +1279,7 @@ module Libis
             # [MARC 310 __ $a] " (" [MARC 310 __ $b] ")"
             all_tags('310__', 'a b') { |t|
               xml['dcterms'].accrualPeriodicity list_s(t._a,
-                                                     opt_r(t._b))
+                                                       opt_r(t._b))
             }
           end
 
@@ -1126,22 +1301,31 @@ module Libis
 
           def marc2dc_medium_319__(xml)
             # [MARC 319 __ $a]
-            each_field('319__', 'a') { |f| xml['dcterms'].medium f }
+            # each_field('319__', 'a') { |f| xml['dcterms'].medium f }
+            # ALMA: 319 __ a => 340 __ e
+            each_field('340__', 'e') { |f| xml['dcterms'].medium f }
           end
 
           def marc2dc_medium_319_9(xml)
             # [MARC 319 9_ $a] " (" [MARC 319 9_ $9] ")"
-            all_tags('3199_', 'a 9') { |t|
-              xml['dcterms'].medium list_s(t._a,
-                                         opt_r(t._9))
-            }
+            # all_tags('3199_', 'a 9') { |t|
+            #   xml['dcterms'].medium list_s(t._a,
+            #                              opt_r(t._9))
+            # }
+            # ALMA: 319 9_ a => 340 __ e
+            # covered by marc2dc_medium_319__
           end
 
           def marc2dc_medium_399(xml)
             # [MARC 399 __ $a]  " " [MARC 399 __ $b] " (" [MARC 399 __ $9] ")"
-            all_tags('399__', 'a b 9') { |t|
+            # all_tags('399__', 'a b 9') { |t|
+            #   xml['dcterms'].medium list_s(t._ab,
+            #                              opt_r(t._9))
+            # }
+            # ALMA: 399 __ ab9 => 950 __ abc
+            all_tags('950__', 'a b c') { |t|
               xml['dcterms'].medium list_s(t._ab,
-                                         opt_r(t._9))
+                                           opt_r(t._c))
             }
           end
 
@@ -1156,8 +1340,12 @@ module Libis
             # DCTERMS:REPLACES
 
             # [MARC 247 1# $a] " : " [MARC 247 1# $b] " (" [MARC 247 1# $9] ")"
-            all_tags('2471#', 'a b 9') { |t|
-              xml['dcterms'].replaces list_s(element(t._a, t._b, join: ' : '), opt_r(t._9))
+            # all_tags('2471#', 'a b 9') { |t|
+            #   xml['dcterms'].replaces list_s(element(t._a, t._b, join: ' : '), opt_r(t._9))
+            # }
+            # ALMA: 247 10 9Z => 247 10 g6
+            all_tags('2471#', 'a b g') { |t|
+              xml['dcterms'].replaces list_s(element(t._a, t._b, join: ' : '), opt_r(t._g))
             }
           end
 
@@ -1165,7 +1353,9 @@ module Libis
             # DCTERMS:HASVERSION
 
             # [MARC 534 __ $a]
-            each_field('534__', 'a') { |f| xml['dcterms'].hasVersion f }
+            # each_field('534__', 'a') { |f| xml['dcterms'].hasVersion f }
+            # ALMA: 534 __ a => 534 __ b
+            each_field('534__', 'b') { |f| xml['dcterms'].hasVersion f }
           end
 
           def marc2dc_source(xml)
@@ -1176,8 +1366,12 @@ module Libis
 
           def marc2dc_source_852___(xml)
             # [MARC 852 __ $b] " " [MARC 852 __ $c] " " [MARC 852 __ $k] " " [MARC 852 __ $h] " " [MARC 852 __ $9] " " [MARC 852 __ $l] " " [MARC 852 __ $m]
-            all_tags('852__', 'b c k h 9 l m') { |t|
-              xml['dc'].source list_s(t._bckh9lm)
+            # all_tags('852__', 'b c k h 9 l m') { |t|
+            #   xml['dc'].source list_s(t._bckh9lm)
+            # }
+            # ALMA: 852 __ 9 => 852 __ i
+            all_tags('852__', 'b c k h i l m') { |t|
+              xml['dc'].source list_s(t._bckhilm)
             }
           end
 
@@ -1272,8 +1466,12 @@ module Libis
 
           def marc2dc_language_014_9__9(xml)
             # [MARC 041 9_ $9*]
-            all_tags('0419_', '9') { |t|
-              xml['dc'].language repeat(t.a_9.collect { |y| taalcode(y) })
+            # all_tags('0419_', '9') { |t|
+            #   xml['dc'].language repeat(t.a_9.collect { |y| taalcode(y) })
+            # }
+            # ALMA: 041 9# 9 => 041 __ k
+            all_tags('041__', 'k') { |t|
+              xml['dc'].language repeat(t.a_k.collect { |y| taalcode(y) })
             }
           end
 
@@ -1299,8 +1497,12 @@ module Libis
 
           def marc2dc_language_041__9_9(xml)
             # "Ondertitels: " [MARC 041 _9 $9*]
-            all_tags('041_9', '9') { |t|
-              xml['dc'].language element(t.a_9.collect { |y| taalcode(y) }, prefix: 'Ondertitels:')
+            # all_tags('041_9', '9') { |t|
+            #   xml['dc'].language element(t.a_9.collect { |y| taalcode(y) }, prefix: 'Ondertitels:')
+            # }
+            # ALMA: 041 #9 9 => 041 __ j
+            all_tags('041__', 'j') { |t|
+              xml['dc'].language element(t.a_j.collect { |y| taalcode(y) }, prefix: 'Ondertitels:')
             }
           end
 
@@ -1325,11 +1527,13 @@ module Libis
             # [MARC 546 __ $a]
             each_field('546__', 'a') { |f| xml['dc'].language f }
 
-            # []MARC 546 9_ $a]
-            each_field('5469_', 'a') { |f| xml['dc'].language f }
+            # [MARC 546 9_ $a]
+            # ALMA: 546 9_ a => 546 __ a
+            # each_field('5469_', 'a') { |f| xml['dc'].language f }
 
             # [MARC 546 _9 $a]
-            each_field('546_9', 'a') { |f| xml['dc'].language f }
+            # ALMA: 546 _9 a => 546 __ a
+            # each_field('546_9', 'a') { |f| xml['dc'].language f }
           end
 
           def marc2dc_rightsholder(xml)
@@ -1351,9 +1555,9 @@ module Libis
             all_tags('7102_', '4') { |t|
               next unless check_name(t, :rightsholder)
               xml['dcterms'].rightsholder element(list_s(t._a,
-                                                       opt_r(t._g)),
+                                                         opt_r(t._g)),
                                                   list_s(opt_r(t._9),
-                                                       opt_r(t._e)),
+                                                         opt_r(t._e)),
                                                   join: ', ')
             }
           end
@@ -1428,7 +1632,7 @@ module Libis
           end
 
           def lookup(table, key, constraints = {})
-            table.select { |value| constraints.map { |k,v| value[k] == v }.all? }.map { |v| v[key] }
+            table.select { |value| constraints.map { |k, v| value[k] == v }.all? }.map { |v| v[key] }
           end
 
           #noinspection RubyStringKeysInHashInspection
@@ -1439,7 +1643,7 @@ module Libis
                   arc: ['architect', :contributor],
                   arr: ['arranger', :contributor],
                   art: ['artist', :creator],
-                  aui: ['author of introduction', :contributor ],
+                  aui: ['author of introduction', :contributor],
                   aut: ['author', :creator],
                   bbl: ['bibliography', :contributor],
                   bdd: ['binder', :contributor],

data/lib/libis/tools/mets_file.rb

@@ -14,27 +14,30 @@ module Libis
 
     # This class supports creating METS files in a friendlier way than by creating an XML file.
     #
-    # There are sub-classes that represent {Representation}s, {File}s, {Div}isions and {Map}s.
+    # There are sub-classes that represent {::Libis::Tools::MetsFile::Representation}s,
+    # {::Libis::Tools::MetsFile::File}s, {::Libis::Tools::MetsFile::Div}isions and {::Libis::Tools::MetsFile::Map}s.
     # These are simple container classes that take care of assigning proper ids and accept most known attributes.
     # Each of the container classes have a corresponding method on the METS class that takes a Hash with attributes
     # and returns the created object.
     #
-    # {Div} and {File} instances can be added to a {Div} instance and a Div can be associated with a {Representation},
-    # thus creating a structmap.
+    # {::Libis::Tools::MetsFile::Div} and {::Libis::Tools::MetsFile::File} instances can be added to a
+    # {::Libis::Tools::MetsFile::Div} instance and a Div can be associated with a
+    # {::Libis::Tools::MetsFile::Representation}, thus creating a structmap.
     #
     # The {#amd_info=} method on the {MetsFile} class sets the main amd parameters and
     #
     # With the help of the {DnxSection} class and it's derived classes, the container classes can generate the amd
     # sections for the METS file.
     class MetsFile
+      include ::Libis::Tools::ThreadSafe
 
-      # Keeps track of {Representation}s created
+      # Keeps track of {::Libis::Tools::MetsFile::Representation}s created
       attr_reader :representations
-      # Keeps track of {File}s created
+      # Keeps track of {::Libis::Tools::MetsFile::File}s created
       attr_reader :files
-      # Keeps track of {Div}s created
+      # Keeps track of {::Libis::Tools::MetsFile::Div}s created
       attr_reader :divs
-      # Keeps track of {Map}s created
+      # Keeps track of {::Libis::Tools::MetsFile::Map}s created
       attr_reader :maps
 
       # noinspection RubyConstantNamingConvention
@@ -55,11 +58,13 @@ module Libis
         @maps = {}
         @dnx = {}
         @dc_record = nil
+        @id_map = {}
       end
 
       # Reads an existing METS XML file and parses into a large Hash structure for inspection.
+      #
       # It will not immediately allow you to create a {MetsFile} instance from it, but with some inspection and
-      # knowledge of METS file structure it should be possible to recreate a similar file using the class.
+      # knowledge of METS file structure it should be possible to recreate a similar file using the result.
       #
       # The returned Hash has the following structure:
       #
@@ -233,11 +238,23 @@ module Libis
         end
       end
 
-      # Create a new representation. See {Representation} for supported Hash keys.
+      def get_id(klass)
+        self.mutex.synchronize do
+          if @id_map[klass]
+            @id_map[klass] += 1
+          else
+            @id_map[klass] = 1
+          end
+          return @id_map[klass]
+        end
+      end
+
+      # Create a new representation. See {::Libis::Tools::MetsFile::Representation} for supported Hash keys.
       # @param [Hash] hash
       # @return [Libis::Tools::MetsFile::Representation]
       def representation(hash = {})
-        rep = Representation.new
+        rep = ::Libis::Tools::MetsFile::Representation.new
+        rep.set_id = get_id(::Libis::Tools::MetsFile::Representation)
         rep.set_from_hash hash
         @representations[rep.id] = rep
       end
@@ -247,6 +264,7 @@ module Libis
       # @return [Libis::Tools::MetsFile::Div]
       def div(hash = {})
         div = Libis::Tools::MetsFile::Div.new
+        div.set_id = get_id(::Libis::Tools::MetsFile::Div)
         div.set_from_hash hash
         @divs[div.id] = div
       end
@@ -256,6 +274,7 @@ module Libis
       # @return [Libis::Tools::MetsFile::File]
       def file(hash = {})
         file = Libis::Tools::MetsFile::File.new
+        file.set_id = get_id(::Libis::Tools::MetsFile::File)
         file.set_from_hash hash
         @files[file.id] = file
       end
@@ -263,11 +282,14 @@ module Libis
       # Create a new structmap.
       # @param [Libis::Tools::MetsFile::Representation] rep
       # @param [Libis::Tools::MetsFile::Div] div
+      # @param [Boolean] logical if true, create a logical structmap; if false (default): a physical structmap.
       # @return [Libis::Tools::MetsFile::Map]
-      def map(rep, div)
+      def map(rep, div, logical = false)
         map = Libis::Tools::MetsFile::Map.new
+        map.set_id = get_id(::Libis::Tools::MetsFile::Map)
         map.representation = rep
         map.div = div
+        map.is_logical = logical
         @maps[map.id] = map
       end
 
@@ -379,7 +401,7 @@ module Libis
             @maps.values.each do |map|
               xml[:mets].structMap(
                   ID: "#{map.representation.xml_id}-1",
-                  TYPE: 'PHYSICAL',
+                  TYPE: (map.is_logical ? 'LOGICAL' : 'PHYSICAL'),
               ) {
                 xml[:mets].div(LABEL: map.representation.label) {
                   add_struct_map(xml, map.div) if map.div

data/lib/libis/tools/mets_objects.rb

@@ -4,29 +4,22 @@ module Libis
     class MetsFile
 
       # Generic module that provides code shortcuts for the {Representation}, {Div} and {File} classes.
-      module IdContainer
-        def self.included(klass)
-          klass.include ::Libis::Tools::ThreadSafe
-        end
+      module MetsObject
 
         # Take a hash and set class instance attributes.
-        #
-        #
         # @param [Hash] hash Hash with <attribute_name>, <attribute_value> pairs.
         def set_from_hash(hash)
           hash.each { |key, value| send "#{key}=", value if respond_to?(key) }
         end
 
-        # Assigns a unique id to a class instance.
-        #
-        # A class variable is used to keep track of the id sequence and is incremented as needed. Thread-safe operation.
-        def id
-          return @id if @id
-          self.mutex.synchronize do
-            @id = self.class.instance_variable_get('@id') || 1
-            self.class.instance_variable_set('@id', @id + 1)
-            @id
-          end
+        # Default initializer
+        def initialize
+          @id = 0
+        end
+
+        # Sets the unique id for the instance
+        def set_id(id)
+          @id = id
         end
 
         # Convert structure to String. Can be used for debugging to show what is stored.
@@ -34,9 +27,9 @@ module Libis
           "#{self.class}:\n" +
               self.instance_variables.map do |var|
                 v = self.instance_variable_get(var)
-                v = "#{v.class}-#{v.id}" if v.is_a? IdContainer
+                v = "#{v.class}-#{v.id}" if v.is_a? MetsObject
                 v = v.map do |x|
-                  x.is_a?(IdContainer) ? "#{x.class}-#{x.id}" : x.to_s
+                  x.is_a?(MetsObject) ? "#{x.class}-#{x.id}" : x.to_s
                 end.join(',') if v.is_a? Array
                 " - #{var.to_s.gsub(/^@/, '')}: #{v}"
               end.join("\n")
@@ -46,7 +39,7 @@ module Libis
 
       # Container class for creating a representation in the METS.
       class Representation
-        include IdContainer
+        include MetsObject
 
         # The currently allowed attributes on this class. The attributes will typically be used in {DnxSection}s.
         attr_accessor :label, :preservation_type, :usage_type, :representation_code, :entity_type, :access_right_id,
@@ -59,7 +52,7 @@ module Libis
 
         # The id that will be used in the XML file to reference this representation.
         def xml_id
-          "rep#{id}"
+          "rep#{@id}"
         end
 
         # This method creates the appropriate {DnxSection}s based on what attributes are filled in.
@@ -228,7 +221,7 @@ module Libis
 
       # Container class for creating a file in the METS.
       class File
-        include IdContainer
+        include MetsObject
 
         # The currently allowed attributes on this class. The attributes will typically be used in {DnxSection}s.
         attr_accessor :label, :note, :location, :target_location, :mimetype, :puid, :size, :entity_type,
@@ -241,12 +234,12 @@ module Libis
 
         # The id that will be used in the XML file to reference this file.
         def xml_id
-          "fid#{id}"
+          "fid#{@id}"
         end
 
         # The id that will be used for the group in the XML file.
         def make_group_id
-          "grp#{group_id rescue id}"
+          "grp#{group_id rescue @id}"
         end
 
         # The file's name as it was originally.
@@ -471,13 +464,13 @@ module Libis
 
       # Container class for creating a division in the METS.
       class Div
-        include IdContainer
+        include MetsObject
 
         attr_accessor :label
 
         # The id that will be used in the XML file to reference this division.
         def xml_id
-          "div-#{id}"
+          "div-#{@id}"
         end
 
         # All items stored in the current division
@@ -517,16 +510,18 @@ module Libis
 
       # Container class for creating a structmap in the METS.
       class Map
-        include IdContainer
+        include MetsObject
 
         # The representation this structmap is for
         attr_accessor :representation
         # The top division in the structmap
         attr_accessor :div
+        # Is the structmap Logical (true) or Physical(false)?
+        attr_accessor :is_logical
 
         # The id that will be used in the XML file to reference this structmap.
         def xml_id
-          "smap-#{id}"
+          "smap-#{@id}"
         end
 
       end

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.25'
+    VERSION = '0.9.27'
   end
 end

data/spec/metadata/8389207.marc

@@ -3,7 +3,7 @@
         xmlns="http://www.loc.gov/MARC21/slim" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <leader>01068nam 2200241u 4500</leader>
   <controlfield tag="005">20150701153710.0</controlfield>
-  <controlfield tag="008">000608m17221724xx |||| | 000|0 lat c</controlfield>
+  <controlfield tag="008">000608m17221724xx |||| |   000|0   lat c</controlfield>
   <controlfield tag="001">9921543960101471</controlfield>
   <datafield tag="035" ind1=" " ind2=" ">
     <subfield code="a">(BeLVLBS)002154396LBS01-Aleph</subfield>

data/spec/metadata/marc21_spec.rb

@@ -19,7 +19,7 @@ describe 'Marc21Record' do
       expect(record.marc_dump).to eq <<-STR.align_left
         LDR:'01068nam 2200241u 4500'
         005:'20150701153710.0'
-        008:'000608m17221724xx |||| | 000|0 lat c'
+        008:'000608m17221724xx |||| |   000|0   lat c'
         001:'9921543960101471'
         035: : :
         \ta:["(BeLVLBS)002154396LBS01-Aleph"]
@@ -99,10 +99,13 @@ describe 'Marc21Record' do
   <dc:identifier>8389207</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" class="text">Griekse patrologie</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>
+  <dc:type xml:lang="en" class="text">Books before 1840</dc:type>
   <dcterms:extent>8o: 4 v.; [22], 298, [8]; [16], 354, [1]; [16], 299, [7]; [16], 271, [5] p.</dcterms:extent>
-  <dc:language/>
+  <dc:language>la</dc:language>
 </dc:record>
 STR
       expect(record.to_dc.root).to be_equivalent_to(xml_doc.root).respecting_element_order

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.27
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler