local changes

git-svn-id: file:///home/dpavlin/private/svn/webpac/branches/hidra@724 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/import_xml/isis_hidra_adr.xml b/import_xml/isis_hidra_adr.xml
index c20f01b..c738421 100644 (file)
--- a/import_xml/isis_hidra_adr.xml
+++ b/import_xml/isis_hidra_adr.xml
@@ -36,12 +36,18 @@
                <config type="swish">collection_code</config>
        </Collection>
 
-       <Name name="Naziv tijela: " order="10" iterate_by_page="1" index_delimiter=";;">
+       <Name name="Naziv tijela: " order="10">
                <isis>210</isis>
-               <isis type="swish">710 210</isis>
-               <isis type="index">710</isis>
-               <isis type="index" append="1">;;710a</isis>
-               <isis type="index">210</isis>
+               <isis type="swish">710</isis>
+               <isis type="index">710a</isis>
+               
+
+             <!--
+             <isis type="index">210</isis>
+             <isis type="index">710a 7103</isis>
+             <isis type="index" append="1">;;710a</isis>
+             -->
+
        </Name>
 
        <AddrNote name="Napomena: " order="20">
@@ -65,11 +71,14 @@
        </URL>
        
        <Function name="Funkcije: " iterate_by_page="1" order="70">
-               <isis type="swish">204</isis>
+               <isis type="swish">204a 204f</isis>
                <isis type="index">204a</isis>
                <!--<isis type="index">204f </isis>-->
-               <isis type="display">204a / </isis>
+               <isis type="display" format_name="Duznosnik" format_delimiter=";;">204f 2043;;204a / 204f</isis>
+               <!--
+               <isis type="display">204a / 204f</isis>
                <isis type="display" format_name="Duznosnik" append="1" format_delimiter=";;">204f 2043;;204f</isis>
+               -->
        </Function>
 
        <Duznosnik name="Du¾nosnik: " iterate_by_page="1" order="75">

diff --git a/import_xml/isis_hidra_adr_en.xml b/import_xml/isis_hidra_adr_en.xml
index 3e9cb46..6f63fab 100644 (file)
--- a/import_xml/isis_hidra_adr_en.xml
+++ b/import_xml/isis_hidra_adr_en.xml
@@ -42,7 +42,6 @@
                <isis type="index">210</isis>
                <isis type="index">710</isis>
        </Name>
---> 
       <Name name="Name: " order="10" iterate_by_page="1" index_delimiter=";;">
                <isis>210</isis>
                <isis type="swish">710 210</isis>
@@ -51,6 +50,13 @@
                <isis type="index">210</isis>
        </Name>
 
+--> 
+      <Name name="Name: " order="10">
+               <isis>210</isis>
+               <isis type="swish">710</isis>
+               <isis type="index">710a</isis>
+       </Name>
+
        <AddrNote name="Note: " order="20">
                <isis type="display">300</isis>
        </AddrNote>
@@ -72,11 +78,14 @@
       </URL>
        
        <Function name="Functions: " iterate_by_page="1" order="70">
-               <isis type="swish">204</isis>
+               <isis type="swish">204a 204f</isis>
                <isis type="index">204a</isis>
                <!--<isis type="index">204f </isis>-->
-               <isis type="display">204a / </isis>
+               <isis type="display" format_name="Official" format_delimiter=";;">204f 2043;;204a / 204f</isis>
+               <!--
+               <isis type="display">204a / 204f</isis>
                <isis type="display" format_name="Official" append="1"   format_delimiter=";;">204f 2043;;204f</isis>
+               -->
        </Function>
 
        <Official name="Official: " iterate_by_page="1" order="75">

diff --git a/import_xml/isis_hidra_bib.xml b/import_xml/isis_hidra_bib.xml
index f08379f..d309aca 100644 (file)
--- a/import_xml/isis_hidra_bib.xml
+++ b/import_xml/isis_hidra_bib.xml
@@ -9,6 +9,9 @@
        isis_codepage="852"
 >
 <!--
+èæ¹¾ð
+ÈÆ©®Ð
+
        <isis type="swish|display|index">_pre_000x_sep_000x_sep_000x_post_</isis>
        <config type="swish|display">name of var from config file</config>
 -->
@@ -31,7 +34,7 @@
                <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>
+               <isis type="display" append="1">/ 200f ; 200g. 200c</isis>
 <!--
                <config>
                        <delimiter> - </delimiter>
@@ -44,7 +47,7 @@
 -->
        </headline>
 
-       <Collection name="Zbirka:" order="5">
+       <Collection name="Tip dokumentacije:" order="5">
                <isis type="display">981a</isis>
                <isis type="swish">981a</isis>
                <config type="swish">collection_code</config>
@@ -137,34 +140,64 @@
        
        <SubjectIndexHR2 name="Predmetno kazalo:" order="600" iterate_by_page="1" index_delimiter=";;">
                <isis type="swish">606 601 607 608</isis>
+<!--
                <isis type="index">606a 6063</isis>
