--- branches/ecas/all2xml.conf	2007/08/23 22:32:17	767
+++ branches/ecas/all2xml.conf	2007/08/23 22:32:18	768
@@ -1,9 +1,8 @@
-
 ## E-časopisi
 
 [blackwell]
 	type=marc_cufts
-	marc_file=/data/FF/blackwell/blackwell2.mrc
+	marc_file=/data/FF/ecasopisi/blackwell/blackwell2.mrc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
@@ -12,7 +11,7 @@
 
 [cambridge]
 	type=marc_cufts
-	marc_file=/data/FF/cambridge/cambridge.mrc
+	marc_file=/data/FF/ecasopisi/cambridge/cambridge.mrc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
@@ -20,7 +19,7 @@
 	dbcode=cambridge
 
 [doaj]
-	excel_file=/data/FF/doaj/doaj2csv.xls
+	excel_file=/data/FF/ecasopisi/doaj/doaj2csv.xls
 	type=excel_doaj
 	materialtype=E-časopis
 	material_code=ec
@@ -30,33 +29,69 @@
 
 [ebsco-aph-ft]
 	type=marc_ebsco
-	marc_file=/data/FF/ebsco-marc/aph-ft.marc
+	marc_file=/data/FF/ecasopisi/ebsco-marc/aph-ft.marc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
-	database=EBSCO Academic Search Premier
-	dbcode=aph_ft
+	database=EBSCO - Academic Search Premier
+	dbcode=aph
 
-[ebsco-buh-ft]
+[ebsco-bth-ft]
 	type=marc_ebsco
-	marc_file=/data/FF/ebsco-marc/buh-ft.marc
+	marc_file=/data/FF/ecasopisi/ebsco-marc/bth-ft.marc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
-	database=EBSCO Business Source Premier
-	dbcode=buh_ft
+	database=EBSCO - Business Source Complete
+	dbcode=bth
+
+[ebsco-c8h-ft]
+	type=marc_ebsco
+	marc_file=/data/FF/ecasopisi/ebsco-marc/c8h-ft.marc
+	materialtype=E-časopis
+	material_code=ec
+	material_form=Elektronička građa
+	database=EBSCO - CINAHL with Full Text
+	dbcode=c8h
+
+[ebsco-hxh-ft]
+	type=marc_ebsco
+	marc_file=/data/FF/ecasopisi/ebsco-marc/hxh-ft.marc
+	materialtype=E-časopis
+	material_code=ec
+	material_form=Elektronička građa
+	database=EBSCO - Health Source - Consumer Edition
+	dbcode=hxh
+
+[ebsco-hch-ft]
+	type=marc_ebsco
+	marc_file=/data/FF/ecasopisi/ebsco-marc/hch-ft.marc
+	materialtype=E-časopis
+	material_code=ec
+	material_form=Elektronička građa
+	database=EBSCO - Health Source: Nursing/Academic Edition
+	dbcode=hch
 
 [ebsco-f5h-ft]
 	type=marc_ebsco
-	marc_file=/data/FF/ebsco-marc/f5h-ft.marc
+	marc_file=/data/FF/ecasopisi/ebsco-marc/f5h-ft.marc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
-	database=EBSCO MasterFILE Premier
-	dbcode=f5h_ft
-	
+	database=EBSCO - MasterFILE Premier
+	dbcode=f5h
+
+[ebsco-sih-ft]
+	type=marc_ebsco
+	marc_file=/data/FF/ecasopisi/ebsco-marc/sih-ft.marc
+	materialtype=E-časopis
+	material_code=ec
+	material_form=Elektronička građa
+	database=EBSCO - SocINDEX with Full Text
+	dbcode=sih
+
 [emerald]
-	excel_file=/data/FF/emerald/persistenturls.xls
+	excel_file=/data/FF/ecasopisi/emerald/persistenturls.xls
 	type=excel_emerald
 	materialtype=E-časopis
 	material_code=ec
@@ -67,7 +102,7 @@
 
 [oxford]
 	type=marc_cufts
-	marc_file=/data/FF/oxford/oxford.mrc
+	marc_file=/data/FF/ecasopisi/oxford/oxford.mrc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
@@ -75,7 +110,7 @@
 	dbcode=oxford
 	
 [muse]
-	excel_file=/data/FF/muse/muse-premium.xls
+	excel_file=/data/FF/ecasopisi/muse/project_muse_holdings.xls
 	type=excel_muse
 	materialtype=E-časopis
 	material_code=ec
@@ -85,7 +120,7 @@
 
 [pubmed]
 	type=excel_pubmed
-	excel_file=/data/FF/pubmed/jlist.xls
+	excel_file=/data/FF/ecasopisi/pubmed/jlist.xls
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
@@ -93,7 +128,7 @@
 	dbcode=pubmed
 	
 [sage]
-	excel_file=/data/FF/sage/sage.xls
+	excel_file=/data/FF/ecasopisi/sage/sage.xls
 	type=excel_sage
 	materialtype=E-časopis
 	material_code=ec
@@ -102,7 +137,7 @@
 	dbcode=sage
 
 [sciencedirect]
-	excel_file=/data/FF/sd/SD-Holdings.xls
+	excel_file=/data/FF/ecasopisi/sd/SD-Holdings.xls
 	type=excel_sd
 	materialtype=E-časopis
 	material_code=ec
@@ -112,7 +147,7 @@
 	
 [springer]
 	type=marc_cufts
-	marc_file=/data/FF/springer/springer.mrc
+	marc_file=/data/FF/ecasopisi/springer/springer.mrc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
@@ -120,12 +155,11 @@
 	dbcode=springer
 	
 [wiley]
-	type=marc_cufts
-	marc_file=/data/FF/wiley/wiley.mrc
+	type=marc_wiley
+	marc_file=/data/FF/ecasopisi/wiley/wiley-licenced.marc
 	materialtype=E-časopis
 	material_code=ec
 	material_form=Elektronička građa
 	database=Wiley InterScience
 	dbcode=wiley
 	
-