local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index 5a42f00..f2999d4 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -304,7 +304,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A105-1/ISIS/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis.pm'
       #limit: 10
       normalize:
@@ -316,7 +316,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -328,7 +328,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A203-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -340,7 +340,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A102-1B/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -352,7 +352,7 @@ databases:
       - name: libri
         type: isis
         path: '/backup/isis_backup/novi-40162/ISISDATA/latest/LIBRI/LIBRI'
-        encoding: '852'
+        encoding: 'cp852'
         lookup: 'conf/lookup/isis_ffzg.yml'
         #limit: 10
         normalize:
@@ -360,7 +360,7 @@ databases:
       - name: arti
         type: isis
         path: '/backup/isis_backup/novi-40162/ISISDATA/latest/ARTI/ARTI'
-        encoding: '852'
+        encoding: 'cp852'
         lookup: 'conf/lookup/isis_ffzg.yml'
         #limit: 10
         normalize:
@@ -373,7 +373,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A106-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -385,7 +385,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/B001-2/winisis/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -397,7 +397,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A129-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -409,7 +409,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A209-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -418,14 +418,28 @@ databases:
   ffkk:
     name: 'Komparativna knji¾evnost, Filozofski fakultet u Zagrebu'
     input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
-      lookup: 'conf/lookup/isis_ffzg.yml'
-      #limit: 10
-      normalize:
-        path: 'conf/normalize/common.pl'
+      - name: libri
+        type: isis
+        path: '/data/isis_data/kk/LIBRI/LIBRI'
+#       path: '/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        lookup: 'conf/lookup/isis_ffzg.yml'
+        #limit: 10
+        normalize:
+          path: 'conf/normalize/common.pl'
+      - name: arti
+        type: isis
+        path: '/data/isis_data/kk/ARTI/ARTI'
+#       path: '/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI'
+        encoding: 'cp852'
+        lookup: 'conf/lookup/isis_ffzg.yml'
+        #limit: 10
+        modify_records:
+          200:
+            '^f':
+              '; ': '^x'
+        normalize:
+          path: 'conf/normalize/common.pl'
 
   fflo:
     name: 'Lingvistika, Filozofski fakultet u Zagrebu'
@@ -433,33 +447,9 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A108-1/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
-      modify_records:
-        200:
-          '^d':
-            '^e': ' : '
-          '^e':
-            '^d': ' = '
-          '*':
-            '^g': ' ; '
-            '^c': '. '
-            '^k': ' ; '
-        210:
-          '^a':
-            '^c': '^b'
-          '^b':
-            '^d': '^c'
-        700:
-          '^a':
-            '^b': ', '
-        701:
-          '^a':
-            '^b': ', '
-        702:
-          '^a':
-            '^b': ', '
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -469,7 +459,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/B025-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -481,7 +471,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A226-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -493,7 +483,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A201-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -505,7 +495,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/C124-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -529,7 +519,7 @@ databases:
         # path: '/data/isis_data/PS/LIBRI/'
 
         # encoding of character set in isis data
-        encoding: '852'
+        encoding: 'cp852'
 
         # lookup
         lookup: 'conf/lookup/isis_ffzg.yml'
@@ -550,7 +540,12 @@ databases:
             '^a':
               '^c': '^b'
             '^b':
+              ' : ': '^b' 
               '^d': '^c'
+            '*':
+              '. (': '. (^e'
+            '^e':
+              ' : ': ' ^f'
           700:
             '^a':
               '^b': ', '
@@ -572,7 +567,7 @@ databases:
       - name: peri
         type: isis
         path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/PERI'
-        encoding: '852'
+        encoding: 'cp852'
         lookup: 'conf/lookup/isis_ffzg.yml'
         #limit: 10
         normalize:
@@ -584,7 +579,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A224-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -596,7 +591,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/B009-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -607,26 +602,32 @@ databases:
     input:
       name: libri
       type: isis
-      path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      path: '/data/isis_data/sfb/LIBRI/LIBRI'
+#     path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       modify_records:
         200:
           '^a':
-            ' ; ': '^k'
+            ' : ': '^e'
+            ' = ': '^d'
+          '^k':
+            '^e': ' : '
           '^d':
             '^e': ' : '
           '^e':
             '^d': ' = '
+            '^k': ' ; '
           '*':
             '^g': ' ; '
         210:
-          '*':
+          '^a':
             '^c': '^b'
+          '^b':
+            ' ; ': '^a'
+            ' : ': '^b'
             '^d': '^c'
-            '. (': '. (^e'
-            ' : ': ' :^f' 
         700:
           '^a':
             '^b': ', '
@@ -645,7 +646,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       modify_records:
@@ -682,9 +683,24 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A002-3/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
+      modify_records:
+        200:
+          '^a':
+            ' : ': '^e'
+            ' = ': '^d'
+            ' ; ': '^k'
+          '^k':
+            '^e': ' : '
+          '^d':
+            '^e': ' : '
+          '^e':
+            '^d': ' = '
+            '^k': ' ; '
+          '*':
+            '^g': ' ; '
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -694,7 +710,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A224-1/isisdata/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -706,7 +722,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/A112-1/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -718,7 +734,7 @@ databases:
       name: libri
       type: isis
       path: '/backup/isis_backup/C107-9/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       normalize:
@@ -730,7 +746,7 @@ databases:
       name: knjige
       type: marc
       path: '/data/drustvene/efzg/unimarc.iso'
-      encoding: '852'
+      encoding: 'cp852'
       # CroList recoding pairs to fix encoding problems
       recode: 'ÏC È Ïc è ÂC Æ Âc æ ò ð ÏS © Ïs ¹ ÏZ ® Ïz ¾'
       lookup: 'conf/lookup/efzg.yml'
@@ -744,7 +760,7 @@ databases:
       name: bib
       type: isis
       path: '/data/drustvene/eizg/BIB'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/eizg.yml'
       #limit: 100
       normalize:
@@ -770,7 +786,7 @@ databases:
       name: knjige
       type: isis
       path: '/data/drustvene/irmo/LIBRI'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/eizg.yml'
       #limit: 10
       normalize:
@@ -796,7 +812,7 @@ databases:
       name: knjige
       type: isis
       path: '/data/drustvene/iztzg/BIB'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/eizg.yml'
       #limit: 10
       normalize:
@@ -808,7 +824,7 @@ databases:
       name: bib
       type: isis
       path: '/data/drustvene/jzav/BIB'
-      encoding: '852'
+      encoding: 'cp852'
       lookup: 'conf/lookup/jzav.yml'
       #limit: 10
       normalize:

diff --git a/conf/normalize/mapping.pl b/conf/normalize/mapping.pl
index d364deb..f8d1f74 100644 (file)
--- a/conf/normalize/mapping.pl
+++ b/conf/normalize/mapping.pl
@@ -84,7 +84,10 @@ marc_compose('245',
                        rec('200','a')
        ),
        'h', rec('200','b'),
-       'b', rec('200','k'),
+       'b', 
+               join_with(' ; ',
+                       rec('200','k'),
+               ),
        'b', rec('200','d'), 
        'b', 
                join_with(' : ',
@@ -368,71 +371,93 @@ marc('110','c',
 
 
 marc_indicators('740', 0, ' ');
+
+if ( ! rec('464') ) {
 marc('740','a',
        rec('200','c')
 );
 
+marc('740','a',
+       rec('200','k')
+);
 
-# vi¹erazinci 
-# 
-# if ( rec('230') ) {
-# 
-#      marc_duplicate();
-#      marc_remove('245');
-# 
-#      marc('245','a',
-#              rec('230','a')
-#      );
-# 
-#      if ( ! rec('230','a') ) {
-# 
-#              marc('245','a',
-#                      rec('200','a')
-#              );
-#      }
-# 
-#      marc('245','b',
-#              rec('230','e')
-#      );
-# 
-#      marc('245','c',
-#              rec('230','f')
-#      );
-# 
-#      marc('245','n',
-#              rec('230','v')
-#      );
-# 
-# }
-# 
-# if ( rec('231') ) {
-# 
-#      marc_duplicate();
-#      marc_remove('245');
-# 
-#      marc('245','a',
-#              rec('231','a')
-#      );
-# 
-#      if ( ! rec('231','a') ) {
-# 
-#              marc('245','a',
-#                      rec('200','a')
-#              );
-#      }
-# 
-#      marc('245','b',
-#              rec('231','e')
-#      );
-# 
-#      marc('245','c',
-#              rec('231','f')
-#      );
-# 
-#      marc('245','n',
-#              rec('231','v')
-#      );
-# 
-# }
+} else {
+marc('740','a',
+       rec('464','a')
+);
+};
+
+
+
+## vi¹erazinci 
+
+if ( rec('230') ) {
+
+       marc_duplicate();
+       
+       marc_remove('245');
+       marc_compose('245',
+       'a', suffix(
+               rec('200','b') ? '. '   :
+               rec('200','k') ? ' ; '  :
+               rec('200','d') ? ' = '  :
+               rec('200','e') ? ' : '  :
+               rec('200','f') ? ' / '  :
+                                '.',
+                       rec('230','a')
+       ),
+       'b', 
+               join_with(' ; ',
+                       rec('230','k'),
+               ),
+       'b', rec('230','d'), 
+       'b', 
+               join_with(' : ',
+                       rec('230','e'),
+               ),
+       'c', 
+               join_with(' ; ',
+                       rec('230','f'),
+               ),
+       );
+
+       marc_remove('260');
+       marc('260','c',
+               rec('250')
+       );
+
+       marc_remove('300');
+       marc('300','a',
+               rec('260')
+       );
+
+       marc_remove('490');
+       marc('490','a',
+               rec('270')
+       );
+
+       marc_remove('500');
+       marc('500','a',
+               rec('280')
+       );
+
+       marc_remove('020');
+       marc('020','a',
+               rec('290')
+       );
+
+       marc_indicators('774', 0, ' ');
+       marc('774','6',
+               join_with('',
+                       config(),
+                       rec('000')
+               )
+       );
+
+       marc('774','g',
+               rec('230','v')
+       );
+ 
+};
 
 }