local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index 7a830db..f95f54c 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -403,6 +403,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
+      modify_file: 'conf/modify/common.pl'
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -496,7 +497,7 @@ databases:
       path: '/backup/isis_backup/A-201-1/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'
 
@@ -601,7 +602,8 @@ databases:
     input:
       name: libri
       type: isis
-      path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
+      path: '/data/isis_data/sfm/LIBRI/LIBRI'
+#      path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
@@ -645,6 +647,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #limit: 10
+      modify_file: 'conf/modify/common.pl'
       normalize:
         path: 'conf/normalize/common.pl'
 
@@ -657,6 +660,7 @@ databases:
       encoding: 'cp852'
       lookup: 'conf/lookup/isis_ffzg.yml'
       #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 7f53328..3371da1 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -9,6 +9,7 @@
     '^e' => ' : '
   '^d'
     '^e' => ' : '
+    '^k' => ' ; '
   '^e'
     '^d' => ' = '
     '^k' => ' ; '

diff --git a/conf/validate/fffi b/conf/validate/fffi
index 6cb9608..90946e2 100644 (file)
--- a/conf/validate/fffi
+++ b/conf/validate/fffi
@@ -1,31 +1,31 @@
 0 
 10 
 101 
-200 a b c d e f g j k v x
+200 a c d e f g k v x
 205 a 
-210 a b c d e g
-215 a c d e 
+210 a b c d
+215 a c d 
 220
 221
 222
 223
 225 a d e f h i v w 
-230 a c d e f g k v x y
-231 a d e f g k v x 
-232 a c e f g k v x y
+230 a d e f g k v 
+231 a d e f g k v 
+232 a e f g k v 
 233 a e f g k v 
 240 a
 241 a
 242 a
 243 a
 250 a c d
-251 a b c d
-252 a b c d
-253 a b c d  
-260 a c d e 
-261 a c d e 
-262 a c d e 
-263 a c d e 
+251 a c d
+252 a c d
+253 a c d  
+260 a c d 
+261 a c d 
+262 a c d 
+263 a c d 
 270 a d e f h i k v w x y z
 271 a d e f h i k v w x y z
 272 a d e f h i k v w x y z
@@ -46,13 +46,13 @@
 410 0
 423 a b c e z
 464 a c f g x y
-532 a b 
+532 a 
 610 
 675 a b c d
-700 a b 
-701 a b c d
-702 a b 4
-710 a b c d 
+700 4 a b 
+701 4 a b c d
+702 4 a b
+710 4 a b c d e f
 801 
 990 
 991 

diff --git a/conf/validate/ffps b/conf/validate/ffps
index 23ab66a..61a9b90 100644 (file)
--- a/conf/validate/ffps
+++ b/conf/validate/ffps
@@ -1,9 +1,9 @@
 0 
 10 
 101 
-200 a! b d e* f g* 
+200 a! b d e* f g* k 
 205 a!
-210 a c d 
+210 a* c* d 
 215 a c d e 
 225 a d e f h i v w x
 300 

diff --git a/conf/validate/fftu b/conf/validate/fftu
index b1c28d6..01ee583 100644 (file)
--- a/conf/validate/fftu
+++ b/conf/validate/fftu
@@ -1,10 +1,10 @@
 0 
 10 
 101 
-200 a b c d e f g k
+200 a c d e f g k
 205 a 
 210 a c d 
-215 a c d 
+215 a c d e
 225 a e h i v w
 230 a e f v
 231 a e f v
@@ -41,7 +41,7 @@
 464 a c f g x y
 532
 610 
-675 a b c 
+675 a b c d 
 700 a b 
 701 a b c d
 702 a b