local

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

diff --git a/conf/lookup/ffkk-arti.pl b/conf/lookup/ffkk-arti.pl
index f81d60c..06a5e7a 100644 (file)
--- a/conf/lookup/ffkk-arti.pl
+++ b/conf/lookup/ffkk-arti.pl
@@ -1,27 +1,22 @@
 
-marc('777','v',
+marc('777','w',
        lookup(
-               sub { 'ffkk/peri' . rec('000') },
+               sub { 'ffkk/peri/mfn' . rec('000') },
                'ffkk','peri',
                sub { rec('11') }
        ) ||
        lookup(
-               sub { 'ffkk/peri' . rec('000') },
+               sub { 'ffkk/peri/mfn' . rec('000') },
                'ffkk','peri',
                sub { first(rec(200,'a')) . ' ' . first(rec('200','e')) },
        ) ||
+
        lookup(
                sub { "ffkk/peri" . rec('000') },
                'ffkk','peri',
                sub { rec(200,'a') },
-               sub { rec(900,'x') },
+#              sub { rec(900,'x') },
        )
-);
 
-marc('900','x',
-       lookup(
-               sub { first(rec('200','a')) . ' ' . first(rec('200','b')) },
-               'ffps','libri',
-               sub { rec('245','a') },
-       )
 );
+

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index f95f54c..f0aba63 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -310,6 +310,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis.pm'
       #limit: 10
+      modify_file: 'conf/modify/common.pl'
       normalize:
         path: 'conf/normalize/common.pl'
 

diff --git a/conf/modify/common.pl b/conf/modify/common.pl
index 3371da1..fcee372 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -15,20 +15,62 @@
     '^k' => ' ; '
   '*'
     '^g' => ' ; '
+
 210
   '^a'
-    '^c' => '^b'
-  '^b'
     ' ; ' => '^a'
-    ' : ' => '^b'
+    ' ; ' => '^a'
+# ovo provjeriti - ima na lingvistici:
+    ' : ' => '^a'
+  '^c'
+    ' : ' => '^c'
+  '*'
+    '^c' => '^b'
     '^d' => '^c'
-  '*':
-    '. (': '. (^e'
-  '^e':
-    ' : ': ' ^f'
+  '^a'
+    '^a' => ' ; ^x'
+    '^c' => ', ^c'
+  '^x'
+    '^a' => ' ; ^x'
+  '^b'
+    '^a' => ' ; ^x'
+    '^a' => ' ; ^x'
+    '^c' => ', ^c'
+  '*'
+    '^x' => '^a'
+    '^y' => '^a'
+
+225
+  '*'
+    '^d' => ' = '
+    '^e' => ' : '
+    '^f' => ' \/ '
+    '^h' => '. '
+    '^i' => '. '
+
+#330
+#  '*'
+#    '><' => '^a'
+#    '<' => '^a'
+#    '>' => ''
+#  '^a'
+#    '^a' => '^b'
+#  '^b'
+#   '^a' => '^c'
+#  '^c'
+#    '^a' => '^d'
+#  '^d'
+#    '^a' => '^e'
+#  '^e'
+#    '^a' => '^f'
+#  '^f'
+#    '^a' => '^g'
+  
+
 700
   '^a'
     '^b' => ', '
+
 701
   '^a'
     '^b' => ', '

diff --git a/conf/normalize/mapping.pl b/conf/normalize/mapping.pl
index f8d1f74..7242cea 100644 (file)
--- a/conf/normalize/mapping.pl
+++ b/conf/normalize/mapping.pl
@@ -63,13 +63,19 @@ if (rec('300') && first(rec('300')) =~ m/prijevod/i) {
        marc_indicators('041', 1, ' ');
 } else {
        marc_indicators('041', 0, ' ');
-}
+};
 
 marc_repeatable_subfield('041','a',
        rec('101')
 );
 
-marc_indicators('245', 0, 0);
+# marc_indicators('245', 0, 0);
+
+if ( rec('700') ) {
+       marc_indicators('245', 1, 0);
+} else {
+       marc_indicators('245', 0, 0);
+};
 
 #_debug(3);