--- trunk/conf/mjesec.yml	2006/10/25 11:02:36	758
+++ trunk/conf/mjesec.yml	2006/11/03 20:41:12	773
@@ -226,9 +226,7 @@
         credit: 10000
       - to: ffsk
         credit: 10000
-      - to: ffsfb
-        credit: 10000
-      - to: ffsfm
+      - to: ffsf
         credit: 10000
       - to: ffso 
         credit: 10000
@@ -316,14 +314,22 @@
   ffar:
     name: 'Arheologija, Filozofski fakultet u Zagrebu'
     input:
-      name: libri
-      type: isis
-      path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/ff-libri.pl'
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
+      - name: peri
+        type: isis
+        path: '/backup/isis_backup/A018-2/isisdata/latest/PERI/PERI'
+        encoding: 'cp852'
+        #limit: 10
+        #modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
 
   ffet:
     name: 'Etnologija, Filozofski fakultet u Zagrebu'
@@ -359,7 +365,7 @@
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          path: 'conf/normalize/minimal.pl'
       - name: arti
         type: isis
         path: '/backup/isis_backup/novi-40162/ISISDATA/latest/ARTI/ARTI'
@@ -429,7 +435,7 @@
         #limit: 10
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          path: 'conf/normalize/minimal.pl'
       - name: peri
         type: isis
         path: '/backup/isis_backup/A207-3/isisdata/latest/PERI/PERI'
@@ -458,7 +464,7 @@
       #limit: 10
       modify_file: 'conf/modify/common.pl'
       normalize:
-        path: 'conf/normalize/ff-libri.pl'
+        path: 'conf/normalize/minimal.pl'
 
   fftu:
     name: 'Turkologija, Filozofski fakultet u Zagrebu'
@@ -552,12 +558,6 @@
         # modify_file: 'conf/modify/common.pl'
         normalize:
           path: 'conf/normalize/ff-peri.pl'
-      - name: baza
-        type: marc
-        path: '/backup/data/NSK/BBaza.ISO'
-        encoding: 'ISO-8859-2'
-        normalize:
-          path: 'conf/normalize/marc-nsk.pl'
 
   ffro:
     name: 'Romanistika, Filozofski fakultet u Zagrebu'
@@ -583,31 +583,35 @@
       normalize:
         path: 'conf/normalize/minimal.pl'
 
-  ffsfb:
-    name: 'Slavenska filologija (B), Filozofski fakulteti u Zagrebu'
-    input:
-      name: libri
-      type: isis
-#      path: '/data/isis_data/sfb/LIBRI/LIBRI'
-      path: '/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/minimal.pl'
-
-  ffsfm:
-    name: 'Slavenska filologija (M), Filozofski fakulteti u Zagrebu'
+  ffsf:
+    name: 'Slavenska filologija, Filozofski fakulteti u Zagrebu'
     input:
-      name: libri
-      type: isis
-      path: '/data/isis_data/sfm/LIBRI/LIBRI'
-#     path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
-      encoding: 'cp852'
-      #limit: 10
-      modify_file: 'conf/modify/common.pl'
-      normalize:
-        path: 'conf/normalize/minimal.pl'
+      - name: blibri
+        type: isis
+#       path: '/data/isis_data/sfb/LIBRI/LIBRI'
+        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-libri.pl'
+      - name: mlibri
+        type: isis
+        path: '/data/isis_data/sfm/LIBRI/LIBRI'
+#       path: '/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
+      - name: peri
+        type: isis
+        path: '/backup/isis_backup/A125-2/ISISDATA/latest/PERI/PERI'
+        encoding: 'cp852'
+        #limit: 10
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/minimal.pl'
 
   ffso:
     name: 'Sociologija, Filozofski fakultet u Zagrebu'
@@ -780,12 +784,18 @@
           path: 'conf/normalize/marc-cufts.pl'
       - name: licenced
         type: excel
-        path: '/data/FF/wiley/w2.xls'
-        worksheet: 'Sheet1'
-        from: 0
+        path: '/data/FF/wiley/wiley_casopisi2006.xls'
+        worksheet: 'licenced'
+        from: 1
         encoding: 'windows-1250'
         normalize:
           path: 'conf/normalize/excel-wiley.pl'
+      - name: nourl
+        type: marc
+        path: '/data/webpac2/out/marc/wiley-licenced.marc'
+        encoding: 'UTF-8'
+        normalize:
+          path: 'conf/normalize/marc-wiley-nourl.pl'
 #      - name: licenced
 #        type: marc
 #        path: '/data/FF/wiley/wiley-licenced.marc'
@@ -793,13 +803,13 @@
 #        normalize:
 #          path: 'conf/normalize/common.pl'
 
-#  nsk:
-#    name: 'Nacionalna i sveucilisna knjiznica'
-#    input:
-#      name: baza
-#      type: marc
-#      path: '/backup/data/NSK/BBaza.ISO'
-#      encoding: 'ISO-8859-2'
-#      normalize:
-#        path: 'conf/normalize/marc-nsk.pl'
+  nsk:
+    name: 'Nacionalna i sveucilisna knjiznica'
+    input:
+      name: baza
+      type: marc
+      path: '/backup/data/NSK/BBaza.ISO'
+      encoding: 'ISO-8859-2'
+      normalize:
+        path: 'conf/normalize/marc-nsk.pl'