local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index f64b3df..d9efc66 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -190,349 +190,11 @@ databases:
   'webpac2':
     name: 'Search all'
     links:
-      - to: ffan
-        credit: 10000
-      - to: ffar
-        credit: 10000
-      - to: ffet
-        credit: 10000
-      - to: fffi 
-        credit: 10000
-      - to: fffo
-        credit: 10000
-      - to: ffge
-        credit: 10000
-      - to: ffhu 
-        credit: 10000
-      - to: ffiz
-        credit: 10000
-      - to: ffkf
-        credit: 10000
-      - to: ffkk 
-        credit: 10000
-      - to: fflo
-        credit: 10000
-      - to: fftu
-        credit: 10000
-      - to: ffpe   
-        credit: 10000
-      - to: ffpo
-        credit: 10000
-      - to: ffpu
-        credit: 10000
       - to: ffps 
         credit: 10000
-      - to: ffro   
-        credit: 10000
-      - to: ffsk
-        credit: 10000
-      - to: ffsf
-        credit: 10000
-      - to: ffso 
-        credit: 10000
-      - to: ffta 
-        credit: 10000
-      - to: ffsr 
-        credit: 10000
-      - to: ffmic 
-        credit: 10000
-      - to: efzg
-        credit: 10000
-      - to: eizg
-        credit: 10000
-      - to: efos
-        credit: 10000
-      - to: irmo
-        credit: 10000
-      - to: hika
-        credit: 10000
-      - to: iztzg
-        credit: 10000
-      - to: jzav
-        credit: 10000
-      - to: ijf 
-        credit: 10000
-      - to: emerald 
-        credit: 10000
-
-  # site with alternative databases
-  'hr':
-    name: 'Primjer za hrvatsko suèelje'
-    links:
-      - to: ffps
-        credit: 10000
-      - to: ffkk
-        credit: 5000
-      - to: emerald
-        credit: 5000
-
-
-#  'ffps':
-#    name: 'Knji¾nica Odsjeka za psihologiju'
-#    links:
-#      - to: ffps
-#        credit: 10000
-
-  'drustvene':
-    name: 'Katalog knji¾nica dru¹tvenih znanosti'
-    links:
-      - to: efzg
-        credit: 10000
-      - to: eizg
-        credit: 10000
-      - to: efos
-        credit: 10000
-      - to: irmo
-        credit: 10000
-      - to: hika
+      - to: nsk 
         credit: 10000
-      - to: iztzg
-        credit: 10000
-      - to: jzav
-        credit: 10000
-      - to: ijf 
-        credit: 10000
-   
-  'ecasopisi':
-    name: 'Katalog elektronièkih èasopisa'
-    links:
-      - to: emerald
-        credit: 10000
-
-  ffan:
-    name: 'Anglistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A105-1/ISIS/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  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/minimal.pl'
-          - path: 'conf/normalize/ff-dupli.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'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A203-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  fffi:
-    name: 'Filozofija, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A102-1B/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  fffo:
-    name: 'Fonetika, Filozofski fakultet u Zagrebu'
-    input:
-      - name: libri
-        type: isis
-        path: '/backup/isis_backup/novi-40162/ISISDATA/latest/LIBRI/LIBRI'
-        encoding: 'cp852'
-        #limit: 10
-        #modify_file: 'conf/modify/common.pl'
-        normalize:
-          - path: 'conf/normalize/minimal.pl'
-          - path: 'conf/normalize/ff-dupli.pl'
-      - name: arti
-        type: isis
-        path: '/backup/isis_backup/novi-40162/ISISDATA/latest/ARTI/ARTI'
-        encoding: 'cp852'
-        #limit: 10
-        modify_file: 'conf/modify/common.pl'
-        normalize:
-          path: 'conf/normalize/ff-arti.pl'
-
-
-  ffge:
-    name: 'Germanistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A106-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffhu:
-    name: 'Hungarologija, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/B001-2/winisis/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffiz:
-    name: 'Informacijske znanosti, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A129-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffkf:
-    name: 'Klasièna filologija, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A209-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffkk:
-    name: 'Komparativna knji¾evnost, Filozofski fakultet u Zagrebu'
-    input:
-      - name: libri
-        type: isis
-#        path: '/home/mglavica/mnt/LIBRI/LIBRI'
-        path: '/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI'
-        encoding: 'cp852'
-        #limit: 10
-        #modify_file: 'conf/modify/common.pl'
-        normalize:
-          - path: 'conf/normalize/minimal.pl'
-          - path: 'conf/normalize/ff-dupli.pl'
-      - name: peri
-        type: isis
-        path: '/backup/isis_backup/A207-3/isisdata/latest/PERI/PERI'
-        encoding: 'cp852'
-        #limit: 10
-        modify_file: 'conf/modify/common.pl'
-        normalize:
-          path: 'conf/normalize/ff-libri.pl'
-      - name: arti
-        type: isis
-#        path: '/home/mglavica/mnt/ARTI/ARTI'
-        path: '/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI'
-        encoding: 'cp852'
-        #limit: 10
-        modify_file: 'conf/modify/ffkk-arti.pl'
-        normalize:
-          path: 'conf/normalize/ff-arti.pl'
-      - name: klibri
-        type: marc
-        path: '/data/webpac2/out/marc/ffkk-libri.marc'
-        encoding: 'UTF-8'
-        normalize:
-          path: 'conf/normalize/test.pl'
 