-               <isis type="index" filter="mem_lookup" append="1">;;[hr:6063]</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6063]</isis>
                <isis type="index" append="1"> / 606a</isis>
 
                <isis type="index">601a 6013</isis>
-               <isis type="index" filter="mem_lookup" append="1">;;[hr:6013]</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6013]</isis>
                <isis type="index" append="1"> / 601a</isis>
-               
+
                <isis type="index">607a 6073</isis>
-               <isis type="index" filter="mem_lookup" append="1">;;[hr:6073]</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6073]</isis>
                <isis type="index" append="1"> / 607a</isis>
-               
+
                <isis type="index">608a 6083</isis>
-               <isis type="index" filter="mem_lookup" append="1">;;[hr:6083]</isis>
+             <isis type="index" filter="mem_lookup" append="1">;;[hr:6083]</isis>
+               <isis type="index" append="1"> / 608a</isis>
+-->
+               <isis type="index">6063</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6063]</isis>
+               <isis type="index" append="1"> / 606a</isis>
+
+               <isis type="index">6013</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6013]</isis>
+               <isis type="index" append="1"> / 601a</isis>
+
+               <isis type="index">6073</isis>
+              <isis type="index" filter="mem_lookup" append="1">;;[hr:6073]</isis>
+               <isis type="index" append="1"> / 607a</isis>
+
+               <isis type="index">6083</isis>
+             <isis type="index" filter="mem_lookup" append="1">;;[hr:6083]</isis>
                <isis type="index" append="1"> / 608a</isis>
+
        </SubjectIndexHR2>
        
        <CorporateBodyIndexHR name="Kazalo korporativnih autora" order="600" iterate_by_page="1" index_delimiter=";;">
                <isis type="swish">710 711 712</isis>
+
                <isis type="index">710a 7103</isis>
-               <isis type="index" append="1">;;710a</isis>
+               <isis type="index" append="1">;;710a /</isis>
                <isis type="index" filter="mem_lookup" append="1"> [hr:7103]</isis>
                <isis type="index">711a 7113</isis>
-               <isis type="index" append="1">;;711a</isis>
+               <isis type="index" append="1">;;711a /</isis>
                <isis type="index" filter="mem_lookup" append="1"> [hr:7113]</isis>
                <isis type="index">712a 7123</isis>
-               <isis type="index" append="1">;;712a</isis>
+               <isis type="index" append="1">;;712a /</isis>
                <isis type="index" filter="mem_lookup" append="1"> [hr:7123]</isis>
+<!--
+               <isis type="index">710a 7103</isis>
+               <isis type="index" filter="mem_lookup" append="1">;;[hr:7103]</isis>
+              <isis type="index" append="1"> / 710a</isis>
+               <isis type="index">711a 7113</isis>
+               <isis type="index" filter="mem_lookup" append="1">;;[hr:7113]</isis>
+               <isis type="index" append="1"> / 711a</isis>
+               <isis type="index">712a 7123</isis>
+               <isis type="index" filter="mem_lookup" append="1">;;[hr:7123]</isis>
+               <isis type="index" append="1"> / 712a</isis>
+-->
        </CorporateBodyIndexHR>
        
        <SubjectIndex2 name="Predmetno kazalo:" order="600" iterate_by_page="1" format_name="SubjectIndexHR" format_delimiter=";;">
@@ -225,7 +258,7 @@
                <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="display" append="1"> / 200f ; 200g. 200c</isis>
                <isis type="swish">503a</isis>
                <isis type="swish">532a</isis>
                <isis type="swish">510a</isis>
@@ -253,7 +286,7 @@
                <isis type="display">215a : 215c ; 215d</isis>
        </PhisicalDescription>
 
-       <Series name="Cjelina: " order="50">
+       <Series name="Nakladnièka cjelina: " order="50">
                <!--
                        FIXME ovo polje bi trebalo imati linkove na >^1
                        ali ih nema
@@ -302,23 +335,23 @@
                <isis type="display">503a</isis>
        </UniformConventionalHeading>
 
-       <ParallelTitle name="Usporedni naslov: " order="80">
+       <ParallelTitle name="Usporedni naslov: " iterate_by_page="1" order="80">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>510a</value>
                </isis>
        </ParallelTitle>
 
-       <VariantTitle name="Ostali naslovi: " order="85">
+       <VariantTitle name="Ostali naslovi: " iterate_by_page="1" order="85">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>517a</value>
                </isis>
        </VariantTitle>
 
-       <FormerTitleProper name="Prethodni naslov: " order="90">
+       <FormerTitleProper name="Prethodni naslov: " iterate_by_page="1" order="90">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>520a</value>
                </isis>
        </FormerTitleProper>
@@ -327,7 +360,7 @@
                <isis type="display">532a</isis>
        </ExpandedTitle>
 
-       <AdditionalTitle name="Dodatni naslov koji daje katalogizator: " order="100">
+       <AdditionalTitle name="Dodatni naslov koji daje katalogizator: " iterate_by_page="1" order="100">
                <isis type="display">540a</isis>
        </AdditionalTitle>
 
