local changes from hidra.srce.hr

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

diff --git a/all2xml.conf b/all2xml.conf
index dea96af..f1ecd4f 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -5,27 +5,27 @@
 # narrow term must be first!
 
 [hidra-ths-h-nt]
-       isis_db=/data/hidra/THS/THS
+       isis_db=/data/isis/THS/THS
        type=isis_hidra_ths_nt
 
 [hidra-bib-lookup]
-       isis_db=/data/hidra/SDRH-H/BIB
+       isis_db=/data/isis/SDRH-H/BIB
        type=isis_hidra_bib_lookup
 
 [hidra-bib-en-lookup]
-       isis_db=/data/hidra/SDRH-E/BIB
+       isis_db=/data/isis/SDRH-E/BIB
        type=isis_hidra_bib_lookup
 
 [hidra-adr-lookup]
-       isis_db=/data/hidra/TDU-H/ADR
+       isis_db=/data/isis/TDU-H/ADR
        type=isis_hidra_adr_lookup
 
 [hidra-adr-en-lookup]
-       isis_db=/data/hidra/TDU-E/ADR
+       isis_db=/data/isis/TDU-E/ADR
        type=isis_hidra_adr_en_lookup
 
 [hidra-ths-h]
-       isis_db=/data/hidra/THS/THS
+       isis_db=/data/isis/THS/THS
        type=isis_hidra_ths
        line=.............................................................
 
@@ -38,7 +38,7 @@
 ## PROPISI REPUBLIKE HRVATSKE
 
 [hidra-sdrh-h]
-       isis_db=/data/hidra/SDRH-H/BIB
+       isis_db=/data/isis/SDRH-H/BIB
        type=isis_hidra_bib
        collection_code=SDRH_H
        library_url=http://www.hidra.hr/
@@ -46,7 +46,7 @@
        dbname=hidra-sdrh-h
 
 [hidra-sdrh-e]
-       isis_db=/data/hidra/SDRH-E/BIB
+       isis_db=/data/isis/SDRH-E/BIB
        type=isis_hidra_bib_en
        collection_code=SDRH_E
        library_url=http://www.hidra.hr/
@@ -56,7 +56,7 @@
 ## DOKUMENTACIJA POLITIÈKIH STRANAKA REPUBLIKE HRVATSKE
 
 [hidra-bibs-h]
-       isis_db=/data/hidra/BIBS-H/BIB
+       isis_db=/data/isis/BIBS-H/BIB
        type=isis_hidra_bibs
        collection_code=BIBS_H
        library_url=http://www.hidra.hr/
@@ -64,7 +64,7 @@
        dbname=hidra-bibs-h
 
 [hidra-bibs-e]
-       isis_db=/data/hidra/BIBS-E/BIB
+       isis_db=/data/isis/BIBS-E/BIB
        type=isis_hidra_bibs_en
        collection_code=BIBS_E
        library_url=http://www.hidra.hr/
@@ -75,7 +75,7 @@
 ## SLU®BENA DOKUMENTACIJA STRANIH ZEMALJA
 
 [hidra-sdsz-h]
-       isis_db=/data/hidra/SDSZ-H/BIB
+       isis_db=/data/isis/SDSZ-H/BIB
        type=isis_hidra_bib
        collection_code=SDSZ_H
        library_url=http://www.hidra.hr/
@@ -83,7 +83,7 @@
        dbname=hidra-sdsz-h
 
 [hidra-sdsz-e]
-       isis_db=/data/hidra/SDSZ-E/BIB
+       isis_db=/data/isis/SDSZ-E/BIB
        type=isis_hidra_bib_en
        collection_code=SDSZ_E
        library_url=http://www.hidra.hr/
@@ -93,7 +93,7 @@
 ## SLU®BENA DOKUMENTACIJA MEÐUNARODNIH ORGANIZACIJA 
 
 [hidra-sdmo-h]
-       isis_db=/data/hidra/SDMO-H/BIB
+       isis_db=/data/isis/SDMO-H/BIB
        type=isis_hidra_bib
        collection_code=SDMO_H
        library_url=http://www.hidra.hr/
@@ -101,7 +101,7 @@
        dbname=hidra-sdmo-h
 
 [hidra-sdmo-e]