-  fflo:
-    name: 'Lingvistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A108-1/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/ff-nakladnicka.pl'
-        - path: 'conf/normalize/ff-libri.pl'
-
-  fftu:
-    name: 'Turkologija, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/B025-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffpe:
-    name: 'Pedagogija, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/novi-40163/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffpo:
-    name: 'Povijest, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A-201-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffpu:
-    name: 'Povijest umjetnosti, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/C124-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
 
   ffps:
     # all variables here will be available as config variables in template
@@ -560,7 +222,7 @@ databases:
         # limit number of records to read from database
         #limit: 10
 
-        #modify_file: 'conf/modify/common.pl'
+        modify_file: 'conf/modify/common.pl'
         
         # define normalisation for that source
         normalize:
@@ -568,9 +230,10 @@ databases:
           # tag: 'isis'
           # path to normalization xml
           #- path: 'conf/normalize/ff-nakladnicka.pl'
+          path: 'conf/normalize/ff-libri.pl'
           #- path: 'conf/normalize/minimal.pl'
           #- path: 'conf/normalize/ff-dupli.pl'
-          path: 'conf/normalize/ffps-spec.pl'
+          #- path: 'conf/normalize/ffps-spec.pl'
 
       # another input database
       - name: peri
@@ -582,265 +245,6 @@ databases:
         normalize:
           path: 'conf/normalize/ff-peri.pl'
 
