local changes

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

diff --git a/all2xml.conf b/all2xml.conf
index b50b52a..fb5f95c 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -92,48 +92,6 @@
        dblanguage=en
        dbname=hidra-sdmo-e
 
-#[hidra-nn-h]
-#      isis_db=/data/hidra/NN-H/BIB
-#      type=isis_hidra_bib
-#      collection_code=NN_H
-#      library_url=http://www.hidra.hr/
-#      dblanguage=hr
-
-#[hidra-nn-e]
-#      isis_db=/data/hidra/NN-E/BIB
-#      type=isis_hidra_bib_en
-#      collection_code=NN_E
-#      library_url=http://www.hidra.hr/
-#      dblanguage=en
-
-#[hidra-mul-h]
-#      isis_db=/data/hidra/MUL-H/BIB
-#      type=isis_hidra_bib
-#      collection_code=MUL_H
-#      library_url=http://www.hidra.hr/
-#      dblanguage=hr
-
-#[hidra-mul-e]
-#      isis_db=/data/hidra/MUL-E/BIB
-#      type=isis_hidra_bib_en
-#      collection_code=MUL_E
-#      library_url=http://www.hidra.hr/
-#      dblanguage=en
-
-#[hidra-bil-h]
-#      isis_db=/data/hidra/BIL-H/BIB
-#      type=isis_hidra_bib
-#      collection_code=BIL_H
-#      library_url=http://www.hidra.hr/
-#      dblanguage=hr
-
-#[hidra-bil-e]
-#      isis_db=/data/hidra/BIL-E/BIB
-#      type=isis_hidra_bib_en
-#      collection_code=BIL_E
-#      library_url=http://www.hidra.hr/
-#      dblanguage=en
-
 ## ADR baze ##
 
 ## ADRESAR
@@ -154,33 +112,4 @@
        dblanguage=en
        dbname=hidra-tdu-e
 
-#[hidra-adr-h]
-#      isis_db=/data/hidra/ADR-H/ADR
-#      type=isis_hidra_adr
-#      collection_code=ADR_H
-#      library_url=http://www.hidra.hr/
-
-#[hidra-tsz-h]
-#      isis_db=/data/hidra/TSZ-H/ADR
-#      type=isis_hidra_adr
-#      collection_code=TSZ_H
-#      library_url=http://www.hidra.hr/
-
-#[hidra-tsz-e]
-#      isis_db=/data/hidra/TSZ-E/ADR
-#      type=isis_hidra_adr_en
-#      collection_code=TSZ_E
-#      library_url=http://www.hidra.hr/
-
-#[hidra-str-h]
-#      isis_db=/data/hidra/STR-H/ADR
-#      type=isis_hidra_adr
-#      collection_code=STR_H
-#      library_url=http://www.hidra.hr/
-
-#[hidra-str-e]
-#      isis_db=/data/hidra/STR-E/ADR
-#      type=isis_hidra_adr_en
-#      collection_code=STR_E
-#      library_url=http://www.hidra.hr/
 

diff --git a/import_xml/isis_hidra_adr.xml b/import_xml/isis_hidra_adr.xml
index 7a496ae..c20f01b 100644 (file)
--- a/import_xml/isis_hidra_adr.xml
+++ b/import_xml/isis_hidra_adr.xml
@@ -36,11 +36,12 @@
                <config type="swish">collection_code</config>
        </Collection>
 
-       <Name name="Naziv tijela: " order="10">
+       <Name name="Naziv tijela: " order="10" iterate_by_page="1" index_delimiter=";;">
                <isis>210</isis>
-               <isis type="swish">710</isis>
-               <isis type="index">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>
        </Name>
 
        <AddrNote name="Napomena: " order="20">

diff --git a/import_xml/isis_hidra_adr_en.xml b/import_xml/isis_hidra_adr_en.xml
index 6ef51ae..3e9cb46 100644 (file)
--- a/import_xml/isis_hidra_adr_en.xml
+++ b/import_xml/isis_hidra_adr_en.xml
@@ -35,13 +35,21 @@
                <isis type="swish">981a</isis>
                <config type="swish">collection_code</config>
        </Collection>
