local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index 1017b94..2a109a2 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -10,7 +10,7 @@ sites_root: 'sites'
 
 # which indexing engine to use? (hyperestraier is default)
 #use_indexer: 'hyperestraier'
-#use_indexer: 'hyperestraier-native'
+use_indexer: 'hyperestraier-native'
 #use_indexer: 'kinosearch'
 
 # configuration for Hyper Estraier full text search engine
@@ -75,8 +75,6 @@ webpac:
     isis: 'WebPAC::Input::ISIS'
     marc: 'WebPAC::Input::MARC'
     excel: 'WebPAC::Input::Excel'
-    dbf: 'WebPAC::Input::DBF'
-    isi: 'WebPAC::Input::ISI'
   # define delimiters for validation
   delimiters:
     - ' ; '
@@ -191,352 +189,265 @@ databases:
 #      - to: emerald
 #        credit: 10000
 
-#  ffan:
-#    name: 'Anglistika, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/A105-1/ISIS/latest/PERI/PERI'
-#        encoding: 'cp852'
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
-#      - name: libri
-#        type: isis
-#        path: '/backup/isis_backup/A105-1/ISIS/latest/LIBRI/LIBRI'
-#        encoding: 'cp852'
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-libri.pl'
-
-
-#  ffar:
-#    name: 'Arheologija, Filozofski fakultet u Zagrebu'
-#    input:
-#      - 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/ff-peri.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/ff-libri.pl'
- 
-#  ffet:
-#    name: 'Etnologija, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/A203-3/ISISDATA/latest/PERI/PERI'
-#        encoding: 'cp852'
-#        #limit: 10
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
-#      - 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/ff-libri.pl'
-
-
-#  fffi:
-#    name: 'Filozofija, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/A102-1B/ISISDATA/20070605/PERI/PERI'
-#        encoding: 'cp852'
-#        #limit: 10
-#        #modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
- 
-#   fffo:
-#     name: 'Fonetika, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/novi-40162/ISISDATA/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
-#   ffge:
-#     name: 'Germanistika, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/novi-40166/isisdata/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
-#  ffhu:
-#    name: 'Hungarologija, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/B001-2/winisis/latest/PERI/PERI'
-#        encoding: 'cp852'
-#        #limit: 10
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
-  
-#  bibirb:
-#    name: 'Bib IRB' 
-#    input:
-#      - name: bibirb 
-#        type: excel
-#        path: '/data/citiranje/sverko-bibirb.xls'
-#        encoding: 'ISO-8859-2'
-#        # modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/excel-bib-irb.pl'
-#
-#  drzb:
-#    name: 'DRZB 2007' 
-#    input:
-#      - name: drzb 
-#        type: excel
-#        path: '/data/knjiznice/drzb2007/drzb20072.xls'
-#        encoding: 'ISO-8859-2'
-#        # modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/excel-drzb.pl'
-#
+  ffan:
+    name: 'Anglistika, Filozofski fakultet u Zagrebu'
+    input:
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/A105-1/ISIS/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
+  ffge:
+    name: 'Germanistika, Filozofski fakultet u Zagrebu'
+    input:
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/novi-40166/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-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
   ffiz:
     name: 'Informacijske znanosti, Filozofski fakultet u Zagrebu'
     input:
-      - name: peri
+      - name: libri
         type: isis
-        path: '/backup/isis_backup/A129-2/isisdata/latest/PERI/PERI'
+        path: '/backup/isis_backup/A129-2/isisdata/latest/LIBRI/LIBRI'
         encoding: 'cp852'
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-peri.pl'
-      - name: marcp
-        type: marc
-        path: '/data/webpac2/out/marc/ffiz-peri.marc'
-        encoding: 'UTF-8'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
+  ffkk:
+    name: 'Komparativna knji¾evnost, Filozofski fakultet u Zagrebu'
+    input:
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/A206-4/isisdata/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/marc.pl'
-      - name: marcl
-        type: marc
-        path: '/data/webpac2/out/marc/ffiz-libri.marc'
-        encoding: 'UTF-8'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/marc.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
+  ffpe:
+    name: 'Pedagogija, Filozofski fakultet u Zagrebu'
+    input:
       - name: libri
         type: isis