-  ffro:
-    name: 'Romanistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A224-6/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffsk:
-    name: 'Skandinavistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/B009-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffsf:
-    name: 'Slavenska filologija, Filozofski fakulteti u Zagrebu'
-    input:
-      - 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-nakl-nsk.pl'
-        # - path: 'conf/normalize/ff-nakladnicka.pl'
-          - path: 'conf/normalize/ff-libri.pl'
-        #  - path: 'conf/normalize/ff-viseraz.pl'
-        #  - path: 'conf/normalize/minimal.pl'
-        #  - path: 'conf/normalize/ff-dupli.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'
-          - path: 'conf/normalize/ff-dupli.pl'
-        #  path: 'conf/normalize/ff-libri.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'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A002-3/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffta:
-    name: 'Talijanistika, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A225-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffsr:
-    name: 'Sredi¹nja èitaonica, Filozofski fakultet u Zagrebu'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A112-1/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/minimal.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-
-  ffmic:
-    name: 'Meðunarodni istra¾ivaèki centar za kasnu antiku i srednji vijek'
-    input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/C107-9/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      #modify_file: 'conf/modify/common.pl'
-      normalize:
-        - path: 'conf/normalize/ff-libri.pl'
-        - path: 'conf/normalize/ff-dupli.pl'
-#
-#  efzg:
-#    name: 'Ekonomski fakutet u Zagrebu'
-#    input:
-#      name: knjige
-#      type: marc
-#      path: '/data/drustvene/efzg/unimarc.iso'
-#      encoding: 'cp852'
-#      # CroList recoding pairs to fix encoding problems
-#      recode: 'ÏC È Ïc è ÂC Æ Âc æ ò ð ÏS © Ïs ¹ ÏZ ® Ïz ¾'
-#      #limit: 1000
-#      normalize:
-#        path: 'conf/normalize/minimal.pl'
-#
-#  eizg:
-#    name: 'Ekonomski institut u Zagrebu'
-#    input:
-#      name: bib
-#      type: isis
-#      path: '/data/drustvene/eizg/BIB'
-#      encoding: 'cp852'
-#      #limit: 100
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  efos:
-#    name: 'Ekonomski fakutet u Osijeku'
-#    input:
-#      name: knjige
-#      type: marc
-#      path: '/data/drustvene/efos/EFOSBAZA.ISO'
-#      encoding: 'ISO-8859-2'
-#      # CroList recoding pairs to fix encoding problems
-#      #recode: '^ È ~ è ] Æ } æ | ð \[ © { ¹ @ ® ` ¾'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  irmo:
-#    name: 'Institut za meðunarodne odnose u Zagrebu'
-#    input:
-#      name: knjige
-#      type: isis
-#      path: '/data/drustvene/irmo/LIBRI'
-#      encoding: 'cp852'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  hika:
-#    name: 'Fakultet za turistièki i hotelski menad¾ment u Opatiji'
-#    input:
-#      name: knjige
-#      type: marc
-#      path: '/data/drustvene/hika/szi.iso'
-#      encoding: 'ISO-8859-2'
-#      # CroList recoding pairs to fix encoding problems
-#      recode: 'ÏC È Ïc è ÂC Æ Âc æ ò ð ÏS © Ïs ¹ ÏZ ® Ïz ¾'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  iztzg:
-#    name: 'Institut za turizam u Zagrebu'
-#    input:
-#      name: knjige
-#      type: isis
-#      path: '/data/drustvene/iztzg/BIB'
-#      encoding: 'cp852'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  jzav:
-#    name: 'Jadranski zavod'
-#    input:
-#      name: bib
-#      type: isis
-#      path: '/data/drustvene/jzav/BIB'
-#      encoding: 'cp852'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-#
-#  ijf:
-#    name: 'Institut za javne financije'
-#    input:
-#      name: knjige
-#      type: marc
-#      path: '/data/drustvene/ijf/szi.iso'
-#      encoding: 'ISO-8859-2'
-#      # CroList recoding pairs to fix encoding problems
-#      recode: 'ÏC È Ïc è ÂC Æ Âc æ ò ð ÏS © Ïs ¹ ÏZ ® Ïz ¾'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/ff-libri.pl'
-
-## Elektronièki èasopisi
-#  emerald:
-#    name: 'EmeraldFulltext'
-#    input:
-#      name: ecas
-#      type: excel
-#      path: '/data/FF/emerald/persistenturls.xls'
-#      worksheet: 'All Titles'
-#      from: 20
-#      encoding: 'windows-1250'
-#      #limit: 10
-#      normalize:
-#        path: 'conf/normalize/excel_emerald.pl'
-
-
-## Wiley zbirka
-#  wiley:
-#    name: 'Wiley Intescience Full'
-#    input:
-#      - name: full
-#        type: excel
-#        path: '/data/FF/wiley/all_wiley_interscience_journals_2007.xls'
-#        worksheet: 'All Wiley Journals 2007'
-#        from: 1
-#        encoding: 'UTF-8'
-#        normalize:
-#          path: 'conf/normalize/excel-wiley-minimal.pl'
-#      - name: licenced
-#        type: excel
-#        path: '/data/FF/wiley/wiley_casopisi2006.xls'
-#        worksheet: 'carnet'
-#        from: 1
-#        encoding: 'UTF-8'
-#        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'
-#        encoding: 'UTF-8'
-#        normalize:
-#          path: 'conf/normalize/common.pl'
-
   nsk:
     name: 'Nacionalna i sveucilisna knjiznica'
     input:
@@ -849,5 +253,5 @@ databases:
       path: '/backup/data/NSK/BBaza.ISO'
       encoding: 'ISO-8859-2'
       normalize:
