--- branches/fsb.pre-import/all2xml.conf	2004/04/17 20:56:56	306
+++ branches/fsb/all2xml.conf	2005/03/12 20:47:46	694
@@ -7,85 +7,116 @@
 	type=marc_crolist
 	library=Fakultet strojarstva i brodogradnje - Knjižnica
 	library_url=http://www.fsb.hr/library/
-	materialtype=Tiskana
+	library_code=fsb
+	material_form=Tiskana građa
 
 [fsb-crolist2]
 	marc_file=/data/fsb/disk2/UNIMARC.ISO
 	type=marc_crolist
 	library=Fakultet strojarstva i brodogradnje - Knjižnica
 	library_url=http://www.fsb.hr/library/
-	materialtype=Tiskana
+	library_code=fsb
+	material_form=Tiskana građa
 
 [fsb-crolist3]
 	marc_file=/data/fsb/disk3/UNIMARC.ISO
 	type=marc_crolist
 	library=Fakultet strojarstva i brodogradnje - Knjižnica
 	library_url=http://www.fsb.hr/library/
-	materialtype=Tiskana
+	library_code=fsb
+	material_form=Tiskana građa
 
 [fsb-crolist4]
  	marc_file=/data/fsb/disk4/UNIMARC.ISO
  	type=marc_crolist
  	library=Fakultet strojarstva i brodogradnje - Knjižnica
  	library_url=http://www.fsb.hr/library/
-	materialtype=Tiskana
+	library_code=fsb
+	material_form=Tiskana građa
 
- [fsb-crolist5]
+[fsb-crolist5]
  	marc_file=/data/fsb/disk5/UNIMARC.ISO
  	type=marc_crolist
  	library=Fakultet strojarstva i brodogradnje - Knjižnica
  	library_url=http://www.fsb.hr/library/
-	materialtype=Tiskana
+	library_code=fsb
+	material_form=Tiskana građa
 
-#[fsb-crolist6]
-# 	marc_file=/data/fsb/disk6/UNIMARC.ISO
-# 	type=marc_crolist
-# 	library=Fakultet strojarstva i brodogradnje - Knjižnica
-# 	library_url=http://www.fsb.hr/library/
-#	materialtype=Tiskana
-
-#[fsb-crolist7]
-# 	marc_file=/data/fsb/disk7/UNIMARC.ISO
-# 	type=marc_crolist
-# 	library=Fakultet strojarstva i brodogradnje - Knjižnica
-# 	library_url=http://www.fsb.hr/library/
-#	materialtype=Tiskana
+[fsb-crolist6]
+ 	marc_file=/data/fsb/disk6/UNIMARC.ISO
+ 	type=marc_crolist
+ 	library=Fakultet strojarstva i brodogradnje - Knjižnica
+ 	library_url=http://www.fsb.hr/library/
+	library_code=fsb
+	material_form=Tiskana građa
+
+[fsb-crolist7]
+ 	marc_file=/data/fsb/disk7/UNIMARC.ISO
+ 	type=marc_crolist
+ 	library=Fakultet strojarstva i brodogradnje - Knjižnica
+ 	library_url=http://www.fsb.hr/library/
+	library_code=fsb
+	material_form=Tiskana građa
 
 
 ### ScienceDirect ###
 
-[sciencedirect]
-	type=feed_sciencedirect
-	materialtype=Elektronički časopis
-	databasename=ScienceDirect
+#[sciencedirect]
+#	type=feed_sciencedirect
+#	material_form=Elektronički časopis
+#	material_code=ecas
+#	database=ScienceDirect
 
 
 ### EBSCO ###
 
+
 [ebsco-aph-ft]
 	type=marc_ebsco
 	marc_file=/data/isis_data/ebsco-marc/aph-ft.marc
-	materialtype=Elektronički časopis
+	materialtype=E-časopis
+	material_code=ecas
+	material_form=Elektronička građa
+	database=EBSCO Academic Search Premier
 
 [ebsco-buh-ft]
 	type=marc_ebsco
 	marc_file=/data/isis_data/ebsco-marc/buh-ft.marc
-	materialtype=Elektronički časopis
+	materialtype=E-časopis
+	material_code=ecas
+	material_form=Elektronička građa
+	database=EBSCO Business Source Premier
 
 [ebsco-f5h-ft]
 	type=marc_ebsco
 	marc_file=/data/isis_data/ebsco-marc/f5h-ft.marc
-	materialtype=Elektronički časopis
+	materialtype=E-časopis
+	material_code=ecas
+	material_form=Elektronička građa
+	database=EBSCO MasterFILE Premier
 
 [ebsco-hch-ft]
 	type=marc_ebsco
 	marc_file=/data/isis_data/ebsco-marc/hch-ft.marc
-	materialtype=Elektronički časopis
+	materialtype=E-časopis
+	material_code=ecas
+	material_form=Elektronička građa
+	database=EBSCO Health Source: Nursing/Academic Edition
 
-[ebsco-hph-ft]
+[ebsco-hxh-ft]
 	type=marc_ebsco
-	marc_file=/data/isis_data/ebsco-marc/hph-ft.marc
-	materialtype=Elektronički časopis
-
+	marc_file=/data/isis_data/ebsco-marc/hxh-ft.marc
+	materialtype=E-časopis
+	material_code=ecas
+	material_form=Elektronička građa
+	database=EBSCO Health Source - Consumer Edition
+
+#[ebsco-ufh-ft]
+#	type=marc_ebsco
+#	marc_file=/data/isis_data/ebsco-marc/ufh-ft.marc
+#	materialtype=E-časopis
+#	material_code=ecas
+#	material_form=Elektronička građa
+#	database=EBSCO Communication & Mass Media Complete