-        path: '/backup/isis_backup/A129-2/isisdata/latest/LIBRI/LIBRI'
+        path: '/backup/isis_backup/visnja/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-viseraz-proba.pl'
- 
- 
- 
-#  ffkk:
-#    name: 'Komparativna knji¾evnost, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/A206-4/isisdata/latest/PERI/PERI'
-#        encoding: 'cp852'
-#        #limit: 10
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
-
-#   fflo:
-#     name: 'Lingvistika, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/A108-1/ISISDATA/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
-#   ffpe:
-#     name: 'Pedagogija, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/novi-40163/isisdata/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-#
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
   ffpo:
     name: 'Povijest, Filozofski fakultet u Zagrebu'
     input:
-      - name: peri
+      - name: libri
         type: isis
-        path: '/backup/isis_backup/A-201-1/isisdata/latest/PERI/PERI'
+        path: '/backup/isis_backup/A-201-1/isisdata/latest/LIBRI/LIBRI'
         encoding: 'cp852'
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-peri.pl'
-#
-#   ffpu:
-#     name: 'Povijest umjetnosti, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/C124-3/ISISDATA/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
   ffps:
     name: 'Psihologija, Filozofski fakultet u Zagrebu'
     code: 'ps'
     url: 'http://www.knjiznice.ffzg.hr/psihologija'
     input:
-      - name: peri
+      - name: libri
         type: isis
-        path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/'
+        path: '/backup/isis_backup/sunce2/isisdata/latest/LIBRI/'
         encoding: 'cp852'
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-peri.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
+
+  ffro:
+    name: 'Romanistika, Filozofski fakultet u Zagrebu'
+    input:
       - name: libri
         type: isis
-        path: '/backup/isis_backup/sunce2/isisdata/latest/LIBRI/'
+        path: '/backup/isis_backup/A224-6/isisdata/20070605/LIBRI/LIBRI'
         encoding: 'cp852'
+        #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
           - path: 'conf/normalize/ff-libri.pl'
-          - path: 'conf/normalize/ff-viseraz-proba.pl'
-
-
-#   ffro:
-#     name: 'Romanistika, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/A224-6/isisdata/20070605/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
   ffsf:
     name: 'Slavenska filologija, Filozofski fakulteti u Zagrebu'
     input:
-      - name: peri
+      - name: librib
         type: isis
-        path: '/backup/isis_backup/A125-2/ISISDATA/latest/PERI/PERI'
+        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-peri.pl'
-          path: 'conf/normalize/ff-peri.pl'
-      - name: marcp
-        type: marc
-        path: '/data/webpac2/out/marc/ffsf-peri.marc'
-        encoding: 'UTF-8'
-        #modify_file: 'conf/modify/common.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.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/marc.pl'
-      - name: xls
-        type: excel
-        path: '/data/isis_data/sfd/ffsf-peri.xls'
-        encoding: 'ISO-8859-2'
-        #modify_file: 'conf/modify/common.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+  
+  fftu:
+    name: 'Turkologija, Filozofski fakultet u Zagrebu'
+    input:
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/B025-2/ISISDATA/20070711/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/excel.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
 
-  proba:
-    name: FF
+  ffmic:
+    name: 'Meðunarodni istra¾ivaèki centar za kasnu antiku i srednji vijek'
     input:
-      - name: proba
+      - name: libri
         type: isis
-        path: '/backup/isis_backup/A-201-1/isisdata/latest/PERI/PERI'
+        path: '/backup/isis_backup/C107-9/ISISDATA/latest/libri/LIBRI'
         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: peri
-#         type: isis
-#         path: '/backup/isis_backup/A002-3/isisdata/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
-#   ffta:
-#     name: 'Talijanistika, Filozofski fakultet u Zagrebu'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/A225-2/isisdata/latest/PERI/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-   
-#  fftu:
-#    name: 'Turkologija, Filozofski fakultet u Zagrebu'
-#    input:
-#      - name: peri
-#        type: isis
-#        # path: '/backup/isis_backup/B025-2/ISISDATA/20070711/PERI/PERI'
-#        path: '/data/isis_data/tu/DATA/PERI/PERI'
-#        encoding: 'cp852'
-#        #limit: 10
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
- 
-#   ffmic:
-#     name: 'Meðunarodni istra¾ivaèki centar za kasnu antiku i srednji vijek'
-#     input:
-#       - name: peri
-#         type: isis
-#         path: '/backup/isis_backup/C107-9/ISISDATA/latest/Peri/PERI'
-#         encoding: 'cp852'
-#         #limit: 10
-#         modify_file: 'conf/modify/common.pl'
-#         normalize:
-#           path: 'conf/normalize/ff-peri.pl'
-# 
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri-svesci.pl'
+
   nsk:
     name: 'Nacionalna i sveucilisna knjiznica'
     input:
@@ -545,52 +456,6 @@ databases:
       path: '/home/mglavica/NSK/data/BBaza.ISO'
       encoding: 'ISO-8859-2'
       normalize:
-        path: 'conf/normalize/minimal.pl'
-  
-#   exhibit:
-#     name: 'SMILE Exhibit based ouptput for WebPAC'
-#     input:
-#       name: 'Periodika'
-#       type: marc
-#       path: 'out/marc/ffpo-peri.marc'
-#       encoding: 'UTF-8'
-#       #limit: 100
-#       normalize:
-#         path: 'conf/normalize/json.pl'
-#     output:
-#       module: 'JSON'
-#       path: 'out/exhibit/po.js'
-
-  isi:
-    name: 'ISI' 
-    input:
-      - name: isi
-        type: isi
-        path: '/data/citiranje/BRATKO.isi'
-        encoding: 'ISO-8859-1'
-        normalize:
-          path: 'conf/normalize/isi.pl'
-
-  webpacus:
-    name: 'Webpacus'
-    input:
-      - name: 'bib'
-        type: isis
-        path: '/data/hidra/test/BIB'
-        encoding: 'cp852'
-        normalize:
-          path: 'conf/normalize/webpacus-hidra.pl'
-      - name: 'dir'
-        type: isis
-        path: '/data/hidra/test/DIR'
-        encoding: 'cp852'
-        normalize:
-          path: 'conf/normalize/webpacus-hidra.pl'
-    output:
-      - module: 'KinoSearch'
-        path: 'var/kinosearch'
-      - module: 'Sorted'
-        path: 'var/sorted'
-      - module: 'Webpacus'
-        path: '/data/Webpacus2'                         
+        - path: 'conf/normalize/minimal.pl'
+        - path: 'conf/normalize/ff-libri-svesci.pl'
 

diff --git a/conf/modify/common.pl b/conf/modify/common.pl
index b54b323..5e8411d 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -97,8 +97,12 @@
   '^v'         
     '^e' => ' : '
   '^i'
+    '^f' => ' / '
     '^e' => ' : '
-
+# provjeri ovo:
+  '^v'
+    '^f' => ' / '
+    '^d' => ' = '
 
 #225
 #  '^a'

diff --git a/conf/normalize/ff-libri.pl b/conf/normalize/ff-libri.pl
index a482bd1..041defa 100644 (file)
--- a/conf/normalize/ff-libri.pl
+++ b/conf/normalize/ff-libri.pl
@@ -153,15 +153,19 @@ join_with('',
 ## treba utvrditi toènu oznaku za ustanovu
 
 marc('040','a',
-       'HR FFZG'
+       'HR-ZgFF'
 );
 
 marc('040','b',
        'hrv'
 );
 
+marc('040','c',
+       'HR-ZgFF'
+);
+
 marc('040','e',
-       'HR PPIAK'
+       'ppiak'
 );
 
 
@@ -507,8 +511,12 @@ marc_template(
                'a.|p',
                'a ;|v.|n',
                'a ;|v.|n,|p',  # mozda greska
+               'n,|p',
+               'n ;|v',        # mozda greska
+               'p ;|v',
                'v',
                'x',
+               'x ;|v'         # greska
        ],
 );
 

diff --git a/conf/normalize/ff-nakladnicka.pl b/conf/normalize/ff-nakladnicka.pl
index b72e0a3..e69c8f2 100644 (file)
--- a/conf/normalize/ff-nakladnicka.pl
+++ b/conf/normalize/ff-nakladnicka.pl
@@ -24,7 +24,7 @@ join_with('',
 
 my $series = get( $series_key );
 
-if ($series) {
+if ( $series ) {
        warn "nije novi";
 } else {