-        path: 'conf/normalize/marc-nsk.pl'
+        path: 'conf/normalize/ps-casopisi.pl'
 

diff --git a/conf/normalize/ff-libri.pl b/conf/normalize/ff-libri.pl
index 466b87d..3f17d27 100644 (file)
--- a/conf/normalize/ff-libri.pl
+++ b/conf/normalize/ff-libri.pl
@@ -1,8 +1,9 @@
-##################################################################################
-## Ova datoteka sadr¾i pravila za generiranje MARC21 ISO 2709 izlazne datoteke. ##
-## Ulazni format je CDS/ISIS sa zapisima u UNIMARC-u.                           ##
-##################################################################################
-
+#########################################################################
+##                                                                     ##
+## Ova datoteka sadr¾i pravila za generiranje MARC21 ISO 2709 izlazne   ##
+## datoteke. Ulazni format je CDS/ISIS sa zapisima u UNIMARC-u.                ##
+##                                                                     ##      
+##########################################################################
 
 # konvertira se ako postoji polje 200^a
 
@@ -140,28 +141,18 @@ marc('100','a',
 
 ### 111 i 110
 # provjeriti ispise naslova iz svake baze - moguæe su gre¹ke.
+# ovo vrijedi za FFSFB
 
 if ( rec('710','f') ) {
 
 marc_indicators('111', 2, ' ');
-marc('111','a',
-       rec('710','a')
-);
-
-marc('111','c',
-       rec('710','e')
-);
 
-marc('111','d',
-       rec('710','f')
-);
-
-marc('111','e',
-       rec('710','b')
-);
-
-marc('111','n',
-       rec('710','d')
+marc_compose('111',
+       'a', rec('710','a'),
+       'e', rec('710','b'),
+       'n', rec('710','d'),
+       'd', rec('710','f'),
+       'c', rec('710','e'),
 );
 
 
@@ -176,7 +167,7 @@ marc('110','c',
        rec('710','c')
 );
 
-};
+}
 
 
 ### 245 indikatori

diff --git a/conf/normalize/ff-nakladnicka.pl b/conf/normalize/ff-nakladnicka.pl
index 0cbff0f..9436d25 100644 (file)
--- a/conf/normalize/ff-nakladnicka.pl
+++ b/conf/normalize/ff-nakladnicka.pl
@@ -113,19 +113,17 @@ marc('300','c',
        )
 );
 
+_debug(2);
 marc('900','a',
        lookup(
                sub { rec('702','a') . ', ' . rec('702','b') },
                'nsk','baza',
                sub { rec('200','a') . rec('210','a') . rec('210','c') },
-               sub { 
-                       regex('s/[:|,]//g',
-                               rec('225','a') . rec('210','a') . rec('210','b')
-                       );
-               },
+               sub { rec('225','a') . rec('210','a') . rec('210','b') },
        )
 );
 
+_debug(0);
 
 marc_duplicate();
 marc_remove('*');

diff --git a/conf/validate/ffps-libri b/conf/validate/ffps-libri
index d7cb1c9..748abe9 100644 (file)
--- a/conf/validate/ffps-libri
+++ b/conf/validate/ffps-libri
@@ -3,7 +3,7 @@
 101 
 200 a! b d e* f g* k v 
 205 a!
-210 a* c* d! 
+210 a* c* d 
 215 a c d e 
 225 a d e f h i v w x
 300 
@@ -15,6 +15,7 @@
 330
 337
 410
+532
 608
 610 
 675 a b 
@@ -27,6 +28,7 @@
 801 
 856 u
 888
+900
 990 
 991 
 994 a b c

diff --git a/conf/validate/ffsfb-libri b/conf/validate/ffsfb-libri
index 837c064..0964ddd 100644 (file)
--- a/conf/validate/ffsfb-libri
+++ b/conf/validate/ffsfb-libri
@@ -35,8 +35,7 @@
 300
 320
 330
-423 z a b c 
-464 a f c g x y 
+464 a b c f g 
 532
 610
 675 a! b c d 
@@ -44,7 +43,6 @@
 701 a! b c d 
 702 a! b 
 710 a! b c d e f 
-711 a! b 
 801
 990    
 991