--- trunk/import_xml/isis_hidra_bib.xml	2003/11/24 21:54:19	178
+++ trunk/import_xml/isis_hidra_bib.xml	2004/01/18 16:24:41	204
@@ -17,26 +17,42 @@
 		<a href="?rm=results&show_full=1&f=IDbib&v=%s">%s</a>
 	]]></format>
 
+	<format name="SubjectIndex"><![CDATA[
+		<a href="?rm=results&f=SubjectIndex&v=%s&e=3&sort=1">%s</a>
+	]]></format>
+
+	<format name="Responsibility"><![CDATA[
+		<a href="?rm=results&f=Responsibility&v=%s&sort=1">%s</a>
+	]]></format>
 
     <indexer>
 	<headline>
-		<isis type="display">200a : 200e / 200f, 210d</isis>
+		<isis type="display">200a</isis>
+		<isis type="display" append="1"> [200b]</isis>
+		<isis type="display" append="1">= 200d</isis>
+		<isis type="display" append="1">: 200e</isis>
+		<isis type="display" append="1">/ 200f, 200g</isis>
 <!--
 		<config delimiter=" - ">materialtype</config>
 		<config delimiter=" u knjižnici: ">library</config>
 -->
 	</headline>
 
+	<Collection name="Zbirka:" order="5">
+		<isis type="display">981a</isis>
+	</Collection>
+
+
 	<IdentificationNumbers name="ISN">
 		<isis type="swish" filter="isn_swish">10 11</isis>
 	</IdentificationNumbers>
 
 	<ISBN name="ISBN: " order="10">
-		<isis type="display">10a</isis>
+		<isis type="display" delimiter=" ; ">10</isis>
 	</ISBN>
 
 	<ISSN name="ISSN: " order="11">
-		<isis type="display">11a</isis>
+		<isis type="display" delimiter=" ; ">11</isis>
 	</ISSN>
 
 <!--
@@ -50,12 +66,14 @@
 	</PersonalName>
 
 	<CorporateBodyName name="Korporativna odgovornost">
-		<isis type="swish">710 711 200f 200g 210c</isis>
-		<isis type="index">710 711 200f 200g 210c</isis>
+		<isis type="swish">710 711 712 200f 200g 210c</isis>
+		<isis type="index">710a, 710b</isis>
+		<isis type="index">711a, 711b</isis>
+		<isis type="index">712a, 712b</isis>
 	</CorporateBodyName>
 
 	<Responsibility name="Odgovornost">
-		<isis type="swish">700 701 702 710 711 200f 200g 210c</isis>
+		<isis type="swish">700 701 702 710 711 712 200f 200g 210c</isis>
 	</Responsibility>
 
 	<Subject name="Predmet">
@@ -64,46 +82,94 @@
 	
 	<SubjectTopicalName name="Predmet: tema" order="500">
 		<isis type="swish">606a 606b</isis>
-		<isis type="display" delimiter=", ">606a</isis>
 	</SubjectTopicalName>
 
 	<SubjectGeographicalName name="Predmet: zemljopis" order="505">
 		<isis type="swish">607a 607b</isis>
-		<isis type="display" delimiter=", ">607a</isis>
 	</SubjectGeographicalName>
 	
 	<SubjectCorporateBodyName name="Predmet: tijelo" order="510">
 		<isis type="swish">601a 601b</isis>
-		<isis type="display" delimiter=", ">601a</isis>
 	</SubjectCorporateBodyName>
 
 	<SubjectPersonalName name="Predmet: osoba" order="515">
 		<isis type="swish">600a 600b</isis>
-		<isis type="display" delimiter=", ">600a</isis>
 	</SubjectPersonalName>
-	
-	<SubjectIndex name="Predmetno kazalo">
-		<isis type="swish">601a 606a</isis>
-		<isis type="index">601a</isis> 
+
+	<SubjectIndex name="Predmetno kazalo:" order="600" iterate_by_page="1" index_delimiter=";;">
+		<isis type="swish">606 601 607 608</isis>
+		<!--
+		<isis type="swish_exact">601a</isis>
+		
+		<isis type="display">606a. 606b / </isis>
+		<isis type="display" lookup="1" append="1">6063</isis>
+		-->
+		
+		<isis type="index">606a 6063</isis>
+		<isis type="index" append="1">;;606a</isis>
+		<isis type="index" lookup="1" append="1">/ 6063</isis>
+<!--
+		<isis type="display">601a. 601b / </isis>
+		<isis type="display" lookup="1" append="1">6013</isis>
+-->
+
+		<isis type="index">601a 6013</isis>
+		<isis type="index" append="1">;;601a /</isis>
 		<isis type="index" lookup="1" append="1">6013</isis>
-		<isis type="index">606a</isis> 
-		<isis type="index" lookup="1" append="1">6063</isis>
+		
+		<isis type="index">607a 6073</isis>
+		<isis type="index" append="1">;;607a / </isis>
+		<isis type="index" lookup="1" append="1">6073</isis>
+		
+		<isis type="index">608a 6083</isis>
+		<isis type="index" append="1">;;608a / </isis>
+		<isis type="index" lookup="1" append="1">6083</isis>
+<!--		
+		<isis type="display">607a. 607b / </isis>
+		<isis type="display" lookup="1" append="1">6073</isis>
+		<isis type="index">607a 6073</isis>
+		<isis type="index" append="1">;;607a / </isis>
+		<isis type="index" lookup="1" append="1">6073</isis>
+	
+		<isis type="display">608a. 608b / </isis>
+		<isis type="display" lookup="1" append="1">6083</isis>
+		<isis type="index">608a 6083</isis>
+		<isis type="index" append="1">;;608a / </isis>
+		<isis type="index" lookup="1" append="1">6083</isis>
+-->	
 	</SubjectIndex>
 