@@ -335,9 +368,9 @@
                <isis type="display">541a</isis>
        </TranslatedTitle>
 
-       <Supplement name="Ima dodatak: " order="110">
+       <Supplement name="Ima dodatak: " iterate_by_page="1" order="110">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4211;;421a</value>
                </isis>
        </Supplement>
@@ -353,78 +386,78 @@
 
        <IssuedWith name="Pri¹tampani radovi: " iterate_by_page="1" order="120">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4231;;423a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4231;;423a</value>
                </isis>
        </IssuedWith>
 
        <Continues name="Je nastavak od: " iterate_by_page="1" order="125">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4301;;430a</value>
+                       <!--<delimiter>, </delimiter>-->
+                        <value>4301;;430a</value>
                </isis>
        </Continues>
 
        <ContinuesInPart name="Je djelomice nastavak od: " iterate_by_page="1" order="130">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4311;;431a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4311;;431a</value>
                </isis>
        </ContinuesInPart>
 
        <FormedByMergerOf name="Nastao spajanjem: " iterate_by_page="1" order="135">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4361;;436a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4361;;436a</value>
                </isis>
        </FormedByMergerOf> 
 
        <ContinuedBy name="Nastavlja se kao: " iterate_by_page="1" order="140">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4401;;440a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4401;;440a</value>
                </isis>
        </ContinuedBy>
 
        <ContinuedByInPart name="Djelomice se nastavlja kao: " iterate_by_page="1" order="145">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4411;;441a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4411;;441a</value>
                </isis>
        </ContinuedByInPart>
 
        <SplitInto name="Dijeli se na: " iterate_by_page="1" order="150">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4461;;446a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4461;;446a</value>
                </isis>
        </SplitInto>
 
        <MergedWith name="Spojen sa nastavlja kao: " iterate_by_page="1" order="155">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4471;;447a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4471;;447a</value>
                </isis>
        </MergedWith>
 
        <OtherEditionSameMedium name="VIDI i: " iterate_by_page="1" order="160">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4511;;451a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4511;;451a</value>
                </isis>
        </OtherEditionSameMedium>
 
        <OtherEditionAnotherMedium name="Na drugom mediju: " iterate_by_page="1" order="165">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4521;;452a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4521;;452a</value>
                </isis>
        </OtherEditionAnotherMedium>
 
        <TranslatedAs name="Ima prijevod: " iterate_by_page="1" order="170">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4531;;453a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4531;;453a</value>
                </isis>
        </TranslatedAs>
 
@@ -432,24 +465,28 @@
                <isis type="display" format_name="IDbib" format_delimiter=";;">4541;;454a</isis>
        </TranslationOf>
 
-       <Set name="Skupni zapis: " order="180">
+       <Set name="SKUPNA RAZINA: " order="180">
                <isis type="display" format_name="IDbib" format_delimiter=";;">4611;;461a, 461v</isis>
        </Set>
 
-       <Subset name="Podskup: " iterate_by_page="1" order="185">
+       <Subset name="PODZBIRKA: " iterate_by_page="1" order="185">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <!--<delimiter>, </delimiter>
-                       --><value>4621;;462a</value>
+                       <!--<delimiter>, </delimiter>-->
+                       <value>4621;;462a</value>
                </isis>
        </Subset>
 <!--
-       <Peace name="Dio: " order="190" iterate_by_page="1">
+       <Peace name="U FONDU: " order="190" iterate_by_page="1">
                <isis type="display" format_name="IDbib" format_delimiter=";;">4631;;463a</isis>
        </Peace>
 -->
 
-       <Peace name="Dio: " order="190" iterate_by_page="1">
+       <Peace name="U FONDU: " order="190" iterate_by_page="1" distinct="1">
                <isis type="display" format_name="IDbib" format_delimiter=";;" filter="mem_lookup">4631;;[naslov:4631]</isis>
+               <isis type="display" format_name="IDbib" format_delimiter=";;" filter="mem_lookup">
+               <delimiter><![CDATA[<br/>]]></delimiter>
+               <value>[dio:900];;[naslov:[dio:900]]</value>
+               </isis>
        </Peace>
 
        <URL name="URL :" order="195" iterate_by_page="1">
@@ -461,7 +498,7 @@
                -->
        </URL>
 
-       <In name="U: " order="195">
+       <In name="SKUPNA RAZINA: " order="195" iterate_by_page="1">
                <isis type="display" format_name="IDbib" format_delimiter=";;">9461;;946a</isis>
        </In>
        

diff --git a/import_xml/isis_hidra_bib_en.xml b/import_xml/isis_hidra_bib_en.xml
index ece4870..33a0f4b 100644 (file)
--- a/import_xml/isis_hidra_bib_en.xml
+++ b/import_xml/isis_hidra_bib_en.xml
@@ -31,7 +31,7 @@
                <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>
