local

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@773 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index ebb8efc..cadccd7 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -226,9 +226,7 @@ databases:
         credit: 10000
       - to: ffsk
         credit: 10000
-      - to: ffsfb
-        credit: 10000
-      - to: ffsfm
+      - to: ffsf
         credit: 10000
       - to: ffso 
         credit: 10000
@@ -316,14 +314,22 @@ databases:
   ffar:
     name: 'Arheologija, Filozofski fakultet u Zagrebu'
     input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/ff-libri.pl'
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
+      - name: peri
+        type: isis
+        path: '/backup/isis_backup/A018-2/isisdata/latest/PERI/PERI'
+        encoding: 'cp852'
+        #limit: 10
+        #modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
 
   ffet:
     name: 'Etnologija, Filozofski fakultet u Zagrebu'
@@ -359,7 +365,7 @@ databases:
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          path: 'conf/normalize/minimal.pl'
       - name: arti
         type: isis
         path: '/backup/isis_backup/novi-40162/ISISDATA/latest/ARTI/ARTI'
@@ -429,7 +435,7 @@ databases:
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          path: 'conf/normalize/minimal.pl'
       - name: peri
         type: isis
         path: '/backup/isis_backup/A207-3/isisdata/latest/PERI/PERI'
@@ -458,7 +464,7 @@ databases:
       #limit: 10
       modify_file: 'conf/modify/common.pl'
       normalize:
-        path: 'conf/normalize/ff-libri.pl'
+        path: 'conf/normalize/minimal.pl'
 
   fftu:
     name: 'Turkologija, Filozofski fakultet u Zagrebu'
@@ -552,12 +558,6 @@ databases:
         # modify_file: 'conf/modify/common.pl'
         normalize:
           path: 'conf/normalize/ff-peri.pl'
-      - name: baza
-        type: marc
-        path: '/backup/data/NSK/BBaza.ISO'
-        encoding: 'ISO-8859-2'
-        normalize:
-          path: 'conf/normalize/marc-nsk.pl'
 
   ffro:
     name: 'Romanistika, Filozofski fakultet u Zagrebu'
@@ -583,31 +583,35 @@ databases:
       normalize:
         path: 'conf/normalize/minimal.pl'
 
-  ffsfb:
-    name: 'Slavenska filologija (B), Filozofski fakulteti u Zagrebu'
-    input:
-      name: libri
-      type: isis
-#      path: '/data/isis_data/sfb/LIBRI/LIBRI'
-      path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/minimal.pl'
-
-  ffsfm:
-    name: 'Slavenska filologija (M), Filozofski fakulteti u Zagrebu'
+  ffsf:
+    name: 'Slavenska filologija, Filozofski fakulteti u Zagrebu'
     input:
-      name: libri
-      type: isis
-      path: '/data/isis_data/sfm/LIBRI/LIBRI'
-#     path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/minimal.pl'
+      - name: blibri
+        type: isis
+#       path: '/data/isis_data/sfb/LIBRI/LIBRI'
+        path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/ff-libri.pl'
+      - name: mlibri
+        type: isis
+        path: '/data/isis_data/sfm/LIBRI/LIBRI'
+#       path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
+      - name: peri
+        type: isis
+        path: '/backup/isis_backup/A125-2/ISISDATA/latest/PERI/PERI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
 
   ffso:
     name: 'Sociologija, Filozofski fakultet u Zagrebu'
@@ -780,12 +784,18 @@ databases:
           path: 'conf/normalize/marc-cufts.pl'
       - name: licenced
         type: excel
-        path: '/data/FF/wiley/w2.xls'
-        worksheet: 'Sheet1'
-        from: 0
+        path: '/data/FF/wiley/wiley_casopisi2006.xls'
+        worksheet: 'licenced'
+        from: 1
         encoding: 'windows-1250'
         normalize:
           path: 'conf/normalize/excel-wiley.pl'
+      - name: nourl
+        type: marc
+        path: '/data/webpac2/out/marc/wiley-licenced.marc'
+        encoding: 'UTF-8'
+        normalize:
+          path: 'conf/normalize/marc-wiley-nourl.pl'
 #      - name: licenced
 #        type: marc
 #        path: '/data/FF/wiley/wiley-licenced.marc'
@@ -793,13 +803,13 @@ databases:
 #        normalize:
 #          path: 'conf/normalize/common.pl'
 