-       isis_db=/data/hidra/SDMO-E/BIB
+       isis_db=/data/isis/SDMO-E/BIB
        type=isis_hidra_bib_en
        collection_code=SDMO_E
        library_url=http://www.hidra.hr/
@@ -113,7 +113,7 @@
 ## ADRESAR
 
 [hidra-tdu-h]
-       isis_db=/data/hidra/TDU-H/ADR
+       isis_db=/data/isis/TDU-H/ADR
        type=isis_hidra_adr
        collection_code=TDU_H
        library_url=http://www.hidra.hr/
@@ -121,7 +121,7 @@
        dbname=hidra-tdu-h
 
 [hidra-tdu-e]
-       isis_db=/data/hidra/TDU-E/ADR
+       isis_db=/data/isis/TDU-E/ADR
        type=isis_hidra_adr_en
        collection_code=TDU_E
        library_url=http://www.hidra.hr/

diff --git a/httpd-hidra.conf b/httpd-hidra.conf
index 5c8c849..7f5b47c 100644 (file)
--- a/httpd-hidra.conf
+++ b/httpd-hidra.conf
@@ -13,15 +13,15 @@ Alias /webpac-hidra-adr-en /data/webpac-hidra/public_html-hidra
 Alias /webpac-hidra-ths /data/webpac-hidra/public_html-hidra
 #Alias /webpac-hidra-ths-en /data/webpac-hidra/public_html-hidra
 # default, da ne javlja gresku
-Redirect /webpac-hidra         http://mjesec.ffzg.hr/webpac-hidra-bib
-Redirect /webpac-hidra2                http://mjesec.ffzg.hr/webpac-hidra-bib
+Redirect /webpac-hidra         http://hidra.srce.hr/webpac-hidra-bib
+Redirect /webpac-hidra2                http://hidra.srce.hr/webpac-hidra-bib
 # /webpac-hidra2
-Redirect /webpac-hidra2-bib     http://mjesec.ffzg.hr/webpac-hidra-bib
-Redirect /webpac-hidra2-bib-en  http://mjesec.ffzg.hr/webpac-hidra-bib-en
-Redirect /webpac-hidra2-adr     http://mjesec.ffzg.hr/webpac-hidra-adr
-Redirect /webpac-hidra2-adr-en  http://mjesec.ffzg.hr/webpac-hidra-adr-en
-Redirect /webpac-hidra2-ths     http://mjesec.ffzg.hr/webpac-hidra-ths
-#Redirect /webpac-hidra2-ths-en  http://mjesec.ffzg.hr/webpac-hidra-ths-en
+Redirect /webpac-hidra2-bib     http://hidra.srce.hr/webpac-hidra-bib
+Redirect /webpac-hidra2-bib-en  http://hidra.srce.hr/webpac-hidra-bib-en
+Redirect /webpac-hidra2-adr     http://hidra.srce.hr/webpac-hidra-adr
+Redirect /webpac-hidra2-adr-en  http://hidra.srce.hr/webpac-hidra-adr-en
+Redirect /webpac-hidra2-ths     http://hidra.srce.hr/webpac-hidra-ths
+#Redirect /webpac-hidra2-ths-en  http://hidra.srce.hr/webpac-hidra-ths-en
 #
 AddHandler cgi-script .cgi
 <Directory /data/webpac-hidra/public_html-hidra/>
@@ -30,5 +30,7 @@ AddHandler cgi-script .cgi
        AllowOverride None
        Order allow,deny
        Allow from all
+       SetEnv LC_COLLATE hr_HR
+       SetEnv LC_CTYPE hr_HR
 </Directory>
 

diff --git a/import_xml/isis_hidra_bib_en.xml b/import_xml/isis_hidra_bib_en.xml
index 7bf0f85..aa42cce 100644 (file)
--- a/import_xml/isis_hidra_bib_en.xml
+++ b/import_xml/isis_hidra_bib_en.xml
@@ -125,7 +125,7 @@
                -->
                
                <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>
@@ -219,8 +219,8 @@
                <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 7123;;712a, 712b</isis>
+       <OtherResponsibilitiesCorp name="Responsibilities: " iterate_by_page="1" order="26">
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">712a 712b 7123;;712a, 712b -- 712w</isis>
        </OtherResponsibilitiesCorp>
 
        <Title name="TITLE: " order="30">