+               <isis type="display" append="1">/ 200f, 200g. 200c</isis>
 <!--
                <config>
                        <delimiter> - </delimiter>
@@ -120,12 +120,12 @@
                <!--
                <isis type="swish_exact">601a</isis>
                
-               <isis type="display">606a. 606b / </isis>
+               <isis type="display">606a, 606b / </isis>
                <isis type="display" filter="mem_lookup" append="1">[en:6063]</isis>
                -->
                
                <isis type="index">606a 6063</isis>
-               <isis type="index" append="1">;;606a</isis>
+               <isis type="index" append="1">;;606a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:6063]</isis>
 <!--
                <isis type="display">601a. 601b / </isis>
@@ -133,15 +133,15 @@
 -->
 
                <isis type="index">601a 6013</isis>
-               <isis type="index" append="1">;;601a</isis>
+               <isis type="index" append="1">;;601a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:6013]</isis>
                
                <isis type="index">607a 6073</isis>
-               <isis type="index" append="1">;;607a</isis>
+               <isis type="index" append="1">;;607a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:6073]</isis>
                
                <isis type="index">608a 6083</isis>
-               <isis type="index" append="1">;;608a</isis>
+               <isis type="index" append="1">;;608a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:6083]</isis>
 <!--           
                <isis type="display">607a. 607b / </isis>
@@ -161,13 +161,13 @@
        <CorporateBodyIndexEN name="Corporate authors index" order="600" iterate_by_page="1" index_delimiter=";;">
                <isis type="swish">710 711 712</isis>
                <isis type="index">710a 7103</isis>
-               <isis type="index" append="1">;;710a</isis>
+               <isis type="index" append="1">;;710a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:7103]</isis>
                <isis type="index">711a 7113</isis>
-               <isis type="index" append="1">;;711a</isis>
+               <isis type="index" append="1">;;711a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:7113]</isis>
                <isis type="index">712a 7123</isis>
-               <isis type="index" append="1">;;712a</isis>
+               <isis type="index" append="1">;;712a / </isis>
                <isis type="index" filter="mem_lookup" append="1"> [en:7123]</isis>
        </CorporateBodyIndexEN>
        
@@ -209,27 +209,27 @@
        </Date>
 
        <Author name="Authors: " iterate_by_page="1" order="20">
-               <isis type="display" format_name="Responsibility" format_delimiter=";;">700a 700b;;700a, 700b</isis>
-               <isis type="display" 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" format_name="Responsibility" format_delimiter=";;">711a 711b;; 711a. 711b</isis>
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">700a 700b 7003;;700a, 700b</isis>
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">701a 701b 7013;;701a, 701b</isis>
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">710a 710b 7103;;710a. 710b</isis>
+               <isis type="display" append="1" format_name="Responsibility" format_delimiter=";;">711a 711b 7113;; 711a. 711b</isis>
        </Author>
 
        <OtherResponsibilities name="Responsibilities: " iterate_by_page="1" order="25">
-               <isis type="display" format_name="Responsibility" format_delimiter=";;">702a 702b;;702a, 702b</isis> 
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">702a 702b 7023;;702a, 702b</isis> 
        </OtherResponsibilities>
 
        <OtherResponsibilitiesCorp name="Responsibilities: " iterate_by_page="1" order="25">
-               <isis type="display" format_name="Responsibility" format_delimiter=";;">712a 712b;;712a, 712b</isis>
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">712a 712b 7123;;712a, 712b</isis>
        </OtherResponsibilitiesCorp>
 
        <Title name="TITLE: " order="30">
-               <isis type="swish">200a 200b 200d 200e</isis>
+               <isis type="swish">200a 200d 200e</isis>
                <isis type="display">200a</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="display" append="1"> / 200f, 200g. 200c</isis>
                <isis type="swish">503a</isis>
                <isis type="swish">532a</isis>
                <isis type="swish">510a</isis>
@@ -306,23 +306,23 @@
                <isis type="display">503a</isis>
        </UniformConventionalHeading>
 
-       <ParallelTitle name="Parallel Title Proper: " order="80">
+       <ParallelTitle name="Parallel Title Proper: " iterate_by_page="1" order="80">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>510a</value>
                </isis>
        </ParallelTitle>
 
-       <VariantTitle name="Other Variant Titles: " order="85">
+       <VariantTitle name="Other Variant Titles: " iterate_by_page="1" order="85">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>517a</value>
                </isis>
        </VariantTitle>
 
-       <FormerTitleProper name="Former Title (Serials): " order="90">
+       <FormerTitleProper name="Former Title (Serials): " iterate_by_page="1" order="90">
                <isis type="display" >
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>520a</value>
                </isis>
        </FormerTitleProper>
@@ -339,9 +339,9 @@
                <isis type="display">541a</isis>
        </TranslatedTitle>
 
-       <Supplement name="Supplement: " order="110">
+       <Supplement name="Supplement: " iterate_by_page="1" order="110">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4211;;421a</value>
                </isis>
        </Supplement>
