--- trunk/import_xml/isis.xml	2004/02/08 15:15:54	221
+++ branches/humanistika/import_xml/isis.xml	2004/03/14 19:44:57	286
@@ -13,29 +13,13 @@
 	<isis type="swish|display|index">_pre_000x_sep_000x_sep_000x_post_</isis>
 	<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="Publisher"><![CDATA[
-		<a href="?rm=results&show_full=1&f=Publisher&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="UDC"><![CDATA[
-		<a href="?rm=results&show_full=1&f=UDC&v=%s">%s</a>
-	]]></format>
-	
     <indexer>
 	<headline>
 		<isis type="display">200a : 200e / 200f, 210d</isis>
-		<config delimiter=" ---> ">materialtype</config>
-		<config delimiter=" u knjižnici: ">library</config>
+		<config>
+			<delimiter> ---> lokacija: </delimiter>
+			<value>library</value>
+		</config>
 	</headline>
 
 	<IdentificationNumbers name="ISN">
@@ -59,8 +43,8 @@
 		
 	<PersonalName name="Autor: " order="15">
 		<isis type="swish">700 701 702 710 711 503 200f 200g</isis>
-		<isis type="display" format_name="PersonalName" format_delimiter=";;">700a 700b;;700a, 700b</isis>
-		<isis type="display" format_name="PersonalName" format_delimiter=";;">710a 710b;;710a. 710b</isis>
+		<isis type="display">700a, 700b</isis>
+		<isis type="display">710a. 710b</isis>
 		<isis type="display" append="1">(710d ; 710f ; 710e)</isis>
 		<isis type="display">503a, 503b</isis>
 		<isis type="index">700a, 700b</isis>
@@ -73,7 +57,6 @@
 	<TitleAndResponsibility name="Naslov: " order="20">
 		<isis>200a : 200e ; 200k</isis>
 		<isis type="swish">200d 200c</isis>
-		<isis type="swish">200a 200e 200k 200d 200c</isis>
 		<isis type="swish">225a</isis>
 		<isis type="swish">230a 230e 231a 231e 232a 232e 233a 233e</isis>
 		<isis type="swish">270 271 271 273</isis>
@@ -82,9 +65,7 @@
 		<isis type="swish">203</isis>
 		<isis append="1" type="display"> = 200d</isis>
 		<isis append="1" type="display">/ 200f ; 200g. 200c</isis>
-		<isis type="index">200a : 200e</isis>
-		<isis type="swish_exact">200a : 200e</isis>
-
+		<isis type="index">200a</isis>
 	</TitleAndResponsibility>
 
 	<EditionStatement name="Izdanje: " order="25">
@@ -96,14 +77,12 @@
 	</Date>
 
 	<Publisher name="Izdavač: " order="35">
-		<isis type="swish">210c</isis>
-		<isis type="index">210c</isis>
+		<isis type="swish">210a 210c</isis>
+		<isis type="index">210c, 210a</isis>
 	</Publisher>
 
 	<Publication name="Impresum: " order="40">
-		<isis type="display">210a</isis>
-		<isis type="display" append="1" delimiter=" : " format_name="Publisher" format_delimiter=";;">210c;;210c</isis>
-		<isis type="display" append="1" delimiter=", "> 210d</isis>
+		<isis type="display">210a : 210c, 210d</isis>
 	</Publication>
 	
 	<PhisicalDescription name="Materijalni opisi: " order="45">
@@ -124,7 +103,10 @@
 	
 	<Note name="Napomena: " order="60">
 		<isis>326</isis>
-		<isis append="1" delimiter=". - ">300</isis>
+		<isis>
+			<delimiter>. - </delimiter>
+			<value>300</value>
+		</isis>
 		<isis append="1" delimiter=". - ">320</isis>
 		<isis append="1" delimeter=". - ">324</isis>
 		<isis append="1" delimiter=". - ">327</isis>
@@ -162,7 +144,10 @@
 	
 	<UncontrolledTerms name="Tema: " order="67">
 		<isis type="swish">610 200a 200e 200k</isis> 
-		<isis type="display" delimiter=" * " format="upper" format_name="UncontrolledTerms" format_delimiter=";;">610;;610</isis>	
+		<isis type="display"  format="upper">
+			<delimiter> * </delimiter>
+			<value>610 </value>
+		</isis>	
 		<isis type="index">610</isis>
 	</UncontrolledTerms>
 	
@@ -179,8 +164,7 @@
 	</title_vol>
 
 	<UDC name="UDK: " order="80">
-		<isis type="swish">675a</isis>
-		<isis type="display" format_name="UDC" format_delimiter=";;">675a;;675a</isis>
+		<isis>675a</isis>
 		<isis type="index">675a</isis>
 	</UDC>
 
@@ -219,10 +203,11 @@
 		<config>materialtype</config>
 	</type>
 	
-	<library name="Knjižnica: " type="display" order="101">
+	<library name="Knjižnica: " 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=", ">library_url</config>
+		<config type="swish">library_code</config>
 	</library>
 
     </indexer>