@@ -253,7 +253,7 @@
                <isis type="display">210a : 210c, 210d</isis>
        </Publication>
        
-       <PhisicalDescription name="Materijal desc.: " order="45">
+       <PhisicalDescription name="Material desc.: " order="45">
                <isis type="display">215a : 215c ; 215d</isis>
        </PhisicalDescription>
 
@@ -303,10 +303,9 @@
        </ContentsNote>
                
        <UniformConventionalHeading name="Uniform Conventional Heading: " order="75">
-               <!--<isis type="display">503a</isis>-->
+               <isis type="display">503a</isis>
        </UniformConventionalHeading>
 
-
        <ParallelTitle name="Parallel Title Proper: " iterate_by_page="1" order="80">
                <isis type="display" >
                        <!--<delimiter>, </delimiter>-->
@@ -315,10 +314,10 @@
        </ParallelTitle>
 
        <VariantTitle name="Other Variant Titles: " iterate_by_page="1" order="85">
-               <!--<isis type="display" >
-                       <delimiter>, </delimiter>
+               <isis type="display" >
+                       <!--<delimiter>, </delimiter>-->
                        <value>517a</value>
-               </isis>-->
+               </isis>
        </VariantTitle>
 
        <FormerTitleProper name="Former Title (Serials): " iterate_by_page="1" order="90">
@@ -329,12 +328,11 @@
        </FormerTitleProper>
 
        <ExpandedTitle name="Expanded Title: " order="95">
-               <!--<isis type="display">532a</isis>-->
+               <isis type="display">532a</isis>
        </ExpandedTitle>
 
        <AdditionalTitle name="Additional Title Supplied by Cataloguer: " order="100">
-               <!--<isis type="display">540a</isis>-->
-
+               <isis type="display">540a</isis>
        </AdditionalTitle>
 
        <TranslatedTitle name="Title Translation Supplied by Cataloguer: " order="105">

diff --git a/template_html-hidra/index_res-bib.html b/template_html-hidra/index_res-bib.html
index 64ce026..229350f 100644 (file)
--- a/template_html-hidra/index_res-bib.html
+++ b/template_html-hidra/index_res-bib.html
@@ -12,7 +12,7 @@
 </form>
 -->
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-bib/">Formular za pretra¾ivanje</a>
+       <a href="http://hidra.srce.hr/webpac-hidra-bib/">Formular za pretra¾ivanje</a>
 </div>
 
 

diff --git a/template_html-hidra/index_res.html b/template_html-hidra/index_res.html
index c02ddd7..839ab6d 100644 (file)
--- a/template_html-hidra/index_res.html
+++ b/template_html-hidra/index_res.html
@@ -14,7 +14,7 @@
 
 
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-adr/">Formular za pretra¾ivanje</a>
+       <a href="http://hidra.srce.hr/webpac-hidra-adr/">Formular za pretra¾ivanje</a>
 </div>
 
 

diff --git a/template_html-hidra/results-adr-en.html b/template_html-hidra/results-adr-en.html
index db9311a..cfb0a6c 100644 (file)
--- a/template_html-hidra/results-adr-en.html
+++ b/template_html-hidra/results-adr-en.html
@@ -16,7 +16,7 @@
 Directory of state bodies and public institutions of Republic of Croatia</font></h4>
 
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-adr-en/"><H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">Search form</font></H5></a>
+       <a href="http://hidra.srce.hr/webpac-hidra-adr-en/"><H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">Search form</font></H5></a>
 </div>
 
 

diff --git a/template_html-hidra/results-adr.html b/template_html-hidra/results-adr.html
index 1ba61df..f7b877b 100644 (file)
--- a/template_html-hidra/results-adr.html
+++ b/template_html-hidra/results-adr.html
@@ -18,7 +18,7 @@ Adresar tijela javne vlasti Republike Hrvatske</font></h4>
 
 
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-adr/"><H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">Formular za pretra¾ivanje</font></H5></a>
+       <a href="http://hidra.srce.hr/webpac-hidra-adr/"><H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">Formular za pretra¾ivanje</font></H5></a>
 </div>
 
 