@@ -355,79 +355,79 @@
                <isis type="display" format_name="IDbib" format_delimiter=";;">4221;;422a</isis>
        </ParentOfSupplement>
 
-       <IssuedWith name="Issued With: " order="120">
+       <IssuedWith name="Issued With: " iterate_by_page="1" order="120">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4231;;423a</value>
                </isis>
        </IssuedWith>
 
-       <Continues name="Continues: " order="125">
+       <Continues name="Continues: " iterate_by_page="1" order="125">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4301;;430a</value>
                </isis>
        </Continues>
 
-       <ContinuesInPart name="Continued by in Part: " order="130">
+       <ContinuesInPart name="Continued by in Part: " iterate_by_page="1" order="130">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4311;;431a</value>
                </isis>
        </ContinuesInPart>
 
-       <FormedByMergerOf name="Formed by Merger of...and: " order="135">
+       <FormedByMergerOf name="Formed by Merger of...and: " iterate_by_page="1" order="135">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4361;;436a</value>
                </isis>
        </FormedByMergerOf> 
 
-       <ContinuedBy name="Continued by: " order="140">
+       <ContinuedBy name="Continued by: " iterate_by_page="1" order="140">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4401;;440a</value>
                </isis>
        </ContinuedBy>
 
-       <ContinuedByInPart name="Continued by in Part: " order="145">
+       <ContinuedByInPart name="Continued by in Part: " iterate_by_page="1" order="145">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4411;;441a</value>
                </isis>
        </ContinuedByInPart>
 
-       <SplitInto name="Split into ... and: " order="150">
+       <SplitInto name="Split into ... and: " iterate_by_page="1" order="150">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4461;;446a</value>
                </isis>
        </SplitInto>
 
-       <MergedWith name="Merged with ... And... to Form...: " order="155">
+       <MergedWith name="Merged with ... And... to Form...: " iterate_by_page="1" order="155">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4471;;447a</value>
                </isis>
        </MergedWith>
 
-       <OtherEditionSameMedium name="SEE ALSO: " order="160">
+       <OtherEditionSameMedium name="SEE ALSO: " iterate_by_page="1" order="160">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4511;;451a</value>
                </isis>
        </OtherEditionSameMedium>
 
-       <OtherEditionAnotherMedium name="Other Edition in Another Medium: " order="165">
+       <OtherEditionAnotherMedium name="Other Edition in Another Medium: " iterate_by_page="1" order="165">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4521;;452a</value>
                </isis>
        </OtherEditionAnotherMedium>
 
-       <TranslatedAs name="Translated As: " order="170">
+       <TranslatedAs name="Translated As: " iterate_by_page="1" order="170">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4531;;453a</value>
                </isis>
        </TranslatedAs>
@@ -436,23 +436,30 @@
                <isis type="display" format_name="IDbib" format_delimiter=";;">4541;;454a</isis>
        </TranslationOf>
 
-       <Set name="Set: " order="180">
+       <Set name="IN: " order="180">
                <isis type="display" format_name="IDbib" format_delimiter=";;">4611;;461a, 461v</isis>
        </Set>
 
-       <Subset name="Subset: " order="185">
+       <Subset name="Subset: " iterate_by_page="1" order="185">
                <isis type="display"  format_name="IDbib" format_delimiter=";;">
-                       <delimiter>, </delimiter>
+                       <!--<delimiter>, </delimiter>-->
                        <value>4621;;462a</value>
                </isis>
        </Subset>
-
-       <Peace name="Peace: " order="190" iterate_by_page="1">
+<!--
+       <Peace name="IN FUND: " order="190" iterate_by_page="1">
                <isis type="display" format_name="IDbib" format_delimiter=";;">4631;;463a</isis>
        </Peace>
-       
+-->
+       <Peace name="FUND: " order="190" iterate_by_page="1" distinct="1">
+               <isis type="display" format_name="IDbib" format_delimiter=";;" filter="mem_lookup">4631;;[naslov:4631]</isis>
+               <isis type="display" format_name="IDbib" format_delimiter=";;" filter="mem_lookup">
+               <delimiter><![CDATA[<br/>]]></delimiter>
+               <value>[dio:900];;[naslov:[dio:900]]</value>
+               </isis>
+       </Peace>        
        <URL name="URL: " order="195" iterate_by_page="1">
-                <isis type="display" >856z: 856u</isis>
+                <isis type="display" >856z 856u</isis>
                <!-- <isis type="display" append="1">
                      <value>856u</value>
                </isis>
@@ -460,7 +467,7 @@
                -->
        </URL>
 
-       <In name="In: " order="195">
+       <In name="IN: " order="195">
                <isis type="display" format_name="IDbib" format_delimiter=";;">9461;;946a</isis>
        </In>
        

diff --git a/template_html-hidra/index_res-adr.html b/template_html-hidra/index_res-adr.html
index 30faf1d..1f2ab35 100644 (file)
--- a/template_html-hidra/index_res-adr.html
+++ b/template_html-hidra/index_res-adr.html
@@ -11,6 +11,8 @@
 </form>
 
 <h2>Kazalo</h2>
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Adresar tijela javne vlasti Republike Hrvatske</font></h4>
 
 <p>
 <!--

