--- branches/tehnika/import_xml/marc_crolist.xml	2004/03/12 15:44:03	266
+++ branches/tehnika/import_xml/marc_crolist.xml	2004/06/10 22:22:54	341
@@ -13,11 +13,32 @@
 	<marc type="swish|display|index">_pre_000x_sep_000x_sep_000x_post_</marc>
 	<config type="swish|display">name of var from config file</config>
 -->
+	
+	<format name="PersonalName"><![CDATA[
+		<a href="?rm=results&show_full=1&f=PersonalName&v=%s">%s</a>
+	]]></format>
+
+
+	<format name="UncontrolledTerms"><![CDATA[
+		<a href="?rm=results&show_full=1&f=UncontrolledTerms&v=%s">%s</a>
+	]]></format>
+
+	<format name="Publisher"><![CDATA[
+		<a href="?rm=results&show_full=1&f=Publisher&v=%s">%s</a>
+	]]></format>
+
+
     <indexer>
 	<headline>
 		<marc type="display" filter="croascii">200a : 200e / 200f, 210d</marc>
-		<config append="1" delimiter=" --- ">materialtype</config>
-		<config delimiter=" u knjižnici: ">library</config>
+		<config append="1" >
+			<delimiter> --- </delimiter>
+			<value>materialtype</value>
+		</config>
+		<config append="1" >
+			<delimiter> u knjižnici: </delimiter>
+			<value>library</value>
+		</config>
 	</headline>
 
 	<IdentificationNumbers name="ISN">
@@ -35,8 +56,8 @@
 	</ISSN>
 		
 	<PersonalName name="Autor: " order="15">
-		<marc type="swish" filter="croascii">700a 700a 701a 701b 702a 702b 710a 200f 200g</marc>
-		<marc type="display" filter="croascii">700a, 700b</marc>
+		<marc type="swish" filter="croascii">700a 700b 701a 701b 702a 702b 710a 200f 200g</marc>
+		<marc type="display" filter="croascii" format_name="PersonalName" format_delimiter=";;">700a 700b;;700a, 700b</marc>
 		<marc type="display" filter="croascii">710a. 710b</marc>
 		<marc type="display" filter="croascii" append="1">(710d ; 710f ; 710e)</marc>
 		<marc type="index" filter="croascii">700a, 700b</marc>
@@ -73,7 +94,15 @@
 	</Publisher>
 
 	<Publication name="Impresum: " order="40">
-		<marc type="display" filter="croascii">210a : 210c, 210d</marc>
+		<marc type="display" filter="croascii">210a</marc>
+		<marc type="display" filter="croascii" append="1" format_name="Publisher" format_delimiter=";;" >
+			<delimiter> : </delimiter>
+			<value>210c;;210c</value>
+		</marc>
+		<marc type="display" append="1">
+			<delimiter>, </delimiter>
+			<value>210d</value>
+		</marc>
 	</Publication>
 	
 	<PhisicalDescription name="Materijalni opisi: " order="45">
@@ -95,8 +124,14 @@
 	
 	<Note name="Napomena: " order="60">
 		<marc filter="croascii">326a</marc>
-		<marc delimiter=". - " filter="croascii">300a</marc>
-		<marc filter="croascii" append="1" delimiter=". - ">320a</marc>
+		<marc  filter="croascii">
+			<delimiter>. - </delimiter>
+			<value>300a</value>
+		</marc>
+		<marc filter="croascii" append="1" >
+			<delimiter>. - </delimiter>
+			<value>320a</value>
+		</marc>
 		<marc type="index" filter="croascii">300a</marc>
 		<marc type="index" filter="croascii">320a</marc>
 	</Note>
@@ -133,7 +168,10 @@
 
 	<UncontrolledTerms name="Tema: " order="68">
 		<marc type="swish" filter="croascii">610a 200a 200e 200k</marc> 
-		<marc type="display" filter="croascii" delimiter=" * " format="upper">610a</marc>	
+		<marc type="display" filter="croascii" format_name="UncontrolledTerms" format_delimiter=";;"  format="upper">
+			<delimiter> * </delimiter>
+			<value>610a;;610a</value>
+		</marc>	
 		<marc type="index" filter="croascii">610a</marc>
 	</UncontrolledTerms>
 <!--
@@ -163,7 +201,7 @@
 		<marc type="index" filter="croascii">992a</marc>
 	</Location>
 
-	<id name="Identifikator sloga: " order="93">
+	<id name="ID: " order="93">
 		<marc>001</marc>
 	</id>
 
@@ -174,14 +212,21 @@
 
 	<library name="Knjižnica: " type="display" order="101">
 		<!-- added via library tag in .conf -->
-		<config>library</config>
-		<config>library_url</config>
+		<config type="display">library</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" filter="croascii">991a 991b</marc>
-		<marc type="display" filter="croascii" delimiter=", ">991a 991b</marc> 
+		<marc type="display" filter="croascii" >
+			<delimiter>, </delimiter>
+			<value>991a 991b</value>
+		</marc> 
 		<marc type="index" filter="croascii">991a 991b</marc>
 	</invNo>