diff --git a/template_html-hidra/results-bib-en.html b/template_html-hidra/results-bib-en.html
index 74c6f98..d748a83 100644 (file)
--- a/template_html-hidra/results-bib-en.html
+++ b/template_html-hidra/results-bib-en.html
@@ -17,7 +17,7 @@
 E-Catalogue of official documentation of Republic of Croatia</font></h4> 
 
 <div class="navigacija">
-       <H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none"><a href="http://mjesec.ffzg.hr/webpac-hidra-bib-en/">Search form</a></font></H5>
+       <H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none"><a href="http://hidra.srce.hr/webpac-hidra-bib-en/">Search form</a></font></H5>
 </div>
 
 <H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">

diff --git a/template_html-hidra/results-bib.html b/template_html-hidra/results-bib.html
index 2aaf76e..7ef75ac 100644 (file)
--- a/template_html-hidra/results-bib.html
+++ b/template_html-hidra/results-bib.html
@@ -20,7 +20,7 @@ E-katalog slu
 
 
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-bib/">
+       <a href="http://hidra.srce.hr/webpac-hidra-bib/">
        <H5><font WEIGHT="600" COLOR="#003399" STYLE="normal" FAMILY="Arial, sans-serif" TEXT-DECORATION="none">Formular za pretra¾ivanje</a></font></H5>
 </div>
 

diff --git a/template_html-hidra/results.html b/template_html-hidra/results.html
index de9e17d..b034f15 100644 (file)
--- a/template_html-hidra/results.html
+++ b/template_html-hidra/results.html
@@ -15,7 +15,7 @@
 -->
 
 <div class="navigacija">
-       <a href="http://mjesec.ffzg.hr/webpac-hidra-bib/">Formular za pretra¾ivanje</a>
+       <a href="http://hidra.srce.hr/webpac-hidra-bib/">Formular za pretra¾ivanje</a>
 </div>
 
 

diff --git a/template_html-hidra/search-bib-en.html b/template_html-hidra/search-bib-en.html
index 705b346..b7deea2 100644 (file)
--- a/template_html-hidra/search-bib-en.html
+++ b/template_html-hidra/search-bib-en.html
@@ -173,7 +173,6 @@ Catalogue of official documentation of Republic of Croatia</font></h4>
 </tr>
 </table>
 <!--
-<p>     
 <table border="0">
 <tr><td class="navigacija" style='text-align:justify'>Set search limits by entering in the title box:
 <ul>
@@ -183,21 +182,19 @@ Catalogue of official documentation of Republic of Croatia</font></h4>
 </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>
-
+<tr><td>&nbsp;</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="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="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>
@@ -287,7 +284,6 @@ Catalogue of official documentation of Republic of Croatia</font></h4>
 </td></tr>
 <!--
 </table>
-<p>
 <table border="0" cellpadding=6 cellspacing=0  >
 
 <tr><td ><hr></td></tr>

diff --git a/template_html-hidra/search-bib.html b/template_html-hidra/search-bib.html
index 3ebb5ec..f771700 100644 (file)
--- a/template_html-hidra/search-bib.html
+++ b/template_html-hidra/search-bib.html
@@ -174,20 +174,20 @@ E-katalog slu
 </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"> pregled zapisa s poveznicom na cjelovit tekst<p>
+<br><input type="checkbox" name="v10" value="online"> pregled zapisa s poveznicom na cjelovit tekst
 </td>
 </tr>
+<tr><td>&nbsp;</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="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="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>
@@ -288,7 +288,6 @@ E-katalog slu
 </td></tr>
 <!--
 </table>
-<p>
 <table border="0" cellpadding=6 cellspacing=0  >
 
 <tr><td ><hr></td></tr>

diff --git a/template_html-hidra/search-ths.html b/template_html-hidra/search-ths.html
index 42a4dd0..f3c0881 100644 (file)
--- a/template_html-hidra/search-ths.html
+++ b/template_html-hidra/search-ths.html
@@ -44,7 +44,9 @@
    </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>
+<!--   
+       <td><input value="Kazalo" name="f9_index" class="navigacija" type="submit"></td>
+-->
 
 </tr>
 <tr><td colspan="3"><p>&nbsp;</p></td></tr>