diff --git a/template_html-hidra/index_res-bib.html b/template_html-hidra/index_res-bib.html
index f328a54..03eb72e 100644 (file)
--- a/template_html-hidra/index_res-bib.html
+++ b/template_html-hidra/index_res-bib.html
@@ -11,6 +11,9 @@
 </form>
 
 <h2>Kazalo</h2>
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Katalog slu¾bene dokumentacije Republike Hrvatske</font></h4>
+
 
 <p>
 <!--

diff --git a/template_html-hidra/results-adr.html b/template_html-hidra/results-adr.html
index 9631721..5bc8693 100644 (file)
--- a/template_html-hidra/results-adr.html
+++ b/template_html-hidra/results-adr.html
@@ -14,6 +14,8 @@
 
 
 <h2>Rezultati pretra¾ivanja</h2>
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Adresar tijela javne vlasti Republike Hrvatske</font></h4>
 
 <form>
 

diff --git a/template_html-hidra/results-bib-en.html b/template_html-hidra/results-bib-en.html
index 979b3dc..9cfaae4 100644 (file)
--- a/template_html-hidra/results-bib-en.html
+++ b/template_html-hidra/results-bib-en.html
@@ -14,6 +14,10 @@
 
 
 <h2>Search results</h2>
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Catalogue of official documentation of Republic of Croatia</font></h4> 
+<H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+<a href="http://www.hidra.hr/doke/dok.htm" target="_parent">Catalogue home page</a></font>
 
 <form>
 

diff --git a/template_html-hidra/results-bib.html b/template_html-hidra/results-bib.html
index 44bdc0b..55a2d54 100644 (file)
--- a/template_html-hidra/results-bib.html
+++ b/template_html-hidra/results-bib.html
@@ -13,8 +13,15 @@
 
 </form>
 
-
 <h2>Rezultati pretra¾ivanja</h2>
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Katalog slu¾bene dokumentacije Republike Hrvatske</font></h4> 
+<H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+<a href="http://www.hidra.hr/dok/sdrh.htm" target="_parent">Poèetna stranica kataloga</a></font>
+
+
+
+
 
 <form>
 

diff --git a/template_html-hidra/search-adr-en.html b/template_html-hidra/search-adr-en.html
index 28bcc62..25d80d4 100644 (file)
--- a/template_html-hidra/search-adr-en.html
+++ b/template_html-hidra/search-adr-en.html
@@ -1,3 +1,5 @@
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Directory of state bodies and public institutions of Republic of Croatia</font></h4>
 <TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
 <tr><td width=520>
 <form name="search" method="get" action="?">

diff --git a/template_html-hidra/search-adr.html b/template_html-hidra/search-adr.html
index 88abcb9..b777f3e 100644 (file)
--- a/template_html-hidra/search-adr.html
+++ b/template_html-hidra/search-adr.html
@@ -1,3 +1,5 @@
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Adresar tijela javne vlasti Republike Hrvatske</font></h4>
 <TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
   <tr><td width=520>
   <form name="search" method="get" action="?">

diff --git a/template_html-hidra/search-bib-en.html b/template_html-hidra/search-bib-en.html
index 8126225..012f78f 100644 (file)
--- a/template_html-hidra/search-bib-en.html
+++ b/template_html-hidra/search-bib-en.html
@@ -1,3 +1,5 @@
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Catalogue of official documentation of Republic of Croatia</font></h4>
 <TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
 <tr><td width=520>
 <!--
@@ -170,17 +172,41 @@
        </td>
 </tr>
 </table>
-
+<!--
 <p>     
 <table border="0">
 <tr><td class="navigacija" style='text-align:justify'>Set search limits by entering in the title box:
 <ul>
-<li><b>online</b> for records linked to full text documents</li>
+<li><b>online</b> full text documents only</li>
 <li><b>approximated</b> for Croatian laws harmonized with EU legislation</li>
 </ul>
 </td></tr>
 </table>
+-->
+<p>     
+<table border="0">
+<tr>
+<td class="navigacija" style='text-align:justify'>
+         
+<input type="hidden" name="f10" value="Title">
+<br><input type="checkbox" name="v10" value="online"> full text documents only
+</td>
+</tr>
+
+<td class="navigacija" style='text-align:justify'><b>One of collections as unique/additional condition:</b>
+<input type="hidden" name="f13" value="Collection">
+<br><input type="checkbox" name="v13" value="REGULATIONS OF THE REPUBLIC OF CROATIA" > regulations of the Republic of Croatia
+<br><input type="checkbox" name="v13" value="harmonized"> Croatian regulations harmonized with EU legislation <img src="colors.gif"> - <b>new!</b>
+<br><input type="checkbox" name="v13" value="BILATERAL CONTRACTS OF THE REPUBLIC OF CROATIA" > bilateral contracts of the Republic of Croatia
+<br><input type="checkbox" name="v13" value="MULTILATERAL CONTRACTS OF THE REPUBLIC OF CROATIA" > multilateral contracts of the Republic of Croatia
+<br><input type="checkbox" name="v13" value="PUBLIC DOCUMENTS/PUBLICATIONS"> public documents and publications of the Republic of Croatia
+<br><input type="checkbox" name="v13" value="forms"> official forms of Croatian public authorities <img src="colors.gif"> - <b>new!</b>
+<br><input type="checkbox" name="v13" value="services"> services, registries and databases of Croatian public authorities <img src="colors.gif"> - <b>new!</b>
 
