more local changes

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

diff --git a/TODO.hidra b/TODO.hidra
index e46ee87..366c836 100644 (file)
--- a/TODO.hidra
+++ b/TODO.hidra
@@ -11,19 +11,20 @@ OP
 rubrike od podataka
 
 ADR:
-- Du¾nosnik, Podruèje, Djelatnost - da budu linkovi (podaci æe se nalaziti
++ Du¾nosnik, Podruèje, Djelatnost - da budu linkovi (podaci æe se nalaziti
 u dva polja ^3link i ^apodatak)
-- Kazalo djelatnosti kao u BIB-u: odrednica / [xxxx] mikrotezaurus
-- Kazalo Podruèja: odrednica [xxxx] odnosno odrednica [xx] - prema tome
++ Kazalo djelatnosti kao u BIB-u: odrednica / [xxxx] mikrotezaurus
++ Kazalo Podruèja: odrednica [xxxx] odnosno odrednica [xx] - prema tome
 kakav kod imaju
-- Ne treba kazalo uz rubriku svih podataka
++ Ne treba kazalo uz rubriku svih podataka
 - staviti moguænost izbora baze
 
 BIB:
-- Odvojiti kod sekundarnih odgovornosti osobe od tijela znakom " ; " ili
-jo¹ bolje svakog u svoj red
++ Odvojiti kod sekundarnih odgovornosti osobe od tijela znakom " ; " ili
+jo¹ bolje svakog u svoj red (stavila svakog u svoj red, takoðer i kod
+primarnih)
 + Desna zagrada vi¹ka kod predmetnica (u prikazu jedinice i kazalima)
-- kod onih koji su podruèje ili mikrotezaurus uz odrednicu da pi¹e i kod:
++ kod onih koji su podruèje ili mikrotezaurus uz odrednicu da pi¹e i kod:
       mikrotezaurus [xxxx]
       podruèje [xx]
 
@@ -39,13 +40,13 @@ THS:
 + Maknuti ID kod prikaza jedinice
 + kod prikaza THS termina da jezici budu odijeljeni nekom crtom ili praznim
 redom ....(barem hrvatski od ostalih)
-- Kazalo klasifikacije treba sadr¾avati osim koda i podatak rijeèima
-- U Hit listu dodati iza naziva kodnu oznaku, za one koji u 901^aPodruèje
++ Kazalo klasifikacije treba sadr¾avati osim koda i podatak rijeèima
++ U Hit listu dodati iza naziva kodnu oznaku, za one koji u 901^aPodruèje
 ili ^aMikrotezaurus
       (npr. ekonomija [16], politika [04], oznaka iza da ne smeta abecedi)
 + Srodni nazivi - odvojiti * (sad su zarezom)
 - Ni¾i naziv - svakog u novi red
-- Maknuti pretra¾ivanje Podruèje hrv. .... umjesto toga staviti kazalo:
++ Maknuti pretra¾ivanje Podruèje hrv. .... umjesto toga staviti kazalo:
       Podruèja s mikrotezaurusima (sortano po kodu)
        [04] politika
        [0406] politièki okvir
@@ -53,9 +54,11 @@ ili ^aMikrotezaurus
        ....
       To su zapisi kojima u Izvor dopi¹ete Podruèje ili Mikrotezaurus
       (901^aPodruèje ili ^aMikrotezaurus)
-- U pretra¾ivanju se ne ukljuèuju polja 561 i 562 (slu¾e samo za linkanje u
++ U pretra¾ivanju se ne ukljuèuju polja 561 i 562 (slu¾e samo za linkanje u
 pikazu)
 
+---------------------------------------------------------------------
+
 + naziv rubrike velikim slovima HRVATSKI, ENGLESKI, FRANCUSKI, NJEMAÈKI
 + napraviti "select all/none/toggle" javascript na stranici sa rezultatima
 + razdvojite kod adresara: Funkcije/du¾nosnici na -      Funkcije (polje
@@ -86,7 +89,7 @@ bude
 + ako je jezika vi¹e neka budu odvojeni " ; "
 + U prikazu jedinice staviti na po¾etak polje 981^a - naziv rubrike je
 Zbirka:
-- ispisati label "Predmetno kazalo" samo jedanput u displayu
++ ispisati label "Predmetno kazalo" samo jedanput u displayu
 + predmetno kazalo sastoji se od polja: 606ab; 601ab; 607ab, 608ab
 + kazalo korporativnih autora: 710ab, 711ab, 712ab
 + dijakritici u indexu

diff --git a/all2xml.conf b/all2xml.conf
index 2aea8c8..225f5e1 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -14,14 +14,14 @@
        isis_db=/data/hidra/THS-H/THS
        type=isis_hidra_ths
        lookup_newfile=/data/webpac-hidra/thes.lookup
-       line=.......................................
+       line=.............................................................
 
 
 [hidra-bib-h]
 #      isis_db=/data/hidra/BIB-500/BIB
        isis_db=/data/hidra/BIB-H/BIB
        type=isis_hidra_bib
-       materialtype=Knjiga
+#      materialtype=Knjiga
 #      library=HIDRA
 #      library_url=http://www.hidra.hr/
        lookup_open=/data/webpac-hidra/thes.lookup

diff --git a/import_xml/isis_hidra_adr.xml b/import_xml/isis_hidra_adr.xml
index 217d8dd..54cfab7 100644 (file)
--- a/import_xml/isis_hidra_adr.xml
+++ b/import_xml/isis_hidra_adr.xml
@@ -21,6 +21,10 @@
                <a href="?rm=results&show_full=1&f=Field&v=%s">%s</a>
        ]]></format>
        
+       <format name="Official"><![CDATA[
+               <a href="?rm=results&show_full=1&f=Official&v=%s">%s</a>
+       ]]></format>
+       
     <indexer>
        <headline>
                <isis type="display">210</isis>
@@ -60,8 +64,9 @@
        </Function>
 
        <Official name="Du¾nosnik: " iterate_by_page="1" order="75">
-               <isis>700</isis>
-               <isis type="index">700</isis>
+               <isis type="swish">700</isis>
+               <isis type="index">700a</isis>
+               <isis type="display" format_name="Official" format_delimiter=";;">7003;;700a</isis>
        </Official>
        
        <Units name="Organizacijske jedinice: " iterate_by_page="1" order="80">
@@ -70,25 +75,24 @@
 
        <Field name="Podruèje: " iterate_by_page="1" index_delimiter=";;" order="90">
                <isis type="swish">608</isis>
-               <isis type="index">608a 6083 </isis>
-               <isis type="index" append="1">;;608a / </isis>
+               <isis type="index">608a 6083;;608a</isis>
                <isis type="index" append="1" lookup="1">6083</isis>
        </Field>
 
        <Field2 name="Podruèje: " iterate_by_page="1" format_name="Field" format_delimiter=";;" order="90">
-               <isis type="display">608a 6083;;608a /</isis>
+               <isis type="display">608a 6083;;608a</isis>
                <isis type="display" append="1" lookup="1">6083</isis>
        </Field2>
 
        <Activity name="Djelatnost: " iterate_by_page="1" index_delimiter=";;" order="100">
                <isis type="swish">606</isis>
                <isis type="index">606a 6063 </isis>
-               <isis type="index" append="1">;;606a / </isis>
+               <isis type="index" append="1">;;606a</isis>
                <isis type="index" append="1" lookup="1">6063</isis>
        </Activity>
        
        <Activity2 name="Djelatnost: " iterate_by_page="1" format_name="Activity" format_delimiter=";;" order="100">
-               <isis type="display">606a 6063;;606a /</isis>
+               <isis type="display">606a 6063;;606a</isis>
                <isis type="display" append="1" lookup="1">6063</isis>
        </Activity2>
 

diff --git a/import_xml/isis_hidra_bib.xml b/import_xml/isis_hidra_bib.xml
index f16bc33..6ad49e7 100644 (file)
--- a/import_xml/isis_hidra_bib.xml
+++ b/import_xml/isis_hidra_bib.xml
@@ -106,7 +106,7 @@ e   </ISBN>
                -->
                
                <isis type="index">606a 6063</isis>
-               <isis type="index" append="1">;;606a / </isis>
+               <isis type="index" append="1">;;606a</isis>
                <isis type="index" lookup="1" append="1">6063</isis>
 <!--
                <isis type="display">601a. 601b / </isis>
@@ -114,15 +114,15 @@ e </ISBN>
 -->
 
                <isis type="index">601a 6013</isis>
-               <isis type="index" append="1">;;601a / </isis>
+               <isis type="index" append="1">;;601a</isis>
                <isis type="index" lookup="1" append="1">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" lookup="1" append="1">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" lookup="1" append="1">6083</isis>
 <!--           
                <isis type="display">607a. 607b / </isis>
@@ -142,33 +142,33 @@ e </ISBN>
        <CorporateBodyIndex 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" lookup="1" append="1">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" lookup="1" append="1">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" lookup="1" append="1">7123</isis>
        </CorporateBodyIndex>
        
        <SubjectIndex2 name="Predmetno kazalo:" order="600" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
-               <isis type="display">606a 6063;;606a /</isis>
+               <isis type="display">606a 6063;;606a</isis>
                <isis type="display" lookup="1" append="1">6063</isis>
        </SubjectIndex2>
 
        <SubjectIndex3 name="Predmetno kazalo:" order="601" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
-               <isis type="display">601a 6013;;601a / </isis>
+               <isis type="display">601a 6013;;601a</isis>
                <isis type="display" lookup="1" append="1">6013</isis>
        </SubjectIndex3>
 
        <SubjectIndex4 name="Predmetno kazalo:" order="602" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
-               <isis type="display">607a 6073;;607a / </isis>
+               <isis type="display">607a 6073;;607a</isis>
                <isis type="display" lookup="1" append="1">6073</isis>
        </SubjectIndex4>
 
        <SubjectIndex5 name="Predmetno kazalo:" order="603" iterate_by_page="1" format_name="SubjectIndex" format_delimiter=";;">
-               <isis type="display">608a 6083;;608a / </isis>
+               <isis type="display">608a 6083;;608a</isis>
                <isis type="display" lookup="1" append="1">6083</isis>
        </SubjectIndex5>
 
@@ -189,16 +189,16 @@ e </ISBN>
                <isis type="swish" filter="swish_years">209b</isis>
        </Date>
 
-       <Author name="Autor(i): " order="20">
+       <Author name="Autor(i): " iterate_by_page="1" order="20">
                <isis type="display" format_name="Responsibility" format_delimiter=";;">700a 700b;;700a, 700b</isis>
-               <isis type="display" append="1" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">701a 701b;;701a, 701b </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" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">711a 711b;;711a. 711b</isis>
+               <isis type="display" append="1" format_name="Responsibility" format_delimiter=";;">711a 711b;; 711a. 711b</isis>
        </Author>
 
        <OtherResponsibilities name="Sekundarne odgovornosti: " iterate_by_page="1" order="25">
-               <isis type="display" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">702a 702b;;702a, 702b</isis> 
-               <isis type="display" append="1" delimiter=" ; " format_name="Responsibility" format_delimiter=";;">712a 712b;;712a, 712b</isis>
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">702a 702b;;702a, 702b</isis> 
+               <isis type="display" format_name="Responsibility" format_delimiter=";;">712a 712b;;712a, 712b</isis>
        </OtherResponsibilities>
 
        <Title name="Naslov: " order="30">

diff --git a/import_xml/isis_hidra_ths.xml b/import_xml/isis_hidra_ths.xml
index 3919c3a..23ea9d5 100644 (file)
--- a/import_xml/isis_hidra_ths.xml
+++ b/import_xml/isis_hidra_ths.xml
@@ -20,7 +20,8 @@
 
     <indexer>
        <headline>
-               <isis type="display">250a / [5624] 562a</isis>
+               <isis type="display">250a [251]</isis>
+               <isis type="display" append="1"> / [5624] 562a</isis> 
 <!--
                <config delimiter=" - ">materialtype</config>
                <config delimiter=" u knji¾nici: ">library</config>
@@ -51,10 +52,11 @@
        </line>
        
        <DescriptorHR name="HRVATSKI" order="10">
-               <isis type="swish">eval{v901^a eq "Deskriptor"}250a</isis>
+               <isis type="swish">250a</isis>
                <isis type="swish">450a</isis>
                <isis type="swish">330a</isis>
                <isis type="index">eval{v901^a eq "Deskriptor"}250a / [5624] 562a</isis>
+               <isis type="index">eval{v901^a ne "Deskriptor"}250a [251]</isis>
                <isis type="index">450a >> 250a / [5624] 562a</isis>
                <isis type="index">330a</isis>
                <isis type="display">[251]</isis>
@@ -70,7 +72,7 @@
        </ScopeNoteHR>
        
        <SubjectAreaHR name="Podruèje: " order="50">
-               <isis type="swish">250a</isis>
+               <isis type="swish">eval{v901^a ne "Deskriptor"}250a</isis>
                <isis type="index">eval{v901^a ne "Deskriptor"}[251] 250a</isis>
                <!--
                <isis type="index" append="1">[251]</isis>
@@ -102,12 +104,9 @@
                <!--
                <isis type="display" format_name="IDths" format_delimiter=";;" filter="mem_lookup" delimiter=" * ">[a:5614];;[d:[a:5614]]</isis>
                -->
-               <isis type="display" format_name="IDths" format_delimiter=";;"
-               filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Podruèje"} [a:251];;[d:[a:251]]</isis>
-               <isis type="display" format_name="IDths" format_delimiter=";;"
-               filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Mikrotezaurus"} [a:5614:251];;[d:[a:5614:251]]</isis>
-               <isis type="display" format_name="IDths" format_delimiter=";;"
-               filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Deskriptor"} [a:5614:5624:900];;[d:[a:5614:5624:900]]</isis>
+               <isis type="display" format_name="IDths" format_delimiter=";;" filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Podruèje"}[a:251];;[d:[a:251]]</isis>
+               <isis type="display" format_name="IDths" format_delimiter=";;" filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Mikrotezaurus"}[a:5614:251];;[d:[a:5614:251]]</isis>
+               <isis type="display" format_name="IDths" format_delimiter=";;" filter="mem_lookup" delimiter=" * ">eval{v901^a eq "Deskriptor"}[a:5614:5624:900];;[d:[a:5614:5624:900]]</isis>
 
 
        </NarrowerTerm> 
@@ -231,7 +230,8 @@
        </IDths>
 
        <SubjectIndex name="Predmetno kazalo" order="301">
-               <isis type="lookup_val">[5624] 562a</isis>
+               <isis type="lookup_val">eval{v901^a eq "Deskriptor"} / [5624] 562a</isis>
+               <isis type="lookup_val">eval{v901^a ne "Deskriptor"} [251]</isis>
                <!--
                <isis type="lookup_val" append="1"> 562a</isis>
                -->

diff --git a/public_html-hidra/style.css b/public_html-hidra/style.css
index 4422275..3843ac9 100644 (file)
--- a/public_html-hidra/style.css
+++ b/public_html-hidra/style.css
@@ -96,7 +96,17 @@ h2 {
 }
 
 .results {
-       font-size: 70%
+       font-size: 70%;
+        border-top-width: 0px;
+        border-left-width: 0px;
+        border-right-width: 0px;
+        border-bottom-width: 1px;
+        border-color: gray;
+        border-style: solid;
+}
+
+.index {
+       font-size: 80%;
 }
 
 .small {

diff --git a/template_html-hidra/index_res.html b/template_html-hidra/index_res.html
index 4fd18c8..d93a931 100644 (file)
--- a/template_html-hidra/index_res.html
+++ b/template_html-hidra/index_res.html
@@ -26,7 +26,7 @@ Your index lookup on <TMPL_VAR field> for '<TMPL_VAR limit>' returned...
 <TABLE BORDER=0 WIDTH="100%">
 <TMPL_LOOP NAME="PAGER_DATA_LIST">
   <TR>
-       <td>
+       <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>
        <!-- ordinal number in index -->
        <!--

diff --git a/template_html-hidra/results.html b/template_html-hidra/results.html
index 3080fa8..4f2347e 100644 (file)
--- a/template_html-hidra/results.html
+++ b/template_html-hidra/results.html
@@ -21,8 +21,8 @@
 <p>Va¹ upit "<TMPL_VAR search>" je pona¹ao <TMPL_VAR hits> rezultata...
 </p>
 
-<TABLE BORDER=1 WIDTH="100%">
-<TR><TD class="results" colspan=2>
+<TABLE BORDER=0 WIDTH="100%">
+<TR><TD class="results" colspan=2 align=center>
 
 <!-- FIXME
 <pre>
@@ -33,7 +33,7 @@ PAGER_offset: <TMPL_VAR PAGER_offset>
 
 <TMPL_IF NAME="full">
 
-<input type=submit value="Natrag na sve rezultate">
+<input type=submit value="Natrag na sve rezultate" class="navigacija">
 <input type="hidden" name="PAGER_offset" value="<TMPL_VAR last_PAGER_offset>" />
 
 </td></tr>
@@ -58,10 +58,10 @@ PAGER_offset: <TMPL_VAR PAGER_offset>
 
 <TMPL_ELSE>
 
-<input nowrap type=button value="+" onClick="do_checkbox('path',1)">
-<input nowrap type=button value="-" onClick="do_checkbox('path',0)">
-<input nowrap type=button value="&#177;" onClick="do_checkbox('path',-1)">
-<input type=submit name="show_full" value="Poka¾i detalje o odabranim jedinicama" onClick="PAGER_set_offset_and_submit(0);">
+<input nowrap type=button class="navigacija" value="+" onClick="do_checkbox('path',1)">
+<input nowrap type=button class="navigacija" value="-" onClick="do_checkbox('path',0)">
+<input nowrap type=button class="navigacija" value="&#177;" onClick="do_checkbox('path',-1)">
+<input type=submit class="navigacija" name="show_full" value="Poka¾i detalje o odabranim jedinicama" onClick="PAGER_set_offset_and_submit(<TMPL_VAR last_PAGER_offset>);">
 <input type="hidden" name="last_PAGER_offset" value="<TMPL_VAR PAGER_offset>" />
 
 </td></tr>
@@ -81,14 +81,14 @@ PAGER_offset: <TMPL_VAR PAGER_offset>
 
 </TMPL_IF>
 
-<tr><td colspan=2>
+<tr><td colspan=2 align=center>
 <TMPL_IF NAME="full">
-<input type=submit value="Natrag na sve rezultate">
+<input type=submit value="Natrag na sve rezultate" class="navigacija">
 <TMPL_ELSE>
-<input nowrap type=button value="+" onClick="do_checkbox('path',1)">
-<input nowrap type=button value="-" onClick="do_checkbox('path',0)">
-<input nowrap type=button value="&#177;" onClick="do_checkbox('path',-1)">
-<input type=submit name="show_full" value="Poka¾i detalje o odabranim jedinicama" onClick="PAGER_set_offset_and_submit(0);">
+<input nowrap class="navigacija" type=button value="+" onClick="do_checkbox('path',1)">
+<input nowrap class="navigacija" type=button value="-" onClick="do_checkbox('path',0)">
+<input nowrap class="navigacija" type=button value="&#177;" onClick="do_checkbox('path',-1)">
+<input type=submit class="navigacija" name="show_full" value="Poka¾i detalje o odabranim jedinicama" onClick="PAGER_set_offset_and_submit(<TMPL_VAR last_PAGER_offset>);">
 </TMPL_IF>
 </td></tr>
 <TR><TD COLSPAN=2 ALIGN=CENTER class="navigacija">