From: Dobrica Pavlinusic Date: Wed, 25 Oct 2006 11:02:36 +0000 (+0000) Subject: local config X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4d36ec1470964a042c8cbb2762176fb9675edb76;p=webpac2 local config git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@758 07558da8-63fa-0310-ba24-9fe276d99e06 --- diff --git a/conf/mjesec.yml b/conf/mjesec.yml index 4ae79a7..ebb8efc 100644 --- a/conf/mjesec.yml +++ b/conf/mjesec.yml @@ -311,7 +311,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffar: name: 'Arheologija, Filozofski fakultet u Zagrebu' @@ -321,19 +321,21 @@ databases: path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/ff-libri.pl' ffet: name: 'Etnologija, Filozofski fakultet u Zagrebu' input: name: libri type: isis - path: '/backup/isis_backup/A203-2/ISISDATA/latest/LIBRI/LIBRI' + path: '/backup/isis_backup/A203-3/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' fffi: name: 'Filozofija, Filozofski fakultet u Zagrebu' @@ -343,8 +345,9 @@ databases: path: '/backup/isis_backup/A102-1B/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' fffo: name: 'Fonetika, Filozofski fakultet u Zagrebu' @@ -354,15 +357,17 @@ databases: path: '/backup/isis_backup/novi-40162/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/ff-libri.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/common.pl' + path: 'conf/normalize/ff-arti.pl' ffge: @@ -373,8 +378,9 @@ databases: path: '/backup/isis_backup/A106-1/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffhu: name: 'Hungarologija, Filozofski fakultet u Zagrebu' @@ -384,8 +390,9 @@ databases: path: '/backup/isis_backup/B001-2/winisis/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/ff-libri.pl' ffiz: name: 'Informacijske znanosti, Filozofski fakultet u Zagrebu' @@ -397,7 +404,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffkf: name: 'Klasièna filologija, Filozofski fakultet u Zagrebu' @@ -407,8 +414,9 @@ databases: path: '/backup/isis_backup/A209-2/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffkk: name: 'Komparativna knji¾evnost, Filozofski fakultet u Zagrebu' @@ -436,7 +444,7 @@ databases: path: '/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI' encoding: 'cp852' #limit: 10 - modify_file: 'conf/modify/common.pl' + modify_file: 'conf/modify/ffkk-arti.pl' normalize: path: 'conf/normalize/ff-arti.pl' @@ -450,7 +458,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/ff-libri.pl' fftu: name: 'Turkologija, Filozofski fakultet u Zagrebu' @@ -460,8 +468,9 @@ databases: path: '/backup/isis_backup/B025-2/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffpe: name: 'Pedagogija, Filozofski fakultet u Zagrebu' @@ -471,8 +480,9 @@ databases: path: '/backup/isis_backup/A226-1/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffpo: name: 'Povijest, Filozofski fakultet u Zagrebu' @@ -483,7 +493,7 @@ databases: encoding: 'cp852' modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffpu: name: 'Povijest umjetnosti, Filozofski fakultet u Zagrebu' @@ -493,8 +503,9 @@ databases: path: '/backup/isis_backup/C124-3/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffps: # all variables here will be available as config variables in template @@ -529,7 +540,7 @@ databases: # which tag to use in normalize xml for data? # tag: 'isis' # path to normalization xml - path: 'conf/normalize/common.pl' + path: 'conf/normalize/ff-libri.pl' #path: 'conf/normalize/isis_ffzg.yml' # another input database @@ -538,8 +549,15 @@ databases: path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/PERI' encoding: 'cp852' #limit: 10 + # 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/common.pl' + path: 'conf/normalize/marc-nsk.pl' ffro: name: 'Romanistika, Filozofski fakultet u Zagrebu' @@ -549,8 +567,9 @@ databases: path: '/backup/isis_backup/A224-6/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffsk: name: 'Skandinavistika, Filozofski fakultet u Zagrebu' @@ -560,21 +579,22 @@ databases: path: '/backup/isis_backup/B009-2/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + 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' +# 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/common.pl' + path: 'conf/normalize/minimal.pl' ffsfm: name: 'Slavenska filologija (M), Filozofski fakulteti u Zagrebu' @@ -587,7 +607,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffso: name: 'Sociologija, Filozofski fakultet u Zagrebu' @@ -597,23 +617,9 @@ databases: path: '/backup/isis_backup/A002-3/isisdata/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 - modify_records: - 200: - '^a': - ' : ': '^e' - ' = ': '^d' - ' ; ': '^k' - '^k': - '^e': ' : ' - '^d': - '^e': ' : ' - '^e': - '^d': ' = ' - '^k': ' ; ' - '*': - '^g': ' ; ' + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffta: name: 'Talijanistika, Filozofski fakultet u Zagrebu' @@ -625,7 +631,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffsr: name: 'Sredi¹nja èitaonica, Filozofski fakultet u Zagrebu' @@ -637,7 +643,7 @@ databases: #limit: 10 modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.pl' + path: 'conf/normalize/minimal.pl' ffmic: name: 'Meðunarodni istra¾ivaèki centar za kasnu antiku i srednji vijek' @@ -647,106 +653,107 @@ databases: path: '/backup/isis_backup/C107-9/ISISDATA/latest/LIBRI/LIBRI' encoding: 'cp852' #limit: 10 + modify_file: 'conf/modify/common.pl' normalize: - path: 'conf/normalize/common.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/common.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/common.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/common.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/common.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/common.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/common.pl' - - jzav: - name: 'Jadranski zavod' - input: - name: bib - type: isis - path: '/data/drustvene/jzav/BIB' - encoding: 'cp852' - #limit: 10 - normalize: - path: 'conf/normalize/common.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/common.pl' - -# Elektronièki èasopisi + path: 'conf/normalize/ff-libri.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: @@ -761,3 +768,38 @@ databases: path: 'conf/normalize/excel_emerald.pl' +## Wiley zbirka + wiley: + name: 'Wiley Intescience Full' + input: + - name: full + type: marc + path: '/data/FF/wiley/wiley2.mrc' + encoding: 'UTF-8' + normalize: + path: 'conf/normalize/marc-cufts.pl' + - name: licenced + type: excel + path: '/data/FF/wiley/w2.xls' + worksheet: 'Sheet1' + from: 0 + encoding: 'windows-1250' + normalize: + path: 'conf/normalize/excel-wiley.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: +# 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 fcee372..ea6cc8d 100644 --- a/conf/modify/common.pl +++ b/conf/modify/common.pl @@ -6,6 +6,8 @@ ' = ' => '^d' ' ; ' => '^k' '^k' + '^c' => '. ' + '^e' => ' : ' '^e' => ' : ' '^d' '^e' => ' : ' @@ -48,6 +50,12 @@ '^h' => '. ' '^i' => '. ' +250 + '*' + ' : ' => '^a' + ' ; ' => '^b' + + #330 # '*' # '><' => '^a' @@ -66,14 +74,3 @@ # '^f' # '^a' => '^g' - -700 - '^a' - '^b' => ', ' - -701 - '^a' - '^b' => ', ' -702 - '^a' - '^b' => ', ' diff --git a/conf/modify/marc-cufts.pl b/conf/modify/marc-cufts.pl new file mode 100644 index 0000000..2e064a2 --- /dev/null +++ b/conf/modify/marc-cufts.pl @@ -0,0 +1,5 @@ +# this is pseudo hash/yaml format for regex mappings + +245 + '^a' + '.$' => '$' diff --git a/conf/normalize/common.pl b/conf/normalize/common.pl index 9e9d1c5..853c925 100755 --- a/conf/normalize/common.pl +++ b/conf/normalize/common.pl @@ -220,47 +220,47 @@ tag('IssuedWith', ) ); -display('parts', - lookup( - prefix( 'dio-jzav:', rec(900) ) - ) -); - -search('parts', - lookup( - prefix( 'id-dio-jzav:', rec(900) ) - ) -); - -display('partsEF', - lookup( - prefix( 'naslov-efzg:001', rec('001') ) - ) -); - -tag('partsID', - rec('463','1') -); - -tag('piece', - lookup( - prefix( 'naslov-efzg:', - first( - rec(463,1) - ) - ) - ) -); - -tag('pieceSubtitle', - lookup( - prefix( 'podnaslov-efzg:', - first( - rec(463,1) - ) - ) - ) -); +#display('parts', +# lookup( +# prefix( 'dio-jzav:', rec(900) ) +# ) +#); +# +#search('parts', +# lookup( +# prefix( 'id-dio-jzav:', rec(900) ) +# ) +#); +# +#display('partsEF', +# lookup( +# prefix( 'naslov-efzg:001', rec('001') ) +# ) +#); +# +#tag('partsID', +# rec('463','1') +#); +# +#tag('piece', +# lookup( +# prefix( 'naslov-efzg:', +# first( +# rec(463,1) +# ) +# ) +# ) +#); +# +#tag('pieceSubtitle', +# lookup( +# prefix( 'podnaslov-efzg:', +# first( +# rec(463,1) +# ) +# ) +# ) +#); tag('pieceNum', rec('463','v') @@ -355,33 +355,33 @@ tag('id', rec(900) ); -display('set', - lookup( - prefix( 'set-jzav:', - rec(946,1), - ) - ), - lookup( - prefix( 'set-efzg:', - rec(461,1), - ) - ) -); +#display('set', +# lookup( +# prefix( 'set-jzav:', +# rec(946,1), +# ) +# ), +# lookup( +# prefix( 'set-efzg:', +# rec(461,1), +# ) +# ) +#); search('set', rec(946,1), rec(461,1), ); -tag('set2', - lookup( - prefix( 'set-jzav:', - lookup( 'parent-id:', - rec(946,1) - ) - ) - ) -); +#tag('set2', +# lookup( +# prefix( 'set-jzav:', +# lookup( 'parent-id:', +# rec(946,1) +# ) +# ) +# ) +#); tag('ShelvingControlNumber', rec(990) diff --git a/conf/normalize/excel-wiley.pl b/conf/normalize/excel-wiley.pl new file mode 100644 index 0000000..0bf5e3d --- /dev/null +++ b/conf/normalize/excel-wiley.pl @@ -0,0 +1,25 @@ +marc_indicators('245', 0, 0); + +marc('245','a', + rec('A') +); + +marc('245','h', + '[ Elektronièka graða ]' +); + +marc('856','u', + lookup( + sub { rec('856','u') }, + 'wiley','full', + sub { + regex('s/\s*(\.|:)\s*$//g', + lc( rec('245','a') ) + ); + }, + + sub { + lc( rec('A') ) + } + ) +); diff --git a/conf/normalize/excel_emerald.pl b/conf/normalize/excel_emerald.pl index 0cfb0bf..0bfb313 100755 --- a/conf/normalize/excel_emerald.pl +++ b/conf/normalize/excel_emerald.pl @@ -1,26 +1,18 @@ -display('ISSN', +marc('020','a', rec('B'), ); -search('ISN', - rec('B'), -); +marc_indicators('245', 0, 0); -tag('TitleProper', +marc('245','a', rec('A') ); -tag('Medium','[ Elektronièka graða ]' ); - -tag('fond', - rec('H') -); - -tag('NamePublisher', - 'Emerald' +marc('245','h', + '[ Elektronièka graða ]' ); -tag('ElectronicLocation', +marc('856','u', rec('D') ); diff --git a/conf/normalize/ff-arti.pl b/conf/normalize/ff-arti.pl index 1390be9..2df8833 100644 --- a/conf/normalize/ff-arti.pl +++ b/conf/normalize/ff-arti.pl @@ -214,18 +214,18 @@ marc('773','t', marc('773','w', lookup( - sub { 'ffkk/peri/' . rec('000') }, + sub { 'ffkk-peri-' . rec('000') }, 'ffkk','peri', sub { rec('11') } ) || lookup( - sub { 'ffkk/peri/' . rec('000') }, + sub { 'ffkk-peri-' . rec('000') }, 'ffkk','peri', sub { first(rec(200,'a')) . ' ' . first(rec('200','e')) }, ) || lookup( - sub { "ffkk/peri/" . rec('000') }, + sub { "ffkk-peri-" . rec('000') }, 'ffkk','peri', sub { rec(200,'a') }, # sub { rec(900,'x') }, diff --git a/conf/normalize/ff-libri.pl b/conf/normalize/ff-libri.pl index 2de6b1b..16212b7 100644 --- a/conf/normalize/ff-libri.pl +++ b/conf/normalize/ff-libri.pl @@ -25,16 +25,15 @@ if ( rec('230') ) { # 001 polje - Voyager -# polje 035 je u NSK ponovljivo. za¹to ??? - # privemeno koristimo 0356 umjesto 0359, zato ¹to marclint 9 prijavljuje kao gre¹ku marc('035','6', join_with('', # config('input normalize path'), # config('name'), -# config('input name'), config(), + 'L', +# config('input name'), # id(), # rec('994','a'), rec('000') @@ -61,21 +60,27 @@ marc('040','b', 'hrv' ); -if (rec('300') && first(rec('300')) =~ m/prijevod/i) { +marc('040','e', + 'HR PPIAK' +); + +if (rec('300') && first(rec('300')) =~ m/Prijevod/) { marc_indicators('041', 1, ' '); } else { marc_indicators('041', 0, ' '); } +## naci primjer u NSK + marc_repeatable_subfield('041','a', rec('101') ); -## pitati dobricu - -if ( rec('200') && first(rec('200')) =~ m/Die /i) { - marc_indicators('245', 0, 4); +if ( ( rec('200','a') =~ m/^Die /) || + ( rec('200','a') =~ m/^Das /) || + ( rec('200','a') =~ m/^The /) ) { + marc_indicators('245', 0, 4); } else { marc_indicators('245', 0, 0); } @@ -143,6 +148,8 @@ marc_original_order('260', '210'); # provjeriti interpunkcije !! +# u NSK nesto ne stima + marc('300','a', suffix( rec('215','c') ? ' : ' : @@ -155,7 +162,7 @@ marc('300','a', marc('300','b', suffix( - ( rec('215','c') && rec('215','d') ) ? ' : ' : + ( rec('215','c') && rec('215','d') ) ? ' ; ' : ( rec('215','c') && rec('215','e') ) ? ' + ' : ' ', rec('215','c') @@ -175,12 +182,25 @@ marc('300','e', ); +# provjeriti + marc_indicators('490', 0, ' '); marc('490','a', rec('225','a') ); +marc('490','v', + join_with(', ', + rec('225','v'), + rec('225','w') + ), +); + +marc('490','x', + rec('225','x') +); + #marc('490','a', # join_with(' : ', # rec('225','a'), @@ -214,49 +234,56 @@ marc('504','a', rec('320') ); -# napomene uz konverziju polja sa sadr¾ajem: +## napomene uz konverziju polja 327 (sadrzaj): # NSK konvertira 327 (NP) u 501 (R) # u LOC konv. tablici stoji 327 (NP) u 505 (NR) # standard i validacije dopu¹taju 501 (R) i 505 (R) -# FFPS koristi 327 (P) -# FFIZ koristi 327 - -marc_indicators('505', '0', ' '); - -marc('505','a', - regex('s/\s*[\\r\\n]+\s*\**\s*/ ; /g', - rec('327') - ) +## FFPS 327 - sadrzaj +if ( config() =~ m/ffps/ || config() =~ m/fftu/ ) { + marc_indicators('505', '1', ' '); + marc('505','a', + regex('s/\s*[\\r\\n]+\s*\**\s*/ ; /g', + rec('327') + ) ); +} -# napomene uz konverziju polja 330: + +## napomene uz konverziju polja 330: # NSK konvertira 330 (P) u 520 (P) = LOC konv. tablica -# FFAN - (NP) - sadr¾aj, pitati Milu da li je to cijeli sadraj ili nije -# -# FFIZ koristi 330 (P) - kljuène rijeèi, dijelovi sadr¾aja, sa¾eci -# FFFO koristi 330 (P) - kljuène rijeèi, dijelovi sadr¾aja -# FFPS koristi 330 (NP) - sa¾etak -if ( config() =~ m/ffan/i || config() =~ m/fflo/i ) { +# FFPS 330 (NP) - sa¾etak +if ( config() =~ m/ffps/ ) { + marc('520','a', + regex('s/[\\r\\n]+/. /g', + rec('330') + ) + ); +} -marc('520','a', - regex('s/[\\r\\n]+/. /g', +# FFTU 330 - ??? +if ( config() =~ m/fftu/ ) { + marc('520','a', rec('330') - ) -); - + ); } + # mo¾da i polje 520y - jezik napomene ako je uvijek isti jezik +marc_indicators('246', 1, 3); +marc('246','a', + rec('532') +); + marc_indicators('655', ' ', 4); marc('655','a', rec('608') ); -marc_indicators('653', ' ', ' '); +marc_indicators('653', 0, ' '); marc('653','a', rec('610') ); @@ -296,7 +323,10 @@ marc('700','4', } marc('700','a', - rec('701', 'a'), + join_with(', ', + rec('701', 'a'), + rec('701', 'b') + ) ); marc('700','a', @@ -326,7 +356,7 @@ marc('700','a', ); -# ako je u originalu ponovljivo polje treba biti i konvertirano!! +# ako je u originalu ponovljivo polje treba biti i konvertirano u ponovljivo !! marc('700','a', @@ -350,8 +380,9 @@ 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 drugeosobe? -# +## 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') # ); @@ -442,10 +473,6 @@ marc('740','a', if ( rec('230') ) { - marc('900','a', - id() - ); - marc_duplicate(); marc_remove('035'); @@ -453,6 +480,7 @@ if ( rec('230') ) { join_with('', config(), rec('000'), + '-', id(), ) ); @@ -517,10 +545,25 @@ if ( rec('230') ) { } marc_remove('260'); + +# marc_original_order('260', '250'); + marc('260','c', - rec('250') + rec1('251') ); + +# marc('260','a', +# rec('251','a') +# ); +# marc('260','b', +# rec('251','c') +# ); +# marc('260','c', +# rec('251','d'), +# rec1('251') +# ); + marc_remove('300'); marc('300','a', rec('260') diff --git a/conf/normalize/ff-peri.pl b/conf/normalize/ff-peri.pl new file mode 100644 index 0000000..a925404 --- /dev/null +++ b/conf/normalize/ff-peri.pl @@ -0,0 +1,484 @@ +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) { + marc_leader('05','c'); +} else { + marc_leader('05','n'); +} + + marc_leader('06','a'); + marc_leader('07','m'); + marc_leader('18','i'); + +if ( rec('230') ) { + marc_leader('19','r'); +} + + +# 001 polje - Voyager + +# privemeno koristimo 0356 umjesto 0359, zato ¹to marclint 9 prijavljuje kao gre¹ku + +marc('035','6', +join_with('', +# config('input normalize path'), +# config('name'), + config(), + 'L', +# config('input name'), +# id(), +# rec('994','a'), + rec('000') + ) +); + +# u marc 035a treba dodati System Number - +# NSK zapisuje Voyagerov ID (001) - kako ??? + +# u FFSF bazama postoji nekoliko zaredanih ISBN, odvojenih s '. - ' + +marc('020','a', + rec('10') +); + +marc('022','a', + rec('11') +); + +# u polje 040a mo¾da jo¹ dodati prefiks HR +# NSK ima HR NSB (mo¾da u novijim zapisima ima NSK?) + +marc('040','a', + 'HR FFZG' +); + +marc('040','b', + 'hrv' +); + +marc('040','e', + 'HR PPIAK' +); + +# if (rec('300') && first(rec('300')) =~ m/Prijevod/) { +# marc_indicators('041', 1, ' '); +# } else { +# marc_indicators('041', 0, ' '); +# } + +## naci primjer u NSK + +marc_repeatable_subfield('041','a', + rec('101') +); + + +if ( ( rec('200','a') =~ m/^Die /) || + ( rec('200','a') =~ m/^Das /) || + ( rec('200','a') =~ m/^The /) ) { + marc_indicators('245', 0, 4); +} else { + marc_indicators('245', 0, 0); +} + +#_debug(3); + +marc_compose('245', + 'a', suffix( + rec('200','b') ? '. ' : + rec('200','k') ? ' ; ' : + rec('200','d') ? ' = ' : + rec('200','e') ? ' : ' : + rec('200','f') ? ' / ' : + '.', + rec('200','a') + ), + 'h', rec('200','b'), + 'b', suffix( + ( rec('200','k') && rec('200','f') ) ? ' / ' : + ' ', + join_with(' ; ', + rec('200','k'), + ), + ), + 'b', suffix( + ( rec('200','d') && rec('200','f') ) ? ' / ' : + ' ', + rec('200','d'), + ), + 'b', suffix( + ( rec('200','e') && rec('200','f') ) ? ' / ' : + ' ', + join_with(' : ', + rec('200','e'), + ), + ), + +# ovo trenutno radi za sluèaj kad f nije ponovljivo i kad uvijek postoje c i f u paru !!! + 'c', join_with('. ', + rec('200','f'), + rec('200','c'), + ), +# FIXME append to last subfield +# '+', prefix('. ', rec('200','c') ), +); + + +#_debug(0); + +marc('250','a', + suffix( + rec('205','f') ? ' / ' : + ' '. + rec('205','a') + ) +); + +marc('250','b', + rec('205','f') +); + +# ponovljiva potpolja u originalnom redosljedu +# +marc_original_order('260', '210'); + + +# provjeriti interpunkcije !! +# u NSK nesto ne stima + +marc('300','a', + suffix( + 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') + ) +); + +marc('300','c', + suffix( + rec('215','e') ? ' + ' : + ' ', + rec('215','d') + ) +); + +marc('300','e', + rec('215','e') +); + + +# provjeriti + +marc_indicators('490', 0, ' '); + +marc('490','a', + rec('225','a') +); + +marc('490','v', + join_with(', ', + rec('225','v'), + rec('225','w') + ), +); + +marc('490','x', + rec('225','x') +); + +#marc('490','a', +# join_with(' : ', +# rec('225','a'), +# join_with(" = ", +# rec('225','d'), +# join_with(" / ", +# rec('225','e'), +# rec('225','f') +# ) +# ) +# ) +#); + +#marc('490','v', +# join2_with(225, 'v', ' , ', 225,'w'); +# join_with(', ', +# rec('225','v'), +# rec('225','w') +# ) +#); + +#marc('500','a', +# rec('300') +#); +# +#marc('500','a', +# rec('314') +#); +# +#marc('504','a', +# rec('320') +#); + +## napomene uz konverziju polja 327 (sadrzaj): +# NSK konvertira 327 (NP) u 501 (R) +# u LOC konv. tablici stoji 327 (NP) u 505 (NR) +# standard i validacije dopu¹taju 501 (R) i 505 (R) + +## FFPS 327 - sadrzaj +if ( config() =~ m/ffps/ || config() =~ m/fftu/ ) { + marc_indicators('505', '1', ' '); + marc('505','a', + regex('s/\s*[\\r\\n]+\s*\**\s*/ ; /g', + rec('327') + ) +); +} + + +## napomene uz konverziju polja 330: +# NSK konvertira 330 (P) u 520 (P) = LOC konv. tablica + + +# FFPS 330 (NP) - sa¾etak +if ( config() =~ m/ffps/ ) { + marc('520','a', + regex('s/[\\r\\n]+/. /g', + rec('330') + ) + ); +} + +# FFTU 330 - ??? +if ( config() =~ m/fftu/ ) { + marc('520','a', + rec('330') + ); +} + + +# mo¾da i polje 520y - jezik napomene ako je uvijek isti jezik + +marc_indicators('246', 1, 3); +marc('246','a', + rec('532') +); + +marc_indicators('655', ' ', 4); +marc('655','a', + rec('608') +); + +marc_indicators('653', 0, ' '); +marc('653','a', + rec('610') +); + +# 675 podpolja c, d ... - ¹to s njima ??? + +marc('080','a', + rec('675','a') +); + +# 084 je other classification (R) +# NSK ga koristi za struènu oznaku NSK iz polja 681 +# NSK definira i prelazak polja 686 u 084, u skladu s LOC konv. tablicom +# +# polje 686 koristi FFPS + +marc('084','a', + rec('686') +); + +marc_indicators('100', 1, ' '); +marc('100','a', + join_with(', ', + rec('700', 'a'), + rec('700', 'b') + ) +); + +#_debug(2); + +marc_indicators('700', 1, ' '); + +if ( rec('701') ) { +marc('700','4', + 'aut' +); +} + +marc('700','a', + join_with(', ', + rec('701', 'a'), + rec('701', 'b') + ) +); + +marc('700','a', + join_with(', ', + rec('701', 'c'), + rec('701', 'd') + ) +); + +marc('700','a', + join_with(', ', + rec('701', 'e'), + rec('701', 'f') + ) +); + +marc('700','a', + join_with(', ', + rec('701', 'g'), + rec('701', 'h') + ) +); + + +marc('700','a', + rec('702','a'), +); + + +# ako je u originalu ponovljivo polje treba biti i konvertirano u ponovljivo !! + + +marc('700','a', + join_with(', ', + rec('702','c'), + rec('702','d') + ) +); + +marc('700','a', + join_with(', ', + rec('702','e'), + rec('702','f') + ) +); + +marc('700','a', + join_with(', ', + rec('702','g'), + rec('702','h') + ) +); + +## 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); + + +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') +); + + +} else { + +marc_indicators('110', 2, ' '); +marc('110','a', + rec('710','a') +); + +marc('110','c', + rec('710','c') +); + +}; + + +marc_indicators('740', 0, ' '); + +if ( ! rec('464') ) { +marc('740','a', + rec('200','c') +); + +marc('740','a', + rec('200','k') +); + +} else { +marc('740','a', + rec('464','a') +); +}; + +marc('500','a', + lookup( + sub { rec('304','a') }, + 'ffps','baza', + sub { rec('200','a') }, + ) +); + + + +} diff --git a/conf/normalize/marc-cufts.pl b/conf/normalize/marc-cufts.pl new file mode 100644 index 0000000..dbf944f --- /dev/null +++ b/conf/normalize/marc-cufts.pl @@ -0,0 +1,15 @@ + +marc_indicators('245', 0, 0); + +marc('245','a', + rec('245','a') +); + +marc('245','h', + '[ Elektronièka graða ]' +); + +marc('856','u', + rec('856','u') +); + diff --git a/conf/normalize/marc-nsk.pl b/conf/normalize/marc-nsk.pl new file mode 100644 index 0000000..e40a2d8 --- /dev/null +++ b/conf/normalize/marc-nsk.pl @@ -0,0 +1,31 @@ + +if ( rec('200','a') ) { + +marc('035','6', +join_with('', + config(), + 'L', + rec('000') + ) +); + +marc('020','a', + rec('10') +); + + +marc('022','a', + rec('011','a') +); + + +marc_indicators('245', 0, 0); +marc('245','a', + rec('200','a') +); + +marc('500','a', + rec('300','a') +); + +} diff --git a/conf/normalize/minimal.pl b/conf/normalize/minimal.pl new file mode 100644 index 0000000..ecb1492 --- /dev/null +++ b/conf/normalize/minimal.pl @@ -0,0 +1,26 @@ +marc('035','6', +join_with('', + config(), + 'L', + rec('000') + ) +); + + +marc('020','a', + rec('10') +); + + +marc('022','a', + rec('11','a') +); + + +marc_indicators('245', 0, 0); +marc('245','a', + rec('200','a') +); + + + diff --git a/conf/validate/ffan-libri b/conf/validate/ffan-libri index c44cc16..bc97401 100644 --- a/conf/validate/ffan-libri +++ b/conf/validate/ffan-libri @@ -34,7 +34,7 @@ 935 990 991 -994! a! b c +994 a! b c 995 996 999 diff --git a/conf/validate/ffar-libri b/conf/validate/ffar-libri index 23e5e50..ee8f78d 100644 --- a/conf/validate/ffar-libri +++ b/conf/validate/ffar-libri @@ -1,7 +1,7 @@ 0 10 101 -200 a d e f g k +200 a c d e f g k 205- 210 a c d 215 a c d e diff --git a/conf/validate/ffet-libri b/conf/validate/ffet-libri index 0bb6ace..4b0d960 100644 --- a/conf/validate/ffet-libri +++ b/conf/validate/ffet-libri @@ -39,9 +39,10 @@ 327 328 330 +423 532 610 -675 a b c d +675- a b c d 700 a b 701 a b c d e f g h i j 702 a b c d e f diff --git a/conf/validate/fffi-libri b/conf/validate/fffi-libri new file mode 100644 index 0000000..edb59f8 --- /dev/null +++ b/conf/validate/fffi-libri @@ -0,0 +1,62 @@ +0 +10 +101 +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 +220 +221 +222 +223 +225 a d e f g h i v w +230- a d e f g k v +231- a d e f g k v +232- a e f g k v +233- a e f g k v +240- a +241- a +242- a +243- a +250- a c d +251- a c d +252- a c d +253- a c d +260- a c d +261- a c d +262- a c d +263- a c d +270- a d e f h i k v w x y z +271- a d e f h i k v w x y z +272- a d e f h i k v w x y z +273- a d e f h i k v w x y z +280 +281 +282 +283 +290 +291 +292 +293 +300 +314 +320 +327 +330 +410- 0 2 +423 a b c e z +464 a c f g x y +532 a +610 +675 a b c d +700 4 a b +701 4 a b c d +702 4 a b +710 4 a b c d e f +801 +990 +991 +994 a b c +996 +998 a b +999 a b diff --git a/conf/validate/fffo-libri b/conf/validate/fffo-libri index 78ade40..3a5ee87 100644 --- a/conf/validate/fffo-libri +++ b/conf/validate/fffo-libri @@ -54,11 +54,11 @@ 701 a! b c d 702 a! b c d 710 a! b c d e f -801 +801! 9 990 991 -994 a b c +994! a! b! c! 996 998 a! b 999 diff --git a/conf/validate/ffhu-libri b/conf/validate/ffhu-libri index be323d6..5f2d985 100644 --- a/conf/validate/ffhu-libri +++ b/conf/validate/ffhu-libri @@ -1,15 +1,15 @@ 0 10 101 -200 a c d e* f g* k -205 a -210 a c d -215 a c d e +200! a! c d e* f g* k +205 a! +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 +230 a e* f v +231 a e* f v 232 a e* f v -233 a e f v +233 a e* f v 240 241 242 @@ -38,20 +38,20 @@ 320 327 330 -423 a b c z -464 a f g +423 a! b c z +464 a! f g 532 610 -675 a -700 a b -701 a b c d -702 a b -710 a b d e f -711 a e f -801 +675 a! +700 a! b! +701 a! b c d +702 a! b +710 a! b d e f +711 a! e f +801! 990 991 -994 a b c +994! a! b! c! 996 -998 a -999 a b +998 a! +999! a! b! diff --git a/conf/validate/ffiz-libri b/conf/validate/ffiz-libri index ae4b119..ed8d6ce 100644 --- a/conf/validate/ffiz-libri +++ b/conf/validate/ffiz-libri @@ -1,8 +1,8 @@ 0 10 101 -200 a d e* f g* k -205 a +200 a! d e* f g* k +205 a! 210 a c d 215 a c d e 225 a e h i v w @@ -10,10 +10,10 @@ 231 a e f v 232 a e f v 233 a e f v -240 -241 -242 -243 +240- a +241- a +242- a +243- a 250 a c d 251 a c d 252 a c d @@ -21,7 +21,7 @@ 260 a c d 261 a c d 262 a c d -263 a c d +263 a c d e 270 a f v 271 a f v 272 diff --git a/conf/validate/ffkf-libri b/conf/validate/ffkf-libri new file mode 100644 index 0000000..547b60a --- /dev/null +++ b/conf/validate/ffkf-libri @@ -0,0 +1,57 @@ +0 +10 +101 +200 a c d e f g i k +205 a f +210 a b c d e f +215 a b c d e +225 a c d e f h i v w +230 a c d e f g i v +231 a c d e f g h v +232 a c d e f g h v +233 a d e f g v +240- a f +241- a f +242- a f +243- a f +250- a c d +251- a c d +252- a c d +253- a c d +260- a c d +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 +280 +281 +282 +283 +290 +291 +292 +293 +300 +320 +327 +330 +423 a b c z +532 +610 +675 a b c d +686 +700 a b +701 a b c d e f g h i j k l m n o p q r +702 a b c d e f g h i j k l m n o p q r s t u v w x y +710 a b c d e f +711 +801 +990 +991 +994 a b c +996 +998 a b g +999 diff --git a/conf/validate/ffkk-libri b/conf/validate/ffkk-libri index 766777f..37af0c4 100644 --- a/conf/validate/ffkk-libri +++ b/conf/validate/ffkk-libri @@ -2,7 +2,7 @@ 10 101 200 a! c d e* f g* k x y -205 a +205 a! 210 a c d! 215 a c d e 225 a! e h i v* w diff --git a/conf/validate/ffps-libri b/conf/validate/ffps-libri new file mode 100644 index 0000000..61a9b90 --- /dev/null +++ b/conf/validate/ffps-libri @@ -0,0 +1,35 @@ +0 +10 +101 +200 a! b d e* f g* k +205 a! +210 a* c* d +215 a c d e +225 a d e f h i v w x +300 +305 +307 +314 +320 +327 +330 +337 +410 +608 +610 +675 a b +686 +700 a b +701 a b c d e f g h +702 a b c d e f g h +710 a b c d e f +711 a b c d e f +801 +856 u +888 +990 +991 +994 a b c +996 +998 a! +999 diff --git a/conf/validate/ffpu-libri b/conf/validate/ffpu-libri index 45bad72..9ee3169 100644 --- a/conf/validate/ffpu-libri +++ b/conf/validate/ffpu-libri @@ -14,26 +14,26 @@ 241 242 243 -250 a c d -251 a c d -252 a c d -253 a c d -260 a c d -261 a c d -262 a c d -263 a c d -270 a e h v w -271 a e h v w -272 a e h v w -273 a e h v w -280 -281 -282 -283 -290 -291 -292 -293 +250- a c d +251- a c d +252- a c d +253- a c d +260- a c d +261- a c d +262- a c d +263- a c d +270- a e h v w +271- a e h v w +272- a e h v w +273- a e h v w +280- +281- +282- +283- +290- +291- +292- +293- 300 320 327 diff --git a/conf/validate/ffro-libri b/conf/validate/ffro-libri index 6e394b1..605bc65 100644 --- a/conf/validate/ffro-libri +++ b/conf/validate/ffro-libri @@ -1,9 +1,9 @@ -0 +0 2 10 101 -200 a c d e f g k -205 a +200! a! c d e f g k +205 a! 210 a c d 215 a c d e 225 a e h i v w @@ -11,10 +11,10 @@ 231 a e f v 232 a e f v 233 a e f v -240 -241 -242 -243 +240 a +241 a +242 a +243 a 250 a c d 251 a c d 252 a c d diff --git a/conf/validate/ffsk-libri b/conf/validate/ffsk-libri new file mode 100644 index 0000000..1031e65 --- /dev/null +++ b/conf/validate/ffsk-libri @@ -0,0 +1,35 @@ +0 +1 +10 +101 +2 +200 a d e f g k v +205- a +210 a* c* d +215 a c d e +225 a e h i v w +230 v +231 e v +240 a +250 a c d +251 a c d +260 a d +261 a d +270 +290 +291 +300 +320 +330 +610 +675 a +700 a b +701 a b c d +702 a b c d +801 +990 +991 +994 a b c +996 +998 a +999 a b diff --git a/conf/validate/ffso-libri b/conf/validate/ffso-libri index 6eb0d49..b028a19 100644 --- a/conf/validate/ffso-libri +++ b/conf/validate/ffso-libri @@ -5,7 +5,7 @@ 205 a! 210 a c d! 215 a c d e -225 a! e h i v w +225 a e h i v w 230 a e f g v 231 a e f g v 232 a e f g v diff --git a/conf/validate/ffsr-libri b/conf/validate/ffsr-libri index 90c1775..c54daf0 100644 --- a/conf/validate/ffsr-libri +++ b/conf/validate/ffsr-libri @@ -2,8 +2,8 @@ 10 101 200 a! d e f g k -205 a -210 a c d +205 a! +210 a c d! 215 a c d e 225 a e h i v w 230 a e f v @@ -43,7 +43,7 @@ 503 a b 532 610 -675 a b c d +675 a! b c d 700 a! b 701 a! b c d 702 a! b c d diff --git a/conf/validate/ffta-libri b/conf/validate/ffta-libri index e769908..2295a24 100644 --- a/conf/validate/ffta-libri +++ b/conf/validate/ffta-libri @@ -1,6 +1,8 @@ 0 +1 10 -101 +101 +2 200 a! c d e f g k 205 a! 210 a c d! diff --git a/conf/validate/fftu-libri b/conf/validate/fftu-libri index 01ee583..c204d8c 100644 --- a/conf/validate/fftu-libri +++ b/conf/validate/fftu-libri @@ -1,9 +1,9 @@ 0 10 101 -200 a c d e f g k -205 a -210 a c d +200 a! d e f g k +205 a! +210 a c d! 215 a c d e 225 a e h i v w 230 a e f v @@ -41,14 +41,21 @@ 464 a c f g x y 532 610 -675 a b c d -700 a b -701 a b c d -702 a b -710 a d e f -711 a +675 a! b c +700 a! b +701 a! b c d +702 a! b +710 a! d e f +711 a! 801 +930 +931 +932 +933 +934 +935 990 991 994 a b c +995 998 a