local changes

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

diff --git a/all2xml.conf b/all2xml.conf
index fb5f95c..26c669d 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -8,6 +8,10 @@
        isis_db=/data/hidra/THS/THS
        type=isis_hidra_ths_nt
 
+[hidra-bib-lookup]
+       isis_db=/data/hidra/SDRH-H/BIB
+       type=isis_hidra_bib_lookup
+
 [hidra-ths-h]
        isis_db=/data/hidra/THS/THS
        type=isis_hidra_ths

diff --git a/import_xml/isis_hidra_bib.xml b/import_xml/isis_hidra_bib.xml
index 01275c0..f08379f 100644 (file)
--- a/import_xml/isis_hidra_bib.xml
+++ b/import_xml/isis_hidra_bib.xml
@@ -117,45 +117,22 @@
 
        <SubjectIndexHR 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" filter="mem_lookup" append="1">[hr: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"> [hr:6063]</isis>
-<!--
-               <isis type="display">601a. 601b / </isis>
-               <isis type="display" filter="mem_lookup" append="1">[hr:6013]</isis>
--->
 
                <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"> [hr: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"> [hr: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"> [hr:6083]</isis>
-<!--           
-               <isis type="display">607a. 607b / </isis>
-               <isis type="display" filter="mem_lookup" append="1">[hr:6073]</isis>
-               <isis type="index">607a 6073</isis>
-               <isis type="index" append="1">;;607a / </isis>
-               <isis type="index" filter="mem_lookup" append="1">[hr:6073]</isis>
-       
-               <isis type="display">608a. 608b / </isis>
-               <isis type="display" filter="mem_lookup" append="1">[hr:6083]</isis>
-               <isis type="index">608a 6083</isis>
-               <isis type="index" append="1">;;608a / </isis>
-               <isis type="index" filter="mem_lookup" append="1">[hr:6083]</isis>
--->    
        </SubjectIndexHR>
        
        <SubjectIndexHR2 name="Predmetno kazalo:" order="600" iterate_by_page="1" index_delimiter=";;">
@@ -465,11 +442,16 @@
                        --><value>4621;;462a</value>
                </isis>
        </Subset>
-
+<!--
        <Peace name="Dio: " 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">
+               <isis type="display" format_name="IDbib" format_delimiter=";;" filter="mem_lookup">4631;;[naslov:4631]</isis>
+       </Peace>
+
        <URL name="URL :" order="195" iterate_by_page="1">
                 <isis type="display" >856z 856u</isis>
                <!-- <isis type="display" append="1">

diff --git a/import_xml/isis_hidra_ths_nt.xml b/import_xml/isis_hidra_ths_nt.xml
index 3a0dc08..432c116 100644 (file)
--- a/import_xml/isis_hidra_ths_nt.xml
+++ b/import_xml/isis_hidra_ths_nt.xml
@@ -20,11 +20,16 @@
        </LookupThesNT>
 
        <SubjectIndex name="Predmetno kazalo" order="301">
-               <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}hr:900 => / [5624] 562a</isis>
+               <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}hr:900 => [5624] 562a</isis>
                <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}hr:900 => [251]</isis>
-               <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}en:900 => / [5724] 572a</isis>
+               <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}en:900 => [5724] 572a</isis>
                <isis filter="mem_lookup" type="display">eval{v901^a eq "Deskriptor"}en:900 => [251]</isis>
        </SubjectIndex>
        
+
+       <Peace name="Dio">
+               <isis filter="mem_lookup" type="display">naslov:900 => 200a [200b] = 200d : 200e / 200f ; 200g ; 200v</isis>
+       </Peace>
+       
     </indexer>
 </config>

diff --git a/template_html-hidra/search-bib.html b/template_html-hidra/search-bib.html
index a5636bc..1ebad26 100644 (file)
--- a/template_html-hidra/search-bib.html
+++ b/template_html-hidra/search-bib.html
@@ -174,14 +174,16 @@
 
 <p>     
 <table border="0">
-<tr><td class="navigacija" style='text-align:justify'>Selekciju podataka mo¾ete suziti upisom u rubriku za naslov:
-<ul>
-<li><b>online</b> za podatke s poveznicom na cjelovit tekst</li>
-<li><b>usklaðeno</b> za Zakonodavstvo usklaðeno s EU</li>
-</ul>
-</td></tr>
+<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>
+</tr>
 </table>
-
+<br>&nbsp;
 <table border="0">
 <tr>
        <td class="label1">