-	<!-- debug -->
+	<SubjectIndex2 name="Predmetno kazalo:" order="600" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
+		<isis type="display">606a 6063;;606a / </isis>
+		<isis type="display" lookup="1" append="1">6063</isis>
+	</SubjectIndex2>
+
+	<SubjectIndex3 name="Predmetno kazalo:" order="601" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
+		<isis type="display">601a 6013;;601a / </isis>
+		<isis type="display" lookup="1" append="1">6013</isis>
+	</SubjectIndex3>
+
+	<SubjectIndex4 name="Predmetno kazalo:" order="602" iterate_by_page="1" format_name="SubjectIndex"  format_delimiter=";;">
+		<isis type="display">607a 6073;;607a / </isis>
+		<isis type="display" lookup="1" append="1">6073</isis>
+	</SubjectIndex4>
+
+	<SubjectIndex5 name="Predmetno kazalo:" order="603" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
+		<isis type="display">608a 6083;;608a / </isis>
+		<isis type="display" lookup="1" append="1">6083</isis>
+	</SubjectIndex5>
+
+	<!-- debug 
 	<SubjectIndex_debug name="Predmetno kazalo 601" iterate_by_page="1">
 		<isis type="display">601a / </isis> 
 		<isis type="display" lookup="1" append="1">6013</isis>
-		<isis>foo</isis>
-		<isis>bar</isis>
 	</SubjectIndex_debug>
+
 	<SubjectIndex_debug2 name="Predmetno kazalo 606" iterate_by_page="1">
 		<isis type="display">606a / </isis> 
 		<isis type="display" lookup="1" append="1">6063</isis>
-		<isis>foo</isis>
-		<isis>bar</isis>
 	</SubjectIndex_debug2>
-	<!-- /debug -->
+	 /debug -->
 
 	<Date name="Godina">
 		<isis type="swish" filter="swish_years">210d</isis>
@@ -111,19 +177,24 @@
 	</Date>
 
 	<Author name="Autor(i): " order="20">
-		<isis type="display">700a, 700b ; 701a, 701b</isis>
-		<isis type="display">710a. 710b ; 711a, 711b</isis>
+		<isis type="display" format_name="Responsibility" format_delimiter=";;">700a 700b;;700a, 700b</isis>
+		<isis type="display" append="1" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">701a 701b;;701a, 701b </isis>
+		<isis type="display" format_name="Responsibility" format_delimiter=";;">710a 710b;;710a. 710b</isis>
+		<isis type="display" append="1" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">711a 711b;;711a. 711b</isis>
 	</Author>
 
 	<OtherResponsibilities name="Sekundarne odgovornosti: " order="25">
-		<isis type="display">702a, 702b</isis>
-		<isis type="display">712a, 712b</isis>
+		<isis type="display" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">702a 702b;;702a, 702b</isis> 
+		<isis type="display" append="1" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">712a 712b;;712a, 712b</isis>
 	</OtherResponsibilities>
 
 	<Title name="Naslov: " order="30">
 		<isis>200a</isis>
-		<isis append="1">[200b] : 200e</isis>
-		<isis type="swish">200d</isis>
+		<isis type="swish">200b 200d 200e</isis>
+		<isis type="display" append="1"> [200b]</isis>
+		<isis type="display" append="1"> : 200e</isis>
+		<isis type="display" append="1"> = 200d</isis>
+		<isis type="display" append="1"> / 200f, 200g</isis>
 		<isis type="swish">225a 225e 225d</isis>
 		<isis type="swish">503a</isis>
 		<isis type="swish">510a</isis>
@@ -132,8 +203,7 @@
 		<isis type="swish">532a</isis>
 		<isis type="swish">540a</isis>
 		<isis type="swish">541a</isis>
-		<isis append="1" type="display"> = 200d</isis>
-		<isis type="swish_exact">200a 200b 200e 200d</isis>
+		<isis type="swish_exact">200a 200e</isis>
 	</Title>
 <!--
 	<EditionStatement name="Izdanje: " order="25">
@@ -163,7 +233,7 @@
 	</Series>
 	
 	<Language name="Jezik: " order="55">
-		<isis type="display" filter="lang_display" delimiter=", ">101a</isis>
+		<isis type="display" filter="lang_display" delimiter=" ; ">101a</isis>
 	</Language>
 	
 	<FrequencyStatementNote name="Učestalost izlaženja: " order="60">
@@ -174,7 +244,7 @@
 		<isis type="display" delimiter=". - ">300a</isis>
 	</GeneralNote>	
 	
-	<InternalBibliographies name="Kazala, bibliografije....: " order="70">
+	<InternalBibliographies name="Kazala, bibliografije: " order="70">
 		<isis type="display" delimiter=". - ">320a</isis>
 	</InternalBibliographies>
 		
@@ -275,12 +345,13 @@
 		<isis type="display" delimiter=", " format_name="IDbib" format_delimiter=";;">4621;;462a</isis>
 	</Subset>
 
-	<Peace name="Dio: " order="190">
-		<isis type="display" delimiter=", " format_name="IDbib" format_delimiter=";;">4631;;463a</isis>
+	<Peace name="Dio: " order="190" iterate_by_page="1">
+		<isis type="display" format_name="IDbib" format_delimiter=";;">4631;;463a</isis>
 	</Peace>
 	
 	<URL name="URL :" order="195">
 		<isis type="display">856u</isis>
+		<isis type="display"> (856z)</isis>
 	</URL>
 
 	<In name="U: " order="195">