-
+<!--
        <Name name="Name: " order="10">
                <isis>210</isis>
                <isis type="swish">710</isis>
                <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>
+               <isis type="index">710</isis>
+               <isis type="index" append="1">;;710a</isis>
+               <isis type="index">210</isis>
+       </Name>
 
        <AddrNote name="Note: " order="20">
                <isis type="display">300</isis>
@@ -59,9 +67,9 @@
                <isis type="display">217</isis>
        </Communications>
 
-       <URL name="URL: " order="60">
-               <isis type="display">856</isis>
-       </URL>
+       <URL name="URL" iterate_by_page="1" order="60">
+               <isis type="display">856z 856u</isis>
+      </URL>
        
        <Function name="Functions: " iterate_by_page="1" order="70">
                <isis type="swish">204</isis>

diff --git a/import_xml/isis_hidra_bib.xml b/import_xml/isis_hidra_bib.xml
index 97ccc27..01275c0 100644 (file)
--- a/import_xml/isis_hidra_bib.xml
+++ b/import_xml/isis_hidra_bib.xml
@@ -158,6 +158,25 @@
 -->    
        </SubjectIndexHR>
        
+       <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" append="1"> / 606a</isis>
+
+               <isis type="index">601a 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" append="1"> / 607a</isis>
+               
+               <isis type="index">608a 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>
@@ -224,7 +243,7 @@
        </OtherResponsibilitiesCorp>
        
        <Title name="NASLOV: " order="30">
-               <isis type="swish">200a 200b 200d 200e</isis>
+               <isis type="swish">200a 200d 200e</isis>
                <isis type="display" filter="brackets">200a</isis>
                <isis type="display" append="1"> [200b]</isis>
                <isis type="display" append="1"> : 200e</isis>

diff --git a/template_html-hidra/search-adr-en.html b/template_html-hidra/search-adr-en.html
index bff2f04..28bcc62 100644 (file)
--- a/template_html-hidra/search-adr-en.html
+++ b/template_html-hidra/search-adr-en.html
@@ -207,18 +207,18 @@
     <tr><td class="navigacijaT" style='text-align:justify' >
         <ul>
 
-        <li>You can search by entering the words or beginning of the words in search boxes.</li> 
-        <li>Search results are records of matching data represented by institution names.</li>
+        <li>Searching is performed either by the beginning of a word (enter three letters at least) or by a whole word entered into one or several offered     search categories.</li> 
+        <li>The search result is a list of  titles of the bodies in the record of wich the searched data is found.</li>
 
-        <li>Blank between two words stands for logic operator "and".</li>
+        <li>The blank space between two words has a meaning of the logical operator AND. OR and NOT operators are also used.</li>
 
-        <li>Letters of foreign languages should be entered without diacritical marks.</li>
+        <li>Letters of foreign languages must be entered without the diacritic marks.</li>
 
                       
-       <li>Indexes start with letters entered in search box; from beginning if no letters entered or no entry found.</li>
-        <li>Institution names are based on 
+       <li>Indexes are presented from the specified beginning of  a term or taken as a whole when the beginning is not specified or there exists no term       with the entered beginning.</li>
+        <li>Titles of the public authorities of the Republic of Croatia are used from the 
        <a href="http://www.hidra.hr/eurovoc/tekstovi1/euv_uvodh.htm">
-       Croatian Addendum to Eurovoc thesaurus</a>.</li>
+       Croatian appendix to the Eurovoc Thesaurus.</a>.</li>
 
        </ul>
         </td></tr>

diff --git a/template_html-hidra/search-bib.html b/template_html-hidra/search-bib.html
index 5c206c4..a5636bc 100644 (file)
--- a/template_html-hidra/search-bib.html
+++ b/template_html-hidra/search-bib.html
@@ -193,6 +193,16 @@
        </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">
+       </td>
+       <td>&nbsp;</td>
+</tr>
 <tr>
        <td class="label1">
          <input type="hidden" name="f7" value="CorporateBodyIndexHR">