--- branches/humanistika/import_xml/marc_zaki.xml	2004/03/12 16:13:12	269
+++ branches/humanistika/import_xml/marc_zaki.xml	2004/06/10 22:29:31	342
@@ -16,7 +16,10 @@
     <indexer>
 	<headline>
 		<marc type="display">200a : 200e / 200f, 210d</marc>
-		<config delimiter=" ---> lokacija: ">library</config>
+		<config>
+			<delimiter> ---> lokacija: </delimiter>
+			<value>library</value>
+		</config>
 	</headline>
 
 	<IdentificationNumbers name="ISN">
@@ -92,8 +95,14 @@
 	
 	<Note name="Napomena: " order="60">
 		<marc>326a</marc>
-		<marc delimiter=". - ">300a</marc>
-		<marc append="1" delimiter=". - ">320a</marc>
+		<marc>
+			<delimiter>. - </delimiter>
+			<value>300a</value>
+		</marc>
+		<marc append="1" >
+			<delimiter>. - </delimiter>
+			<value>320a</value>
+		</marc>
 		<marc type="index">300a</marc>
 		<marc type="index">320a</marc>
 	</Note>
@@ -132,7 +141,10 @@
 -->
 	<UncontrolledTerms name="Tema: " order="68">
 		<marc type="swish">610a 200a 200e 200k</marc> 
-		<marc type="display" delimiter=" * " format="upper">610a</marc>	
+		<marc type="display"  format="upper">
+			<delimiter> * </delimiter>
+			<value>610a</value>
+		</marc>	
 		<marc type="index">610a</marc>
 	</UncontrolledTerms>
 <!--
@@ -141,12 +153,13 @@
 		<marc type="index">330</marc>
 	</contents>
 
+-->
+
 	<UDC name="UDK: " order="80">
 		<marc>675a</marc>
 		<marc type="index">675a</marc>
 	</UDC>
 
--->
 	<Holdings name="Podaci o fondu: " order="83">
 		<marc delimeter=", ">999a</marc>
 	</Holdings>
@@ -167,12 +180,6 @@
 		<marc type="index">992a</marc>
 	</Location>
 
-	<library name="Knjižnica: " order="92">
-		<config>library</config>
-		<config type="display">library_url</config>
-		<config type="swish">library_code</config>
-	</library>
-
 	<id name="Identifikator sloga: " order="93">
 		<marc>001</marc>
 	</id>
@@ -183,16 +190,22 @@
 	</type>
 	
 
-	<library name="Knjižnica: " order="101">
+	<library name="Knjižnica: " order="100">
 		<config type="display">library</config>
-		<config type="display">library_url</config>
+		<config type="display" append="1">
+			<delimiter>, </delimiter>
+			<value>library_url</value>
+		</config>
 		<config type="swish">library_code</config>
 	</library>
 
 <!--
 	<invNo name="Inventarni broj: " order="95">
 		<marc type="swish">991a 991b</marc>
-		<marc type="display" delimiter=", ">991a 991b</marc> 
+		<marc type="display" >
+			<delimiter>, </delimiter>
+			<value>991a 991b</value>
+		</marc> 
 		<marc type="index">991a 991b</marc>
 	</invNo>
 -->