local changes

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

diff --git a/all2xml.conf b/all2xml.conf
index c5bc3d0..54ab847 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -21,6 +21,7 @@
        collection_code=SDRH_H
        library_url=http://www.hidra.hr/
        dblanguage=hr
+       dbname=hidra-sdrh-h
 
 [hidra-sdrh-e]
        isis_db=/data/hidra/SDRH-E/BIB
@@ -28,6 +29,7 @@
        collection_code=SDRH_E
        library_url=http://www.hidra.hr/
        dblanguage=en
+       dbname=hidra-sdrh-e
        
 
 #[hidra-sdsz-h]

diff --git a/all2xml.pl b/all2xml.pl
index c2d258c..0f9d097 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -481,7 +481,7 @@ sub data2xml {
                        if ($val) {
                                $display_data .= $delimiter.$val if ($d);
                                $swish_data .= " ".$val if ($s);
-                               $index->insert($field, $val, $path) if ($i);
+                               $index->insert($field, $val, $val, $path) if ($i);
                        }
 
                        if ($iterate_by_page) {

diff --git a/template_html-hidra/index_res-bib.html b/template_html-hidra/index_res-bib.html
index 666f018..0e6ea8d 100644 (file)
--- a/template_html-hidra/index_res-bib.html
+++ b/template_html-hidra/index_res-bib.html
@@ -26,7 +26,7 @@ Your index lookup on <TMPL_VAR field> for '<TMPL_VAR limit>' returned...
 <TMPL_LOOP NAME="PAGER_DATA_LIST">
   <TR>
        <td class="index">
-       <a href="?rm=results&f1=<TMPL_VAR name="field">&v1=<TMPL_VAR name="item">&e1=1" class="headline"><TMPL_VAR NAME="display"></a>
+       <a href="?rm=results&f1=<TMPL_VAR name="field">&v1=<TMPL_VAR name="item">&e1=1&path=<TMPL_VAR name="filter">*" class="headline"><TMPL_VAR NAME="display"></a>
        <!-- ordinal number in index -->
        <!--
        <small>[<TMPL_VAR NAME="count">]</small>

diff --git a/template_html-hidra/search-adr-en.html b/template_html-hidra/search-adr-en.html
index 5a724f5..d5aeaad 100644 (file)
--- a/template_html-hidra/search-adr-en.html
+++ b/template_html-hidra/search-adr-en.html
@@ -1,4 +1,5 @@
-
+<TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
+<tr><td width=520>
 <form name="search" method="get" action="?">
 <input type="hidden" name="rm" value="results">
 <input type="hidden" name="persist_search" value="11">
@@ -8,9 +9,14 @@
 
 <table border="0">
 <tr>
-<td class=tpn12><b><a href="http://www.hidra.hr/rh/rh.htm">Help</a></b></td>
+<td class=tpn12 colspan="2"></td>
+<td  align="right"><input type="submit" value="Search !" class="navigacija">
+</td>
+
+</tr>
+<tr>
+<td class=tpn12></td>
 <td colspan="2" align="right">
-<input type="submit" value="Search !" class="navigacija">
 </td>
 </tr>
 <!--
@@ -145,7 +151,7 @@
 
 <!--
 
-<table border="0">
+<table border="1">
    <tr> 
         <td colspan="4" class=tpn12><b><a href="" title="">Ogranicenja:</a></b>
          </td>
@@ -185,14 +191,38 @@
 
 
 -->
+<input type="hidden" name="f11" value="Collection">
+<input type="hidden" name="v11" value="ADR_E" checked>
 
-
-          <div align="center">
-               <input type="submit" value="Search !" class="navigacija">
+          <div align=right>
+               <!--<input type="submit" value="Search !" class="navigacija">-->
                <input type="reset" value="Clear form !" name="reset" class="navigacija">
           </div>
 
-<input type="hidden" name="f11" value="Collection">
-<input type="hidden" name="v11" value="ADR_E" checked>
+
+
+    <table >
+    <tr><td class="tdH1">&nbsp;</td></tr>
+    <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>Blank between two words stands for logic operator "and".</li>
+
+        <li>Letters of foreign languages should be entered without diacritical 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 
+       <a href="http://www.hidra.hr/eurovoc/tekstovi1/uvodh.htm">
+       Croatian Addendum to Eurovoc thesaurus</a>.</li>
+
+       </ul>
+        </td></tr>
+    
+    </table>
        
 </form>
+</td></tr>

diff --git a/template_html-hidra/search-adr.html b/template_html-hidra/search-adr.html
index b161743..633b702 100644 (file)
--- a/template_html-hidra/search-adr.html
+++ b/template_html-hidra/search-adr.html
@@ -1,65 +1,58 @@
-
-<form name="search" method="get" action="?">
-<input type="hidden" name="rm" value="results">
-<input type="hidden" name="persist_search" value="11">
-
-
-<p>&nbsp;
-
-<table border="0">
-<tr>
-<td class=tpn12><b><a href="http://www.hidra.hr/rh/rh.htm">Pomoæ</a></b></td>
-<td colspan="2" align="right">
-<input type="submit" value="Pretra¾i !" class="navigacija">
-</td>
-</tr>
-<!--
-<tr>
-       <td colspan="3"><b>Pretra¾ivanje adresara</b></td>
-</tr>
--->
-
-<tr>
-       <td class="inputfield">
-       <select name="f10">
-            <option value="Name" selected>Naziv tijela</option>
-            <option value="Function">Funkcija</option>
-           <option value="Official">Du¾nosnik</option>
-           <option value="Field">Podruèje djelatnosti</option>
-           <!-- <option value="Activity">Djelatnost</option>-->
-            <option value="AllAddr">Pretra¾i sve podatke</option>
-        </select>
-        </td>
-        <td>
-         <input  size="30" name="v10">
-       </td>
-        <td>
-       
-         <input type="submit" value="Kazalo" name="f10_index" class="navigacija">
-       
-       </td>
-</tr>
-<tr>
-       <td class="inputfield">
-       <select name="f11">
-            <option value="Function" selected>Funkcija</option>
-           <option value="Official">Du¾nosnik</option>
-            <option value="Name">Naziv tijela</option>
-           <option value="Field">Podruèje djelatnosti</option>
-             <!--<option value="Activity">Djelatnost</option>-->
-            <option value="AllAddr">Pretra¾i sve podatke</option>
-        </select>
-        </td>
-        <td>
-         <input  size="30" name="v11">
-       </td>
-        <td>
-       
-
-         <input type="submit" value="Kazalo" name="f11_index" class="navigacija">
-        
-       </td>
-</tr>
+<TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
+  <tr><td width=520>
+  <form name="search" method="get" action="?">
+  <input type="hidden" name="rm" value="results">
+  <input type="hidden" name="persist_search" value="11">
+  <p>&nbsp;
+  <table border="0">
+    <tr>
+    <td class=tpn12 colspan="2"> </td>
+    <td align="right"><input type="submit" value="Pretra¾i !" class="navigacija" name="submit"></td>
+    </tr>
+    <tr>
+    <td class=tpn12></td>
+    <td colspan="2" align="right">
+    </td>
+    </tr>
+                                                  <!--<tr><td colspan="3"><b>Pretra¾ivanje adresara</b></td></tr>-->
+
+    <tr>
+    <td class="inputfield">
+    <select name="f10">
+    <option value="Name" selected>Naziv tijela</option>
+    <option value="Function">Funkcija</option>
+    <option value="Official">Du¾nosnik</option>
+    <option value="Field">Podruèje djelatnosti</option>
+                                                 <!-- <option value="Activity">Djelatnost</option>-->
+    <option value="AllAddr">Pretra¾i sve podatke</option>
+    </select>
+    </td>
+    <td>
+    <input  size="30" name="v10">
+    </td>
+    <td>
+    <input type="submit" value="Kazalo" name="f10_index" class="navigacija">
+    </td>
+    </tr>
+
+    <tr>
+    <td class="inputfield">
+    <select name="f11">
+    <option value="Function" selected>Funkcija</option>
+    <option value="Official">Du¾nosnik</option>
+    <option value="Name">Naziv tijela</option>
+    <option value="Field">Podruèje djelatnosti</option>
+                                                 <!--<option value="Activity">Djelatnost</option>-->
+    <option value="AllAddr">Pretra¾i sve podatke</option>
+    </select>
+    </td>
+    <td>
+    <input  size="30" name="v11">
+    </td>
+    <td>
+    <input type="submit" value="Kazalo" name="f11_index" class="navigacija">
+    </td>
+    </tr>
 
 <tr>
        <td class="inputfield">
@@ -190,10 +183,36 @@
 <input type="hidden" name="f11" value="Collection">
 <input type="hidden" name="v11" value="ADR_H" checked>
 
-          <div align="center">
-               <input type="submit" value="Pretra¾i !" class="navigacija">
+          <div  align=right>
+               <!--<input type="submit" value="Pretra¾i !" class="navigacija">-->
                <input type="reset" value="Poni¹ti obrazac !" name="reset" class="navigacija">
           </div>
 
-       
+           <table >
+    <tr><td class="tdH1">&nbsp;</td></tr>
+    <tr><td class="navigacijaT" style='text-align:justify' >
+        <ul>
+
+        <li>Pretra¾uje se po poèetku svake rijeèi ili po cijeloj rijeèi upisanoj 
+       u jednu ili vi¹e ponuðenih kategorija za pretra¾ivanje. </li> 
+
+        <li>Rezultat tra¾enja je popis naziva tijela u èijem se zapisu nalaze 
+       tra¾eni podaci.</li>
+
+        <li>Razmak izmeðu dviju rijeèi ima znaèenje logièkoga operatora "I" (AND). </li>
+
+        <li>Slova stranih jezika potrebno je upisati bez dijakritièkih znakova. </li>
+        
+       <li>Kazala se prikazuju od zadanog poèetka odrednice odnosno u cijelosti kad poèetak nije zadan ili ne postoji odrednica s upisanim poèetkom.</li>
+        
+       <li>Nazivi tijela javne vlasti RH preuzeti su iz 
+       <a href="http://www.hidra.hr/eurovoc/tekstovi1/uvodh.htm">
+       Hrvatskog dodatka Pojmovniku Eurovoc</a>. </li>
+
+       </ul>
+        </td></tr>
+    
+    </table>
 </form>
+</td></tr>
+</table>
\ No newline at end of file

diff --git a/template_html-hidra/search-bib-en.html b/template_html-hidra/search-bib-en.html
index 3627d3c..86fc5d1 100644 (file)
--- a/template_html-hidra/search-bib-en.html
+++ b/template_html-hidra/search-bib-en.html
@@ -1,26 +1,26 @@
-
+<TABLE WIDTH=520 CELLSPACING=0 CELLPADDING=0 BORDER=0>
+<tr><td width=520>
+<!--
 <table width="100%" border=0>
 <tr>
-       
-<!--
+
        <td class="small"><a href="/webpac-hidra2-adr/">adresar</a></td> 
        <td class="small"><a href="/webpac-hidra2-ths/">pojmovnik</a></td> 
--->    
+       
        <td class="tdH1">&nbsp;</td>
 </tr>
 <tr>
        <td class="small" colspan=2></td>
 </tr>
 
-<!--
 <tr>
        <td><font color="red">TRENUTNO NE RADI!!!!</font></td>
 </tr>
--->
 
-</table>
 
+</table>
 
+-->
 
 <form name="search" method="get" action="?">
 <input type="hidden" name="rm" value="results">
@@ -28,9 +28,9 @@
 
 <table border="0">
 <tr>
-       <td class=tpn12><b><a href="http://www.hidra.hr/dok/dok.htm">Help</a></b>
-       </td>
-        <td align="right"><input type="submit" value="Search !" class="navigacija"
+        <td class=tpn12> </td>
+       
+        <td align="right"><input type="submit" value="Search!" class="navigacija"
            name="submit">
        </td>
        <td>&nbsp;
@@ -116,7 +116,6 @@
             <option value="SubjectCorporateBodyName">Subject: body</option>
            <option value="SubjectPersonalName">Subject: person</option>
            <option value="SubjectForm">Subject: form</option>
-        </select>
        </td> 
         <td  valign="bottom"> 
           <input  size="30" name="v3">
@@ -171,11 +170,21 @@
        </td>
 </tr>
 </table>
-<br>
-<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>approximated</b> for Croatian laws harmonized with EU legislation</li>
+</ul>
+</td></tr>
+</table>
+
+<table border="0">
 <tr>
        <td class="label1">
-         <input type="hidden" name="f6" value="SubjectIndexEN">
+         <input type="hidden" name="f6" value="SubjectIndexHR">
           <input size="30" type="text" name="v6">
        </td>
        <td>
@@ -185,64 +194,107 @@
 </tr>
 <tr>
        <td class="label1">
-         <input type="hidden" name="f7" value="CorporateBodyIndexEN">
+         <input type="hidden" name="f7" value="CorporateBodyIndexHR">
           <input size="30" type="text" name="v7">
        </td>
        <td>
-         <input type="submit" value="Corporate authors index" name="f7_index" class="navigacija">
+         <input type="submit" value="Corporate responsibility index" name="f7_index" class="navigacija">
        </td>
        <td>&nbsp;</td>
 </tr>
 </table>
 <br>
-<table>
+<table border="0">
 <tr>
-       <td class="label1">Search all data</td>
+       <td class="navigacija">Search all data:</td>
        <td class="inputfield"> 
          <input type="hidden" name="f8" value="xml">
           <input type="text" size="30" name="v8" value="">
         </td>
-        <td><input type="submit" value="Search !" class="navigacija">
+        <td><input type="submit" value="Search!" class="navigacija">
        </td>
 </tr>
 </table>
 
 <br>
-<table border="0">
+<table border="0" >
+<!--
    <tr> 
-        <td colspan="4" class=tpn12><b><a href="http://www.hidra.hr/dok/dokrh.htm" title="O zbirkama">Collections:</a></b>
+        <td colspan="4" class=tpn12><b>Zbirke:</b>
          </td>
    </tr>
+-->
    <tr>
 
        <td class="limiter">
-       <input type="hidden" name="f11" value="Collection">
-       <input type="checkbox" name="v11" value="SDRH_E" checked>
-               Official documentation and general publications of Republic of Croatia<br>
-       <input type="checkbox" name="v11" value="NN_E" >
+        <input type="hidden" name="f11" value="Collection">
+        <input type="hidden" name="v11" value="SDRH_E">
+       <input type="hidden" name="filter" value="hidra-sdrh-e">
+       
+<!--
+       <input type="checkbox" name="v11" value="SDRH_H" checked>
+               Slu\9ebena dokumentacija i opæe publikacije Republike Hrvatske<br>
+       <input type="checkbox" name="v11" value="NN_H" >
                Narodne novine - zakonodavstvo Republike Hrvatske<br>
-       <input type="checkbox" name="v11" value="BIL_E" >
+
+       <input type="checkbox" name="v11" value="BIL_H" >
                Narodne novine - bilateralni ugovori Republike Hrvatske<br>
-       <input type="checkbox" name="v11" value="MUL_E" >
+       <input type="checkbox" name="v11" value="MUL_H" >
                Narodne novine - multilateralni ugovori Republike Hrvatske<br>
-<!--
-       <input type="checkbox" name="v11" value="SDSZ_E" >
-               Slu¾bena dokumentacija stranih zemalja<br>
-       <input type="checkbox" name="v11" value="SDMO_E" >
-               Slu¾bena dokumentacija meðunarodnih organizacija<br>
-       <input type="checkbox" name="v11" value="BIBS_E" >
-               Political parties documentation<br>
-       </td>
--->
+       <input type="checkbox" name="v11" value="SDSZ-H" >
+               Slu\9ebena dokumentacija stranih zemalja<br>
+       <input type="checkbox" name="v11" value="SDMO-H" >
+               Slu\9ebena dokumentacija meðunarodnih organizacija<br>
+
+       <input type="checkbox" name="v11" value="BIBS-H" >
+               Dokumentacija politièkih stranaka<br>
+-->    </td>
 </tr>
+
+
+<tr><td colspan="2">
+
+       <!--<div align="center">-->
+               <!--<input type="submit" value="Pretra\9ei !" class="navigacija">-->
+               <input type="reset" value="Clear form!" name="reset" class="navigacija">
+       <!--</div>-->
+</td></tr>
+<!--
 </table>
+<p>
+<table border="0" cellpadding=6 cellspacing=0  >
 
-<br>
+<tr><td ><hr></td></tr>
+-->
+<tr><td  class="navigacija" valign=top style='text-align:justify' >
+    <table >
+    <tr><td class="tdH1">&nbsp;</td></tr>
+    <tr><td class="navigacijaT" style='text-align:justify' >
+        <ul>
 
-       <div align="center">
-               <input type="submit" value="Search !" class="navigacija">
-               <input type="reset" value="Clear form !" name="reset" class="navigacija">
-       </div>
+        <li>You can search either by entering the first few letters of each word or 
+       by entering the whole word in one or more offered search boxes.</li> 
 
-       
+        <li>Blank between two words stands for logic operator "and".</li>
+
+        <li>Letters of foreign languages should be entered without diacritical marks.</li>
+
+        <li>Eurovoc thesaurus descriptors are used as subject headings of publications 
+       and documents: corporate bodies names, geographical names and other subject terms.</li>
+        
+       <li>The Croatian public authority bodies, in their corporate responsibility as authors, publishers, draftsmen, drafters of 
+       the legislation and other associates, are represented by their standarized names based on 
+       <a href="http://www.hidra.hr/eurovoc/tekstovi1/uvodh.htm">
+       Croatian Addendum to Eurovoc thesaurus</a>.</li>
+        
+       <li>Indexes start from first letters that were entered; from beginning if no first letters were entered or no related subject heading was found.</li>
+
+       </ul>
+        </td></tr>
+    
+    </table>
+</td></tr>     
+</table>
+</td></tr>     
+</table>
 </form>

diff --git a/template_html-hidra/search-bib.html b/template_html-hidra/search-bib.html
index 627615b..8097f92 100644 (file)
--- a/template_html-hidra/search-bib.html
+++ b/template_html-hidra/search-bib.html
@@ -277,7 +277,7 @@
         <li>Slova stranih jezika potrebno je upisati bez dijakritièkih znakova.</li>
         <li>Predmet sadr¾aja publikacija i dokumenata oznaèuju deskriptori Pojmovnika Eurovoc: nazivi korporativnih tijela, tematske i zemljopisne odrednice.
         <li>Korporativne odgovornosti èine normirani nazivi tijela javne vlasti RH iz <a href="http://www.hidra.hr/eurovoc/tekstovi1/uvodh.htm">Hrvatskoga dodatka Pojmovniku Eurovoc</a>: autori, izdavaèi, izraðivaèi nacrta, podnositelji i donositelji zakona te drugi suradnici.
-        <li>Kazala se prikazaju od zadanog slova ili poèetka rijeèi, a cijelo ukoliko nije zadan poèetak ili ne postoji odrednica s upisanim poèetkom.</ul>
+        <li>Kazala se prikazaju od zadanog poèetka odrednice, odnosno u cijelosti ukoliko poèetak nije zadan ili ne postoji odrednica s upisanim poèetkom.</ul>
         </td></tr>
     
     </table>