+</td>
+</tr>
+</table>
+<br>&nbsp;
 <table border="0">
 <tr>
        <td class="label1">

diff --git a/template_html-hidra/search-bib.html b/template_html-hidra/search-bib.html
index 1ebad26..6893a96 100644 (file)
--- a/template_html-hidra/search-bib.html
+++ b/template_html-hidra/search-bib.html
@@ -1,3 +1,5 @@
+<H4><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">
+Katalog slu¾bene dokumentacije Republike Hrvatske</font></h4>
 <TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
 <tr><td width=520>
 <!--
@@ -175,11 +177,21 @@
 <p>     
 <table border="0">
 <tr>
-<td class="navigacija" style='text-align:justify'>Rezultate mo¾ete ogranièiti prema sljedeæim kriterijima:
-          <input type="hidden" name="f10" value="Title">
-         
-<br><input type="checkbox" name="v10" value="online"> podaci s poveznicom na cjelovit tekst
-<br><input type="checkbox" name="v10" value="usklaðeno"> zakonodavstvo usklaðeno s EU
+<td class="navigacija" style='text-align:justify'>         
+<input type="hidden" name="f10" value="Title">
+<br><input type="checkbox" name="v10" value="online"> pregled zapisa s poveznicom na cjelovit tekst<p>
+</td>
+</tr>
+<td class="navigacija" style='text-align:justify'><b>Podatke mo¾ete pregledavati i/ili po jednoj od sljedeæih skupina graðe:</b>
+<input type="hidden" name="f13" value="Collection">
+<br><input type="checkbox" name="v13" value="PROPISI REPUBLIKE HRVATSKE" > zakonodavstvo Republike Hrvatske
+<br><input type="checkbox" name="v13" value="- usklaðeno"> zakonodavstvo Republike Hrvatske usklaðeno sa zakonodavstvom Europske unije <img src="colors.gif"> - <b>novo!</b>
+<br><input type="checkbox" name="v13" value="BILATERALNI SPORAZUMI REPUBLIKE HRVATSKE" > dvostrani sporazumi Republike Hrvatske
+<br><input type="checkbox" name="v13" value="MULTILATERALNI SPORAZUMI REPUBLIKE HRVATSKE" > vi¹estrani sporazumi Republike Hrvatske
+<br><input type="checkbox" name="v13" value="JAVNI DOKUMENTI/PUBLIKACIJE"> javno objavljeni dokumenti i publikacije
+<br><input type="checkbox" name="v13" value="OBRASCI"> slu¾beni obrasci tijela javne vlasti <img src="colors.gif"> - <b>novo!</b>
+<br><input type="checkbox" name="v13" value="SERVISI"> servisi, registri i baze podataka tijela javne vlasti <img src="colors.gif"> - <b>novo!</b>
+
 </td>
 </tr>
 </table>
@@ -195,16 +207,18 @@
        </td>
        <td>&nbsp;</td>
 </tr>
+<!--
 <tr>
 <td class="label1">
          <input type="hidden" name="f12" value="SubjectIndexHR2">
           <input size="30" type="text" name="v12">
        </td>
        <td>
-         <input type="submit" value="Predmetno kazalo" name="f12_index" class="navigacija">
+         <input type="submit" value="Predmetno kazalo po podruèjima - u radu!" name="f12_index" class="navigacija">
        </td>
        <td>&nbsp;</td>
 </tr>
+-->
 <tr>
        <td class="label1">
          <input type="hidden" name="f7" value="CorporateBodyIndexHR">

diff --git a/template_html-hidra/search-ths.html b/template_html-hidra/search-ths.html
index 1389fa1..0274f50 100644 (file)
--- a/template_html-hidra/search-ths.html
+++ b/template_html-hidra/search-ths.html
@@ -1,12 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><title>WebPAC</title>
+
+
+
+<meta http-equiv="Content-Type" content="text/html ; charset=windows-1250">
+
+<link rel="stylesheet" type="text/css" href="eurovoc_files/style.css">
+
+<script src="eurovoc_files/do_checkbox.js" type="text/javascript"></script></head>
+
+
+
+<body>
+
 <form name="search" method="get" action="?">
-<input type="hidden" name="rm" value="results">
+<input value="results" name="rm" type="hidden">
 
 <table border="0">
