local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index 54d483d..7a830db 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -423,25 +423,31 @@ databases:
     input:
       - name: libri
         type: isis
-        path: '/home/mglavica/mnt/LIBRI/LIBRI'
-#        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: peri
+        type: isis
+        path: '/backup/isis_backup/A207-3/isisdata/latest/PERI/PERI'
+        encoding: 'cp852'
+        lookup: 'conf/lookup/ffkk-peri.yml'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/common.pl'
       - name: arti
         type: isis
-        path: '/home/mglavica/mnt/ARTI/ARTI'
-#        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
-        modify_records:
-          200:
-            '^f':
-              '; ': '^x'
+        modify_file: 'conf/modify/ffkk_arti.pl'
         normalize:
           path: 'conf/normalize/common.pl'
 
@@ -586,36 +592,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
-      modify_records:
-        200:
-          '^a':
-            ' : ': '^e'
-            ' = ': '^d'
-          '^k':
-            '^e': ' : '
-          '^d':
-            '^e': ' : '
-          '^e':
-            '^d': ' = '
-            '^k': ' ; '
-          '*':
-            '^g': ' ; '
-        210:
-          '^a':
-            '^c': '^b'
-          '^b':
-            ' ; ': '^a'
-            ' : ': '^b'
-            '^d': '^c'
-        700:
-          '^a':
-            '^b': ', '
-        701:
-          '^a':
-            '^b': ', '
-        702:
-          '^a':
-            '^b': ', '
+      modify_file: 'conf/modify/common.pl'
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -628,31 +605,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
-      modify_records:
-        200:
-          '^a':
-            ' ; ': '^k'
-          '^d':
-            '^e': ' : '
-          '^e':
-            '^d': ' = '
-          '*':
-            '^g': ' ; '
-        210:
-          '*':
-            '^c': '^b'
-            '^d': '^c'
-            '. (': '. (^e'
-            ' : ': ' :^f' 
-        700:
-          '^a':
-            '^b': ', '
-        701:
-          '^a':
-            '^b': ', '
-        702:
-          '^a':
-            '^b': ', '
+      modify_file: 'conf/modify/common.pl'
       normalize:
         path: 'conf/normalize/common.pl'
 

diff --git a/conf/validate/ffiz b/conf/validate/ffiz
index 1392479..4f4954c 100644 (file)
--- a/conf/validate/ffiz
+++ b/conf/validate/ffiz
@@ -3,7 +3,7 @@
 101 
 200 a d e* f g* k 
 205 a
-210 a* c d 
+210 a c d 
 215 a c d e
 225 a e h i v w
 230 a e f g v

diff --git a/conf/validate/ffkk b/conf/validate/ffkk
index 792d70d..4fc4352 100644 (file)
--- a/conf/validate/ffkk
+++ b/conf/validate/ffkk
@@ -1,7 +1,7 @@
 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
@@ -38,6 +38,7 @@
 320 
 327 
 330
+4
 423 a b c z
 464 a c f g x y
 532
@@ -49,9 +50,11 @@
 710 a b c d e f
 711 a b
 801 
+935
 990 
 991 
 994 a b c 
+995
 996
 998 a
 999 

diff --git a/conf/validate/ffsfb b/conf/validate/ffsfb
index 8e5d7e7..a99bf9b 100644 (file)
--- a/conf/validate/ffsfb
+++ b/conf/validate/ffsfb
@@ -1,7 +1,7 @@
 0
 10     
 101    
-200 a c d c e f g k 
+200 a c d c e* f g* k 
 205 a
 210 a c d 
 215 a c d e 

diff --git a/conf/validate/ffsfm b/conf/validate/ffsfm
index 13f3775..dcd805d 100644 (file)
--- a/conf/validate/ffsfm
+++ b/conf/validate/ffsfm
@@ -1,9 +1,9 @@
 0
 10     
 101    
-200 a c d e f g k
+200 a! c d e* f g* k
 205 a
-210 a c d
+210 a* c* d
 215 a c d e
 225 a e h i v w
 230 a e f v
@@ -37,7 +37,6 @@
 320
 327
 330
-423 z a b c
 464 a f c g x y
 503
 532
@@ -47,7 +46,7 @@
 701 a b c d
 702 a b c d e f
 710 a b c d e f 
-711 a b c f
+711 a b c e f
 801
 990    
 991