-#  nsk:
-#    name: 'Nacionalna i sveucilisna knjiznica'
-#    input:
-#      name: baza
-#      type: marc
-#      path: '/backup/data/NSK/BBaza.ISO'
-#      encoding: 'ISO-8859-2'
-#      normalize:
-#        path: 'conf/normalize/marc-nsk.pl'
+  nsk:
+    name: 'Nacionalna i sveucilisna knjiznica'
+    input:
+      name: baza
+      type: marc
+      path: '/backup/data/NSK/BBaza.ISO'
+      encoding: 'ISO-8859-2'
+      normalize:
+        path: 'conf/normalize/marc-nsk.pl'
 

diff --git a/conf/modify/common.pl b/conf/modify/common.pl
index ea6cc8d..e403d7e 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -22,7 +22,7 @@
   '^a'
     ' ; ' => '^a'
     ' ; ' => '^a'
-# ovo provjeriti - ima na lingvistici:
+# ovo provjeriti, pa mo¾da ispraviti - ima na lingvistici:
     ' : ' => '^a'
   '^c'
     ' : ' => '^c'

diff --git a/conf/normalize/excel-wiley.pl b/conf/normalize/excel-wiley.pl
index 0bf5e3d..7265017 100644 (file)
--- a/conf/normalize/excel-wiley.pl
+++ b/conf/normalize/excel-wiley.pl
@@ -1,4 +1,75 @@
-marc_indicators('245', 0, 0);
+marc_leader('05','n');
+marc_leader('06','a');
+marc_leader('07','s');
+marc_leader('18','i');
+
+marc('022','a',
+       lookup(
+               sub { rec('022','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('022','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+marc('022','y',
+       lookup(
+               sub { rec('022','y') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('022','y') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+marc_indicators('245', 1, 0);
 
 marc('245','a',
        rec('A')
@@ -8,7 +79,193 @@ marc('245','h',
        '[ Elektronièka graða ]'
 );
 
+marc_indicators('246', 1, 0);
+
+marc('246','a',
+       lookup(
+               sub { rec('246','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('246','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+marc('500','a',
+       lookup(
+               sub { rec('500','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('500','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+marc_indicators('650', ' ', 7);
+
+marc('650','a',
+       lookup(
+               sub { rec('650','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('650','a') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+marc('650','v',
+       lookup(
+               sub { rec('650','v') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('650','v') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+
+marc('650','z',
+       lookup(
+               sub { rec('650','z') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( 
+                                       rec('245','a') . ' ' . rec('245','b') 
+                               )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       ) ||
+       lookup(
+               sub { rec('650','z') },
+               'wiley','full',
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
+               } 
+       )
+);
+
+
+
 marc('856','u',
+       lookup(
+               sub { rec('856','u') },
+               'wiley','full',
+               sub { 
+                               lc( 
+                                       rec('245','a') . rec('245','b') 
+                               )
+               },
+
+               sub { 
+                               lc( rec('A') )
+               } 
+       ) 
+       ||
        lookup(
                sub { rec('856','u') },
                'wiley','full',
@@ -17,9 +274,10 @@ marc('856','u',
                                lc( rec('245','a') )
                        );
                },
-
                sub { 
-                       lc( rec('A') )
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('A') )
+                       );
                } 
        )
 );

diff --git a/conf/normalize/ff-libri.pl b/conf/normalize/ff-libri.pl
index 16212b7..100bb21 100644 (file)
--- a/conf/normalize/ff-libri.pl
+++ b/conf/normalize/ff-libri.pl
@@ -1,11 +1,12 @@
+# ne konvertira se ako nema polje 200^a
+
 if ( rec('200','a') ) {
 
 # Leader
 # raspraviti 17,18
-
+#
 # u nekim knji¾nicama koristi se 999a i 999b
-
-
+#
 # vrijedi za ffan...
 
 if ( rec('999') && first(rec('999')) =~ m/pregledan/i) {
@@ -22,10 +23,12 @@ if ( rec('230') ) {
        marc_leader('19','r');
 }
 
-
 # 001 polje - Voyager
-
+#
 # privemeno koristimo 0356 umjesto 0359, zato ¹to marclint 9 prijavljuje kao gre¹ku
+# u marc 035a - System Number - ??
+# NSK zapisuje Voyagerov ID (001) - kako ???
+
 
 marc('035','6',
 join_with('',
@@ -40,8 +43,6 @@ join_with('',
        )
 );
 
-# u marc 035a treba dodati System Number - 
-# NSK zapisuje Voyagerov ID (001) - kako ???
 
 # u FFSF bazama postoji nekoliko zaredanih ISBN, odvojenih s '. - '
 
@@ -49,7 +50,8 @@ marc('020','a',
        rec('10')
 );
 
-# u polje 040a mo¾da jo¹ dodati prefiks HR
+
+# u polje 040a - prefiks HR ?
 # NSK ima HR NSB (mo¾da u novijim zapisima ima NSK?)
 
 marc('040','a',
@@ -64,18 +66,19 @@ marc('040','e',
        'HR PPIAK'
 );
 
-if (rec('300') && first(rec('300')) =~ m/Prijevod/) {
+if ( rec('300') && first(rec('300')) =~ m/Prijevod/) {
        marc_indicators('041', 1, ' ');
 } else {
        marc_indicators('041', 0, ' ');
 }
 
-## naci primjer u NSK
+## naæi primjer u NSK
 
 marc_repeatable_subfield('041','a',
        rec('101')
 );
 
+# indikatori za èlanove. treba uvjetovati prema jezicima !!
 
 if (   ( rec('200','a') =~ m/^Die /) || 
        ( rec('200','a') =~ m/^Das /) || 
@@ -143,7 +146,7 @@ marc('250','b',
 );
 
 # ponovljiva potpolja u originalnom redosljedu
-# 
+
 marc_original_order('260', '210');
 
 
@@ -226,6 +229,14 @@ marc('500','a',
        rec('300')
 );
 
+marc('500','a',
+       rec('305')
+);
+
+marc('500','a',
+       rec('307')
+);
+
 marc('500','a',
        rec('314')
 );
@@ -241,7 +252,7 @@ marc('504','a',
 
 ## FFPS 327 - sadrzaj
 if ( config() =~ m/ffps/ || config() =~ m/fftu/ ) {
-       marc_indicators('505', '1', ' ');
+       marc_indicators('505', '0', ' ');
        marc('505','a',
                regex('s/\s*[\\r\\n]+\s*\**\s*/ ; /g',
                        rec('327')
@@ -270,6 +281,10 @@ if ( config() =~ m/fftu/ ) {
        );
 }
 
+marc('538','a',
+       rec('337','a')
+);
+
 
 # mo¾da i polje 520y - jezik napomene ako je uvijek isti jezik
 
@@ -603,4 +618,26 @@ if ( rec('230') ) {
  
 };
 
+marc_indicators('776', 0, ' ');
+
+marc('776','a',
+       rec('452','1')
+);
+
+marc('900','a',
+       lookup(
+               sub { rec('000') },
+               'ffps','libri',
+               sub { rec('200','a') },
+       )
+);
+
+marc('901','a',
+       lookup(
+               sub { 'NSK' },
+               'nsk','baza',
+               sub { rec('200','a') },
+       ) 
+);
+
 }

diff --git a/conf/normalize/ff-peri.pl b/conf/normalize/ff-peri.pl
index a925404..9f9d833 100644 (file)
--- a/conf/normalize/ff-peri.pl
+++ b/conf/normalize/ff-peri.pl
@@ -15,12 +15,10 @@ if ( rec('999') && first(rec('999')) =~ m/pregledan/i) {
 }
 
        marc_leader('06','a');
-       marc_leader('07','m');
+       marc_leader('07','s');
        marc_leader('18','i');
 
-if ( rec('230') ) {
        marc_leader('19','r');
-}
 
 
 # 001 polje - Voyager
@@ -104,7 +102,7 @@ marc_compose('245',
        'h', rec('200','b'),
        'b', suffix(
                ( rec('200','k') && rec('200','f') ) ? ' / ' :
-                                    ' ',
+                                                      ' ',
                        join_with(' ; ',
                                rec('200','k'),
                        ),
@@ -129,6 +127,7 @@ marc_compose('245',
        ),
 # FIXME append to last subfield
 #      '+', prefix('. ', rec('200','c') ),
+
 );
 
 
@@ -156,19 +155,19 @@ marc_original_order('260', '210');
 
 marc('300','a',
        suffix(
-               rec('215','c')  ?       ' : ' :
-               rec('215','d')  ?       ' ; ' :
-               rec('215','e')  ?       ' + ' :
-                                       ' ',
+               rec('215','c')  ?  ' : ' :
+               rec('215','d')  ?  ' ; ' :
+               rec('215','e')  ?  ' + ' :
+                                  ' ',
                        rec('215','a')
        )
 );
 
 marc('300','b',
        suffix(
-               ( rec('215','c') && rec('215','d') )    ?       ' ; ' :
-               ( rec('215','c') && rec('215','e') )    ?       ' + ' :
-                                                               ' ',
+               ( rec('215','c') && rec('215','d') )    ?  ' ; ' :
+               ( rec('215','c') && rec('215','e') )    ?  ' + ' :
+                                                          ' ',
                        rec('215','c')
        )
 );
@@ -384,34 +383,6 @@ marc('700','a',
        )
 );
 
-## treba provjeriti da li polje 330 sadrzi jos neke podatke koji mogu biti u <> ili su tu iskljucivo autori? da li samo autori ili neke druge osobe?
-
-
-# marc('700','a',
-#      rec('330','a')
-# );
-# 
-# 
-# marc('700','a',
-#      rec('330','b')
-# );
-# 
-# marc('700','a',
-#      rec('330','c')
-# );
-# 
-# 
-# marc('700','a',
-#      rec('330','d')
-# );
-# 
-# marc('700','a',
-#      rec('330','e')
-# );
-# 
-# marc('700','a',
-#      rec('330','f')
-# );
  
 #_debug(0);
 
@@ -474,11 +445,51 @@ marc('740','a',
 marc('500','a',
        lookup(
                sub { rec('304','a') },
-               'ffps','baza',
+               'nsk','baza',
                sub { rec('200','a') },
        ) 
 );
 
+marc('500','a',
+       lookup(
+               sub { rec('306','a') },
+               'nsk','baza',
+               sub { rec('200','a') },
+       ) 
+);
 
+marc('500','a',
+       lookup(
+               sub { rec('314','a') },
+               'nsk','baza',
+               sub { rec('200','a') },
+       ) 
+);
+
+marc('500','a',
+       lookup(
+               sub { rec('316','a') },
+               'nsk','baza',
+               sub { rec('200','a') },
+       ) 
+);
+
+marc('504','a',
+       lookup(
+               sub { rec('320','a') },
+               'nsk','baza',
+               sub { rec('200','a') },
+       ) 
+);
+
+marc('900','a',
+       sort(
+               lookup(
+                       sub { rec('000') },
+                       'ffps','peri',
+                       sub { rec('200','a') },
+               )
+       )
+);
 
 }

diff --git a/conf/normalize/marc-cufts.pl b/conf/normalize/marc-cufts.pl
index dbf944f..51f8671 100644 (file)
--- a/conf/normalize/marc-cufts.pl
+++ b/conf/normalize/marc-cufts.pl
@@ -1,3 +1,11 @@
+marc('022','a',
+       rec('022','a')
+);
+
+marc('022','y',
+       rec('022','y')
+);
+
 
 marc_indicators('245', 0, 0);
 
@@ -5,11 +13,55 @@ marc('245','a',
        rec('245','a')
 );
 
+marc('245','b',
+       rec('245','b')
+);
+
 marc('245','h',
        '[ Elektronièka graða ]'
 );
 
+marc_indicators('246', 0, 0);
+
+marc('246','a',
+       rec('246','a')
+);
+
+marc('500','a',
+       rec('500','a')
+);
+
+marc('500','a',
+       lookup(
+               sub { 'Licenciran' },
+               'wiley','licenced',
+               sub { 
+                       lc( rec('A') )
+               },
+               sub { 
+                       regex('s/\s*(\.|:)\s*$//g',
+                               lc( rec('245','a') )
+                       );
+               },
+       )
+);
+
+marc_indicators('650', ' ', 2);
+
+marc('650','a',
+       rec('650','a')
+);
+
+marc('650','v',
+       rec('650','v')
+);
+
+marc('650','z',
+       rec('650','z')
+);
+
 marc('856','u',
        rec('856','u')
 );
 
+

diff --git a/conf/normalize/marc-nsk.pl b/conf/normalize/marc-nsk.pl
index e40a2d8..2210ea0 100644 (file)
--- a/conf/normalize/marc-nsk.pl
+++ b/conf/normalize/marc-nsk.pl
@@ -20,8 +20,11 @@ marc('022','a',
 
 
 marc_indicators('245', 0, 0);
+
 marc('245','a',
-       rec('200','a')
+       first( 
+               rec('200','a') 
+       )
 );
 
 marc('500','a',

diff --git a/conf/normalize/minimal.pl b/conf/normalize/minimal.pl
index ecb1492..66b890a 100644 (file)
--- a/conf/normalize/minimal.pl
+++ b/conf/normalize/minimal.pl
@@ -1,3 +1,6 @@
+
+if ( rec('200') ) {
+
 marc('035','6',
 join_with('',
                config(),
@@ -23,4 +26,4 @@ marc('245','a',
 );
 
 
-
+}

diff --git a/conf/validate/ffet-libri b/conf/validate/ffet-libri
index 4b0d960..fbbdec3 100644 (file)
--- a/conf/validate/ffet-libri
+++ b/conf/validate/ffet-libri
@@ -1,7 +1,7 @@
 0 
 10 
 101 
-200 a c d e f g k 
+200 a c d e* f g k 
 205 a
 210 a b c d 
 215 a c d e

diff --git a/conf/validate/fffi-libri b/conf/validate/fffi-libri
index edb59f8..e24f36b 100644 (file)
--- a/conf/validate/fffi-libri
+++ b/conf/validate/fffi-libri
@@ -1,7 +1,7 @@
 0 
 10 
 101 
-200 a c d e f g j k v x
+200 a c d e* f g j k v x
 205 a 
 210 a* b c* d e g
 215 a c d e

diff --git a/conf/validate/fffo-libri b/conf/validate/fffo-libri
index 3a5ee87..d6b07c6 100644 (file)
--- a/conf/validate/fffo-libri
+++ b/conf/validate/fffo-libri
@@ -54,7 +54,7 @@
 701 a! b c d
 702 a! b c d  
 710 a! b c d e f 
-801! 
+801 
 9
 990 
 991 

diff --git a/conf/validate/ffhu-libri b/conf/validate/ffhu-libri
index 5f2d985..edeec6a 100644 (file)
--- a/conf/validate/ffhu-libri
+++ b/conf/validate/ffhu-libri
@@ -3,8 +3,8 @@
 101 
 200! a! c d e* f g* k
 205 a! 
-210! a! c! d! 
-215! a! c d e 
+210 a c d! 
+215 a c d e 
 225 a e h i v w
 230 a e* f v
 231 a e* f v
@@ -48,7 +48,7 @@
 702 a! b 
 710 a! b d e f 
 711 a! e f
-801! 
+801
 990 
 991 
 994! a! b! c!

diff --git a/conf/validate/ffkf-libri b/conf/validate/ffkf-libri
index 547b60a..fe9a7fa 100644 (file)
--- a/conf/validate/ffkf-libri
+++ b/conf/validate/ffkf-libri
@@ -22,10 +22,10 @@
 261- a c d
 262- a c d
 263- a c d 
-270 a d e h i v w
-271 a d e h i v w
-272 a e h i v w
-273 a e h i v 
+270- a d e h i v w
+271- a d e h i v w
+272- a e h i v w
+273- a e h i v 
 280
 281
 282

diff --git a/conf/validate/ffkk-libri b/conf/validate/ffkk-libri
index 37af0c4..252f51d 100644 (file)
--- a/conf/validate/ffkk-libri
+++ b/conf/validate/ffkk-libri
@@ -38,7 +38,7 @@
 320 
 327 
 330
-4
+4-
 423 a b c z
 464 a c f g x y
 532
@@ -50,11 +50,11 @@
 710 a! b c d e f
 711 a! b
 801- 
-935
+935-
 990 
 991 
 994 a b c 
-995
+995-
 996
 998 a
 999 

diff --git a/conf/validate/fflo-libri b/conf/validate/fflo-libri
index 1e8a1ee..2d88afd 100644 (file)
--- a/conf/validate/fflo-libri
+++ b/conf/validate/fflo-libri
@@ -47,7 +47,7 @@
 701 a! b c d e f
 702 a! b c d e f
 710 a! b c d e f 
-801! 
+801 
 990 
 991 
 994 a! b c 

diff --git a/conf/validate/ffpe-libri b/conf/validate/ffpe-libri
index 55b884d..e0d915a 100644 (file)
--- a/conf/validate/ffpe-libri
+++ b/conf/validate/ffpe-libri
@@ -1,7 +1,7 @@
 0 
 10 
 101 
-200 a c d e f g k
+200 a c d e f g* k
 205 a 
 210 a c d 
 215 a c d e 
@@ -48,7 +48,7 @@
 701 a b c d
 702 a b c d  
 710 a b c d e f 
-711 a
+711 a b e
 801 
 990 
 991 

diff --git a/conf/validate/ffta-libri b/conf/validate/ffta-libri
index 2295a24..348403f 100644 (file)
--- a/conf/validate/ffta-libri
+++ b/conf/validate/ffta-libri
@@ -3,11 +3,11 @@
 10 
 101
 2
-200 a! c d e f g k
+200 a! c d e f g k v
 205 a! 
 210 a c d! 
-215 a! c d e 
-225 a! e h i v w
+215 a c d e 
+225 a e h i v w
 230 a e f v
 231 a e f v
 232 a e f v