-<tr>
-<td  class="navigacija"><b><a href="http://www.hidra.hr/hidrarad/eurovoc/euv_pomoc.htm">Pomoæ</a></b></td>
+<tbody><tr>
+
 <!--
    <td colspan="3" align="right">
-   <input type="submit" value="Pretra¾i !" class="submit">
+   <input type="submit" value="Pretra¾i!" class="submit">
    </td>
 -->
 </tr>
@@ -18,39 +33,57 @@
 -->
 <tr>
    <td class="inputfield">
-     <select name="f9">
-     <option value="DescriptorHR" selected>Hrvatski</option>
-     <option value="DescriptorEN">Engleski</option>
-     <option value="DescriptorFR">Francuski</option>
-     <option value="DescriptorGE">Njemaèki</option>
-<!--
+     <select name="f9"><option value="DescriptorHR" selected="selected">Hrvatski</option><option value="DescriptorEN">Engleski</option><option value="DescriptorFR">Francuski</option><option value="DescriptorGE">Njemaèki</option><!--
      <option value="AllThes">Sve rijeèi</option>
--->
-     </select>
+--></select>
    </td>
-   <td><input  size="30" name="v9" id="reset"></td>
-   <td><input type="submit" value="Kazalo" name="f9_index" class="navigacija"></td>
-   <td ><input type="submit" value="Pretra¾i !" class="navigacija"></td>
+   <td><input name="v9" id="reset" size="30"></td>
+   <td><input value="Pretra¾i !" class="navigacija" type="submit"></td>
+   <td><input value="Kazalo" name="f9_index" class="navigacija" type="submit"></td>
 
 </tr>
-<tr><td colspan=3><p>&nbsp;</td></tr>
+<tr><td colspan="3"><p>&nbsp;</p></td></tr>
 <tr>
 
   <td class="label1">
-  <input type="hidden" name="f10" value="SubjectAreaHR">
+  <input value="SubjectAreaHR" name="f10" type="hidden">
 <!--
   <input size="10" type="text" name="v10">
 -->
   </td>
 </tr>
+<!--
 <tr>
-
 <td  colspan=3><input type="submit" value="Pregled pojmovnika kroz kazalo podruèja" name="f10_index" class="navigacija"></td>
 </tr>
+-->
 <tr>
-<td colspan=3><br><input type="button" onClick="self.document.getElementById('reset').value = ''; return false;" value="Poni¹ti obrazac !" name="reset" class="navigacija"></td>
+<td colspan="3"><br><input value="Poni¹ti obrazac!" name="reset" class="navigacija" onclick="self.document.getElementById('reset').value = ''; return false;" type="button"></td>
 </tr>
-</table>
+</tbody></table>
 
 </form>
 
+
+<table width=520>
+    <tr><td class="tdH1">&nbsp;</td></tr>
+    <tr><td class="navigacijaT" style='text-align:justify'>
+        <ul>
+<li>Pojmovnik se pretra¾uje po poèetku rijeèi ili po cijeloj rijeèi odabranog jezika
+<li>Razmak izmeðu dviju rijeèi ima znaèenje logièkoga operatora "I" (AND). OR i NOT su oznake za logièke operatore znaèenja "ILI" i "NE". 
+<li>Slova stranih jezika potrebno je upisati bez dijakritièkih znakova
+<li>Rezultat pretra¾ivanja je popis deskriptora na hrvatskom jeziku u èijem se opisu nalazi tra¾eni pojam
+<li>Detaljni prikaz svakog deskriptora èine njegovo hijerarhijsko i semantièko okru¾enje te prijevodi na engleskom, francuskom i njemaèkom jeziku (samo na engleskom za deskriptore Hrvatskog dodatka). 
+<li>Deskriptori Hrvatskog dodatka oznaèeni su kao CROVOC u rubrici izvora podataka odnosno slièicom   u hijerarhijskom prikazu.
+<li>Kazala se prikazaju od zadanog poèetka rijeèi, odnosno u cijelosti ukoliko poèetak nije zadan ili ne postoji deskriptor s upisanim poèetkom
+       </ul>
+
+Pretra¾ivanje hrvatskog prijevoda Pojmovnika Eurovoc uz moguænost prijevoda na 16 slu¾benih jezika Europske unije:
+<p>
+<a href="http://europa.eu.int/celex/eurovoc/sg/sga_doc/eurovoc_dif!SERVEUR/menu!prod!MENU?langue=HR" target="_blank"><img src="http://www.hidra.hr/hidrarad/eurovoc/eurovocbig.gif" align="center" border="0" width="200"></a>
+<br>
+<a href="http://europa.eu.int/celex/eurovoc/sg/sga_doc/eurovoc_dif!SERVEUR/menu!prod!MENU?langue=HR" target="_blank"><img src="http://www.hidra.hr/hidrarad/eurovoc/eurovoc-lang-mali.gif" align="center" border="0"></a>
+        </td></tr>
+    
+    </table>
+</body></html>
\ No newline at end of file