--- trunk/conf/mjesec.yml	2006/11/03 20:41:12	773
+++ trunk/conf/mjesec.yml	2006/12/06 23:42:20	783
@@ -483,7 +483,7 @@
     input:
       name: libri
       type: isis
-      path: '/backup/isis_backup/A226-1/isisdata/latest/LIBRI/LIBRI'
+      path: '/backup/isis_backup/novi-40163/isisdata/latest/LIBRI/LIBRI'
       encoding: 'cp852'
       #limit: 10
       modify_file: 'conf/modify/common.pl'
@@ -594,7 +594,24 @@
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-nakladnicka.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+      - name: nakl
+        type: isis
+        path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/ff-nakladnicka.pl'
+      - name: series
+        type: marc
+        path: '/data/webpac2/out/marc/ffsf-nakl.marc'
+        encoding: 'UTF-8'
+        #limit: 10
+#       modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/ff-nakladnicka2.pl'
       - name: mlibri
         type: isis
         path: '/data/isis_data/sfm/LIBRI/LIBRI'
@@ -603,7 +620,7 @@
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/minimal.pl'
+          path: 'conf/normalize/ff-libri.pl'
       - name: peri
         type: isis
         path: '/backup/isis_backup/A125-2/ISISDATA/latest/PERI/PERI'
@@ -777,17 +794,19 @@
     name: 'Wiley Intescience Full'
     input:
       - name: full
-        type: marc
-        path: '/data/FF/wiley/wiley2.mrc'
+        type: excel
+        path: '/data/FF/wiley/all_wiley_interscience_journals_2007.xls'
+        worksheet: 'All Wiley Journals 2007'
+        from: 1
         encoding: 'UTF-8'
         normalize:
-          path: 'conf/normalize/marc-cufts.pl'
+          path: 'conf/normalize/excel-wiley-minimal.pl'
       - name: licenced
         type: excel
         path: '/data/FF/wiley/wiley_casopisi2006.xls'
-        worksheet: 'licenced'
+        worksheet: 'carnet'
         from: 1
-        encoding: 'windows-1250'
+        encoding: 'UTF-8'
         normalize:
           path: 'conf/normalize/excel-wiley.pl'
       - name: nourl