local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index 3c064b3..54d483d 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -423,15 +423,18 @@ databases:
     input:
       - name: libri
         type: isis
-        path: '/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI'
+        path: '/home/mglavica/mnt/LIBRI/LIBRI'
+#        path: '/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI'
         encoding: 'cp852'
         lookup: 'conf/lookup/isis_ffzg.yml'
         #limit: 10
+        modify_file: 'conf/modify/common.pl'
         normalize:
           path: 'conf/normalize/common.pl'
       - name: arti
         type: isis
-        path: '/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI'
+        path: '/home/mglavica/mnt/ARTI/ARTI'
+#        path: '/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI'
         encoding: 'cp852'
         lookup: 'conf/lookup/isis_ffzg.yml'
         #limit: 10
@@ -452,37 +455,6 @@ databases:
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
       modify_file: 'conf/modify/common.pl'
-      modify_records:
-        200:
-          '^k':
-            '^e': ' : '
-          '^d':
-            '^e': ' : '
-          '^e':
-            '^d': ' = '
-            '^k': ' ; '
-          '*':
-            '^g': ' ; '
-          '^a':
-            ' : ': '^e'
-            ' = ': '^d'
-            ' ; ': '^k'
-        210:
-          '^a':
-            '^c': '^b'
-          '^b':
-            ' ; ': '^a'
-            ' : ': '^b'
-            '^d': '^c'
-        700:
-          '^a':
-            '^b': ', '
-        701:
-          '^a':
-            '^b': ', '
-        702:
-          '^a':
-            '^b': ', '
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -560,34 +532,8 @@ databases:
         # limit number of records to read from database
         #limit: 10
 
-        modify_records:
-          200:
-            '^d':
-              '^e': ' : '
-            '^e':
-              '^d': ' = '
-            '*':
-              '^g': ' ; '
-              '^c': '. '
-          210:
-            '^a':
-              '^c': '^b'
-            '^b':
-              ' : ': '^b' 
-              '^d': '^c'
-            '*':
-              '. (': '. (^e'
-            '^e':
-              ' : ': ' ^f'
-          700:
-            '^a':
-              '^b': ', '
-          701:
-            '^a':
-              '^b': ', '
-          702:
-            '^a':
-              '^b': ', '
+        modify_file: 'conf/modify/common.pl'
+        
         # define normalisation for that source
         normalize:
           # which tag to use in normalize xml for data?

diff --git a/conf/modify/common.pl b/conf/modify/common.pl
index 06cb4dc..7f53328 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -4,6 +4,7 @@
   '^a'
     ' : ' => '^e'
     ' = ' => '^d'
+    ' ; ' => '^k'
   '^k'
     '^e' => ' : '
   '^d'
@@ -20,6 +21,10 @@
     ' ; ' => '^a'
     ' : ' => '^b'
     '^d' => '^c'
+  '*':
+    '. (': '. (^e'
+  '^e':
+    ' : ': ' ^f'
 700
   '^a'
     '^b' => ', '

diff --git a/conf/validate/ffkk b/conf/validate/ffkk
index d6cf325..792d70d 100644 (file)
--- a/conf/validate/ffkk
+++ b/conf/validate/ffkk
@@ -1,11 +1,11 @@
 0 
 10 
 101 
-200! a! c d e* f g k x y
+200! a! c d e* f g* k x y
 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 v
 231 a e f v
 232 a e f v
@@ -53,5 +53,5 @@
 991 
 994 a b c 
 996
-998
+998 a
 999 

diff --git a/conf/validate/ffkkarti b/conf/validate/ffkkarti
index c4f5c42..85584ab 100644 (file)
--- a/conf/validate/ffkkarti
+++ b/conf/validate/ffkkarti
@@ -3,7 +3,7 @@
 11
 200! a! c d e f g*
 203 a! d* e* f g
-205 a
+205 
 210 a c d
 216
 329 

diff --git a/conf/validate/fflo b/conf/validate/fflo
index abdf94f..a704241 100644 (file)
--- a/conf/validate/fflo
+++ b/conf/validate/fflo
@@ -1,7 +1,7 @@
 0 
 10 
 101 
-200! a! b c d e* f g* k
+200 a! b c d e* f g* k
 205 a! f 
 210 a* c* d 
 215 a c d e
@@ -38,6 +38,8 @@
 320 
 327 
 330 
+423 a b z
+464 a c f g x
 532
 610 
 675 a b c d e