updated development from production

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@644 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/all2xml.conf b/all2xml.conf
index f47d69b..7bc2628 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -5,376 +5,89 @@
 #[sciencedirect]
 #      type=feed_sciencedirect
 #      materialtype=E-èasopis
+#      material_code=ecas
 #      database=ScienceDirect
-#
-#
-#### EBSCO ###
-#
-#[ebsco-aph-ft]
-#      type=marc_ebsco
-#      marc_file=/data/isis_data/ebsco-marc/aph-ft.marc
-#      materialtype=E-èasopis
 
-#[ebsco-buh-ft]
-#      type=marc_ebsco
-#      marc_file=/data/isis_data/ebsco-marc/buh-ft.marc
-#      materialtype=E-èasopis
-#
-#[ebsco-f5h-ft]
-#      type=marc_ebsco
-#      marc_file=/data/isis_data/ebsco-marc/f5h-ft.marc
-#      materialtype=E-èasopis
-#
-#[ebsco-hch-ft]
-#      type=marc_ebsco
-#      marc_file=/data/isis_data/ebsco-marc/hch-ft.marc
-#      materialtype=E-èasopis
-#
-#[ebsco-hph-ft]
-#      type=marc_ebsco
-#      marc_file=/data/isis_data/ebsco-marc/hph-ft.marc
-#      materialtype=E-èasopis
-#
-#
-#
-### ISIS ###
-#
-#[an-libri]
-#      # directory for isis databases
-#      isis_db=/backup/isis_backup/A105-1/ISISDATA/latest/LIBRI/LIBRI
-#      # this will use xml file in import_xml/ dir
-#      type=isis
-#      # this is arbirary xml added to each record (e.g. Library identifier
-#      # or something like that
-#      #xml=<type>Knjiga</type>
-#      materialtype=Knjiga
-#      library=Anglistika
-#      library_code=ffan
-#      library_url=http://knjiznice.ffzg.hr/info.html#anglist
-#
-#[an-ams]
-#      isis_db=/backup/isis_backup/A105-1/ISISDATA/latest/AMS/AMS
-#      type=isis
-#      materialtype=Knjiga - Poslijedipolmski studij-amerikanistika
-#      library=Anglistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#anglist
-#
-#[ar-libri]
-#      isis_db=/backup/isis_backup/A018-2/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Arheologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#arheo
-#
-#[ar-peri]
-#      isis_db=/backup/isis_backup/A018-2/isisdata/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Arheologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#arheo
-#
-#
-#[ar-arti]
-#      isis_db=/backup/isis_backup/A018-2/isisdata/latest/ARTI/ARTI
-#      type=isis_arti
-#      materialtype=Èlanak
-#      library=Arheologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#arheo
-#
-#
-#[bf-libri]
-#      isis_db=/backup/isis_backup/B316-1B/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Fonetika
-#      library_url=http://knjiznice.ffzg.hr/info.html#fonet
-#
-#[bf-peri]
-#      isis_db=/backup/isis_backup/B316-1B/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Fonetika
-#      library_url=http://knjiznice.ffzg.hr/info.html#fonet
-#
-#[bf-arti]
-#      isis_db=/backup/isis_backup/B316-1B/ISISDATA/latest/ARTI/ARTI
-#      type=isis_arti
-#      materialtype=Èlanak
-#      library=Fonetika
-#      library_url=http://knjiznice.ffzg.hr/info.html#fonet
-#
-#[et-libri]
-#      isis_db=/backup/isis_backup/A203-2/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Etnologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#etno
-#
-#[et-peri]
-#      isis_db=/backup/isis_backup/A203-2/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Etnologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#etno
-#
-#[fi-libri]
-#      isis_db=/backup/isis_backup/A102-1B/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Filozofija
-#      library_url=http://knjiznice.ffzg.hr/info.html#filoz
-#
-#[fi-peri]
-#      isis_db=/backup/isis_backup/A102-1B/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Filozofija
-#      library_url=http://knjiznice.ffzg.hr/info.html#filoz
-#
-#[ge-libri]
-#      isis_db=/backup/isis_backup/A106-1/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Germanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#germ
-#
-#[ge-peri]
-#      isis_db=/backup/isis_backup/A106-1/isisdata/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Germanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#germ
-#
-#[iz-libri]
-#      isis_db=/data/isis_data/iz/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Informacijske znanosti
-#      library_url=http://knjiznice.ffzg.hr/info.html#info
-#
-#[iz-peri]
-#      isis_db=/data/isis_data/iz/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Informacijske znanosti
-#      library_url=http://knjiznice.ffzg.hr/info.html#info
-#
-#[iz-arti]
-#      isis_db=/data/isis_data/iz/ARTI/ARTI
-#      type=isis_arti
-#      materialtype=Èlanak
-#      library=Informacijske znanosti
-#      library_url=http://knjiznice.ffzg.hr/info.html#info
-#
-#[kf-libri]
-#      isis_db=/backup/isis_backup/A209-2/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Klasièna filologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#klfilo
-#
-#[kk-peri]
-#      isis_db=/backup/isis_backup/A207-3/isisdata/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Komparativna knji¾evnost
-#      library_url=http://knjiznice.ffzg.hr/info.html#komp
-#
-#
-#[kk-libri]
-#      isis_db=/backup/isis_backup/A207-3/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Komparativna knji¾evnost
-#      library_url=http://knjiznice.ffzg.hr/info.html#komp
-#
-#
-#[kk-arti]
-#      isis_db=/backup/isis_backup/A207-3/isisdata/latest/ARTI/ARTI
-#      type=isis_arti
-#      materialtype=Èlanak
-#      library=Komparativna knji¾evnost
-#      library_url=http://knjiznice.ffzg.hr/info.html#komp
-#
-#[lo-libri]
-#      isis_db=/backup/isis_backup/A108/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Lingvistika i orijentalni studiji
-#      library_url=http://knjiznice.ffzg.hr/info.html#lingv
-#
-#[lo-peri]
-#      isis_db=/backup/isis_backup/A108/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Lingvistika i orijentalni studiji
-#      library_url=http://knjiznice.ffzg.hr/info.html#lingv
-#
-#[lo-arti]
-#      isis_db=/backup/isis_backup/A108/ISISDATA/latest/ARTI/ARTI
-#      type=isis_arti
-#      materialtype=Èlanak
-#      library=Lingvistika i orijentalni studiji
-#      library_url=http://knjiznice.ffzg.hr/info.html#lingv
-#
-#[pe-libri]
-#      isis_db=/data/isis_data/pe/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Pedagogija
-#      library_url=http://knjiznice.ffzg.hr/info.html#pedagog
-#
-#
-#[po-libri]
-#      isis_db=/backup/isis_backup/A201-1/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Povijest
-#      library_url=http://knjiznice.ffzg.hr/info.html#pov
-#
-#[po-peri]
-#      isis_db=/backup/isis_backup/A201-1/isisdata/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Povijest
-#      library_url=http://knjiznice.ffzg.hr/info.html#pov
-#
-[ps-libri]
+
+### EBSCO ###
+
+[ebsco-aph-ft]
+       type=marc_ebsco
+       marc_file=/data/isis_data/ebsco-marc/aph-ft.marc
+       materialtype=E-èasopis
+       material_code=ecas
+       database=EBSCO Acacemic Search Premier
+       
+[ebsco-buh-ft]
+       type=marc_ebsco
+       marc_file=/data/isis_data/ebsco-marc/buh-ft.marc
+       materialtype=E-èasopis
+       material_code=ecas
+       database=EBSCO Business Source Premier
+
+[ebsco-f5h-ft]
+       type=marc_ebsco
+       marc_file=/data/isis_data/ebsco-marc/f5h-ft.marc
+       materialtype=E-èasopis
+       material_code=ecas
+       database=EBSCO
+
+[ebsco-hch-ft]
+       type=marc_ebsco
+       marc_file=/data/isis_data/ebsco-marc/hch-ft.marc
+       materialtype=E-èasopis
+       material_code=ecas
+       database=EBSCO
+
+[ebsco-hph-ft]
+       type=marc_ebsco
+       marc_file=/data/isis_data/ebsco-marc/hph-ft.marc
+       materialtype=E-èasopis
+       material_code=ecas
+       database=EBSCO
+
+## ISIS FF ###
+
+[ffps-libri]
        isis_db=/data/isis_data/ps/LIBRI/LIBRI
        type=isis
        materialtype=Knjiga
-       library=Psihologija
+       material_code=knj
+       library=Knji¾nica Odsjeka za psihologiju
+       library_code=ffps
        library_url=http://knjiznice.ffzg.hr/info.html#psiho
 
-[ps-peri]
+[ffps-peri]
        isis_db=/data/isis_data/ps/PERI/PERI
        type=isis
        materialtype=Èasopis
-       library=Psihologija
+       material_code=pcas
+       library=Knji¾nica Odsjeka za psihologiju
+       library_code=ffps
        library_url=http://knjiznice.ffzg.hr/info.html#psiho
 
-#[pu-libri]
-#      isis_db=/backup/isis_backup/C124-2A/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Povijest umjetnosti
-#      library_url=http://knjiznice.ffzg.hr/info.html#povum
-#
-#[pu-peri]
-#      isis_db=/backup/isis_backup/C124-2A/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Povijest umjetnosti
-#      library_url=http://knjiznice.ffzg.hr/info.html#povum
-#
-#[ro-libri]
-#      isis_db=/backup/isis_backup/A224-2/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Romanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#roman
-#
-#[ro-peri]
-#      isis_db=/backup/isis_backup/A224-2/isisdata/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Romanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#roman
-#
-#
-#[sfm-libri]
-#      isis_db=/backup/isis_backup/A121-2/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Slavenska filologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#slfilo
-#
-#[sfb-libri]
-#      isis_db=/backup/isis_backup/A125-3/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Slavenska filologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#slfilo
-#
-#[sf-peri]
-#      isis_db=/backup/isis_backup/A125-2/ISISDATA/latest/PERI/PERI
-#      type=isis
-#      materialtype=Èasopis
-#      library=Slavenska filologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#slfilo
-#
-#[so-libri]
-#      isis_db=/backup/isis_backup/A002-1/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Sociologija 
-#      library_url=http://knjiznice.ffzg.hr/info.html#socio
-#
-#[sr-libri]
-#      isis_db=/backup/isis_backup/A112-1/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Sredi¹nja èitaonica
-#      library_url=http://knjiznice.ffzg.hr/info.html#citaonica
-#
-#[ta-libri]
-#      isis_db=/backup/isis_backup/A224-1/isisdata/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Talijanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#talijan
-#
-#[ta-peri]
-#      isis_db=/backup/isis_backup/A224-1/isisdata/latest/PERI/PERI
-#      type=isis
+### M$ Excel ###
+
+#[ps-disertations]
+#      type=excel
+#      excel_file=/data/FF/excel/dis_ps.xls
+#      materialtype=Disertacija
+
+#[ffzg-journals]
+#      type=excel
+#      excel_file=/data/isis_data/excel/tekuci_FF.xls
 #      materialtype=Èasopis
-#      library=Talijanistika
-#      library_url=http://knjiznice.ffzg.hr/info.html#talijan
-#
-#[tu-libri]
-#      isis_db=/backup/isis_backup/B025-5/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=Turkologija
-#      library_url=http://knjiznice.ffzg.hr/info.html#turko
-#
-#[mic-libri]
-#      isis_db=/backup/isis_backup/C107-1/ISISDATA/latest/LIBRI/LIBRI
-#      type=isis
-#      materialtype=Knjiga
-#      library=MIC
-#      library_url=http://knjiznice.ffzg.hr/info.html#mic
-#
-#### M$ Excel ###
-#
-#[ps-sep]
-#       type=excel_sep
-#       excel_file=/data/FF/ps/separati.xls
-#       materialtype=Èlanak
-#       library=Psihologija
-#
-##[ps-disertations]
-##     type=excel
-##     excel_file=/data/FF/excel/dis_ps.xls
-##     materialtype=Disertacija
-#
-#
-#
-##[ffzg-journals]
-##     type=excel
-##     excel_file=/data/isis_data/excel/tekuci_FF.xls
-##     materialtype=Èasopis
-#
-#
-##[ps-master_th]
-##     type=excel
-##     excel_file=/data/FF/excel/mag_ps.xls
-##     materialtype=Magistarska radnja
-#
-##[ps-grad_th]
-##     type=excel
-##     excel_file=/data/FF/excel/dipl_ps.xls
-##     materialtype=Diplomska radnja
-#
-#
-#
+
+
+#[ps-master_th]
+#      type=excel
+#      excel_file=/data/FF/excel/mag_ps.xls
+#      materialtype=Magistarska radnja
+
+#[ps-grad_th]
+#      type=excel
+#      excel_file=/data/FF/excel/dipl_ps.xls
+#      materialtype=Diplomska radnja
+
+
+

diff --git a/import_xml/isis.xml b/import_xml/isis.xml
index f7a8790..05e14e7 100644 (file)
--- a/import_xml/isis.xml
+++ b/import_xml/isis.xml
@@ -19,9 +19,7 @@
                <a href="?rm=results&show_full=1&f=PersonalName&v=%s">%s</a>
        ]]></format>
 
-       <format name="Publisher"><![CDATA[
-               <a href="?rm=results&show_full=1&f=Publisher&v=%s">%s</a>
-       ]]></format>
+       <format name="Publisher"><![CDATA[<a href="?rm=results&show_full=1&f=Publisher&v=%s">%s</a>]]></format>
 
        <format name="UncontrolledTerms"><![CDATA[
                <a href="?rm=results&show_full=1&f=UncontrolledTerms&v=%s">%s</a>
@@ -34,12 +32,12 @@
     <indexer>
        <headline>
                <isis type="display">200a : 200e / 200f, 210d</isis>
-               <config>
-                       <delimiter> ---&gt; </delimiter>
+               <config >
+                       <delimiter> ---> </delimiter>
                        <value>materialtype</value>
                </config>
-               <config>
-                       <delimiter> u knji¾nici: </delimiter>
+               <config >
+                       <delimiter>. Lokacija: </delimiter>
                        <value>library</value>
                </config>
        </headline>
@@ -66,6 +64,7 @@
        <PersonalName name="Autor: " order="15">
                <isis type="swish">700 701 702 710 711 503 200f 200g</isis>
                <isis type="display" format_name="PersonalName" format_delimiter=";;">700a 700b;;700a, 700b</isis>
+               <isis type="display" format_name="PersonalName" format_delimiter=";;">701a 701b;;701a, 701b</isis>
                <isis type="display" format_name="PersonalName" format_delimiter=";;">710a 710b;;710a. 710b</isis>
                <isis type="display" append="1">(710d ; 710f ; 710e)</isis>
                <isis type="display">503a, 503b</isis>
@@ -89,7 +88,7 @@
                <isis append="1" type="display"> = 200d</isis>
                <isis append="1" type="display">/ 200f ; 200g. 200c</isis>
                <isis type="index">200a : 200e</isis>
-               <isis type="swish_exact">200a : 200e</isis>
+               <isis type="swish_exact">200a</isis>
 
        </TitleAndResponsibility>
 
@@ -107,12 +106,9 @@
        </Publisher>
 
        <Publication name="Impresum: " order="40">
-               <isis type="display">210a</isis>
-               <isis type="display" append="1"  format_name="Publisher" format_delimiter=";;">
-                       <delimiter> : </delimiter>
-                       <value>210c;;210c</value>
-               </isis>
-               <isis type="display" append="1" delimiter=", "> 210d</isis>
+               <isis type="display">210a : </isis>
+               <isis type="display" append="1" format_name="Publisher" format_delimiter=";;">210c;;210c</isis>
+               <isis type="display" append="1">, 210d</isis>
        </Publication>
        
        <PhisicalDescription name="Materijalni opisi: " order="45">
@@ -133,11 +129,23 @@
        
        <Note name="Napomena: " order="60">
                <isis>326</isis>
-               <isis append="1" delimiter=". - ">300</isis>
-               <isis append="1" delimiter=". - ">320</isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>300</value>
+               </isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>320</value>
+               </isis>
                <isis append="1" delimeter=". - ">324</isis>
-               <isis append="1" delimiter=". - ">327</isis>
-               <isis append="1" delimiter=". - ">329</isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>327</value>
+               </isis>
+               <isis append="1" >
+                       <delimiter>. - </delimiter>
+                       <value>329</value>
+               </isis>
                <isis type="index">300</isis>
                <isis type="index">320</isis>
                <isis type="index">327</isis>
@@ -211,6 +219,10 @@
                <isis type="index">994a</isis>
        </library>
 -->
+       <URL name="URL :" order="85">
+               <isis>856u</isis>
+       </URL>
+       
        <shelfNumber name="Signatura: " order="90">
                <isis delimeter=" ">990</isis>
                <isis type="index" filter="shelf">990</isis>
@@ -218,7 +230,10 @@
 
        <invNo name="Inventarni broj: " order="95">
                <isis type="swish">991 220 221 222 223</isis>
-               <isis type="display" delimiter=", ">991</isis> 
+               <isis type="display" >
+                       <delimiter>, </delimiter>
+                       <value>991</value>
+               </isis> 
                <isis append="1">220 (Sv.1),</isis>
                <isis append="1">221 (Sv.2),</isis>
                <isis append="1">222 (Sv.3),</isis>
@@ -228,13 +243,18 @@
 
        <type name="Vrsta graðe: " type="display" order="100">
                <!-- added via xml tag in .conf -->
-               <config>materialtype</config>
+               <config type="display">materialtype</config>
+               <config type="swish">material_code</config>
        </type>
        
        <library name="Knji¾nica: " type="display" order="101">
                <!-- added via library tag in .conf -->
-               <config>library</config>
-               <config>library_url</config>
+               <config type="display">library</config>
+               <config type="display" append="1" >
+                       <delimiter>, </delimiter>
+                       <value>library_url</value>
+               </config>
+               <config type="swish">library_code</config>
        </library>
 
     </indexer>

diff --git a/template_html/search.html b/template_html/search.html
index b2e83ce..7b298cd 100644 (file)
--- a/template_html/search.html
+++ b/template_html/search.html
@@ -1,20 +1,22 @@
-<div id="head">
-  <div id="logo">
-       <a class="headline" href="/">Katalog Knji¾nica FF-a</a>
-  </div>
-  <div id="help">
-       Funkcioniranje ovoga kataloga moguæe je promijeniti. Zato su nam silno
-       dragocjene va¹e sugestije. Pi¹ite nam na <a href="mailto:knjiznice@ffzg.hr">knjiznice@ffzg.hr</a>.
-  </div>
-  <div id="H2">
-  Katalog obuhvaæa oko 1/4 fonda knji¾nica FF-a. Manje knji¾nice imaju obraðen sav
-  fond. Pretra¾uju se i naslovi elektronièkih inaèica èasopisa na koje su knji¾nice
-  pretplaæene. Ako ne pronaðete u katalogu ono ¹to vas zanima, obratite se u <a
-  href="../info.html">knji¾nicu</a>.
-  </div>
-</div>
-
-
+<table width="100%" border=0>
+<tr>
+       <td valign="top" width="30%"><a class="headline" href="/"><b>Knji¾nice FF-a</b></a>
+       <h2>Katalog</h2>
+       </td>
+       
+       <td class="tdH1">Katalog obuhvaæa oko 1/3 fonda knji¾nica FF-a. Manje knji¾nice
+       imaju obraðen sav fond.<br> Pretra¾uju se i naslovi elektronièkih inaèica
+       èasopisa na koje su knji¾nice pretplaæene. <br/>
+Va¹e su nam primjedbe i sugestije o radu kataloga dragocjene. Po¹aljite nam ih
+na adesu <a href="mailto:knjiznice@ffzg.hr">knjiznice@ffzg.hr</a>
+       </td>
+</tr>
+<!--
+<tr>
+       <td><font color="red">TRENUTNO NE RADI!!!!</font></td>
+</tr>
+-->
+</table>
 
 
 <!--
@@ -30,17 +32,14 @@
 
 -->
 
-<div>
 <hr>
-</div>
 
-<div>
 <form name="search" method="get" >
 <input type="hidden" name="rm" value="results">
 <input type="hidden" name="persist_search" value="10,11">
     <table border="0">
       <tr> 
-        <td class="label1">Pretra¾i sve:&nbsp;</td>
+        <td class="label1">Pretra¾i sve:&nbsp; </td>
         <td class="inputfield"> 
          <input type="hidden" name="f1" value="xml">
           <input type="text" size="40" name="v1" value="">
@@ -65,21 +64,22 @@
         <td class="example" >&nbsp; </td>
       </tr>
       <tr> 
-        <td class="label1" width="130" >Naslov:&nbsp;</td>
+        <td class="label1" width="130" >Naslov:</td>
         <td class="inputfield" width="280"> 
          <input type="hidden" name="f3" value="TitleAndResponsibility">
           <input size="30" type="text" name="v3">
          <input type=submit value="kazalo" name="f3_index" class="navigacija">
        <nobr><small>
-         <input type="radio" name="e3" value="">bilo koja rijeè
+         <input type="radio" name="e3" value="" checked="true">bilo koja rijeè
          <input type="radio" name="e3" value="1">poèetak naslova
          <input type="radio" name="e3" value="3">cijeli naslov
-         </small></nobr>
+         </small>
+       </nobr>
         </td>
         <td class="example">&nbsp;</td>
       </tr>
       <tr> 
-        <td class="label1" width="130" >Godina:&nbsp;</td>
+        <td class="label1" width="130" >Godina:</td>
         <td class="inputfield" width="280"> 
          <input type="hidden" name="f4" value="Date">
           <input  size="15" type="text" name="v4">
@@ -87,7 +87,7 @@
         <td class="example">&nbsp;</td>
       </tr>
       <tr> 
-        <td class="label1" width="130" >Izdavaè:&nbsp;</td>
+        <td class="label1" width="130" >Izdavaè:</td>
         <td class="inputfield" width="280"> 
          <input type="hidden" name="f5" value="Publisher">
           <input  size="30" type="text" name="v5">
@@ -96,7 +96,7 @@
         <td class="example">&nbsp;</td>
       </tr>
       <tr> 
-        <td class="label1" width="130" >ISBN/ISSN:&nbsp;</td>
+        <td class="label1" width="130" >ISBN/ISSN:</td>
         <td  class="inputfield" width="280"> 
          <input type="hidden" name="f6" value="IdentificationNumbers">
           <input  size="15" type="text" name="v6">
@@ -107,7 +107,7 @@
    <tr> 
        <td width="130" class="label1" >
        <select name="f7">
-            <option value="UncontrolledTerms" selected>Tema</option>
+            <option value="UncontrolledTerms" selected>Tema/Kljuèna rijeè</option>
             <option value="Language">Jezik </option>
            <option value="contents">Sadr¾aj </option>
             <option value="Series">Naklad. cjelina</option>
@@ -191,14 +191,16 @@
        </td>
         <td rowspan="2" class="limiter" colspan="2"> 
           <input type="hidden" name="f10" value="type">
-         <input type="checkbox" name="v10" value="Knjiga">
+         <input type="checkbox" name="v10" value="knj">
           Knjige<br> 
-          <input type="checkbox" name="v10" value="Èasopis not E-">
+          <input type="checkbox" name="v10" value="pcas">
           Tiskani èasopisi<br>
-          <input type="checkbox" name="v10" value="E-èasopis">
+          <input type="checkbox" name="v10" value="ecas">
           Elektronièki èasopisi<br> 
-          <input type="checkbox" name="v10" value="Èlanak">
+          <input type="checkbox" name="v10" value="cla">
           Èlanci i poglavlja<br>
+          <input type="checkbox" name="v10" value="dipl">
+          Diplomske radnje<br>
 <!--     
           <input type="checkbox" name="v10" value="">
          Gramofonske ploèe <br>
@@ -211,70 +213,70 @@
        </td>
        <td class="limiter"> 
        <input type="hidden" name="f11" value="library">
-       <input type="checkbox" name="v11" value="Anglistika or Arheologija or
-       Etnologija or Filozofija or Fonetika or Germanistika or Klasièna or
-       Komparativna or Lingvistika or Povijest or umjetnosti or Romanistika or
-       Slavenska or Talijanistika or Sredi¹nja" >
-               sve humanistièke knji¾nice
+       <input type="checkbox" name="v11" value="(ffan) or (ffar) or
+       (ffet) or (fffi) or (fffo) or (ffge) or (ffkf) or (ffkk) or (fflo) or 
+       (ffpo) or (ffpu) or (ffro) or (ffsf) or (ffta) or (ffsr)" >
+               <b>sve humanistièke knji¾nice</b>
        </td>
         <td class="limiter"> 
-       <input type="checkbox" name="v11" value="Informacijske or Pedagogija or
-       Psihologija or Sociologija or Sredi¹nja">
-               sve knji¾nice dru¹tvenih znanosti
+       <input type="checkbox" name="v11" value="(ffiz) or (ffpe) or (ffps) or 
+       (ffso) or (ffsr)">
+               <b>sve knji¾nice dru¹tvenih znanosti</b>
        </td>
       </tr>
 
       <tr>
        <td class="limiter">
        ili samo pojedine<br> humanistièke knji¾nice:<br>
-       <input type="checkbox" name="v11" value="Anglistika" >
+       <input type="checkbox" name="v11" value="ffan" >
                Anglistika<br>
-       <input type="checkbox" name="v11" value="Arheologija" >
+       <input type="checkbox" name="v11" value="ffar" >
                Arheologija<br>
-       <input type="checkbox" name="v11" value="Etnologija" >
+       <input type="checkbox" name="v11" value="ffet" >
                Etnologija<br>
-       <input type="checkbox" name="v11" value="Filozofija" >
+       <input type="checkbox" name="v11" value="fffi" >
                Filozofija<br>
-       <input type="checkbox" name="v11" value="Fonetika" >
+       <input type="checkbox" name="v11" value="fffo" >
                Fonetika<br>
-       <input type="checkbox" name="v11" value="Germanistika" >
+       <input type="checkbox" name="v11" value="ffge" >
                Germanistika<br>
-       <input type="checkbox" name="v11" value="Klasièna filologija" >
+       <input type="checkbox" name="v11" value="ffkf" >
                Klasièna filologija<br>
-       <input type="checkbox" name="v11" value="Komparativna knji¾evnost" >
+       <input type="checkbox" name="v11" value="ffkk" >
                Komparativna knji¾evnost<br>
-       <input type="checkbox" name="v11" value="Lingvistika i orijentalni studiji" >
+       <input type="checkbox" name="v11" value="fflo" >
                Lingvistika i orijentalni studiji<br>
-       <input type="checkbox" name="v11" value="Povijest not umjetnosti" >
+       <input type="checkbox" name="v11" value="ffpo" >
                Povijest<br>
-       <input type="checkbox" name="v11" value="Povijest umjetnosti" >
+       <input type="checkbox" name="v11" value="ffpu" >
                Povijest umjetnosti<br>
-       <input type="checkbox" name="v11" value="Romanistika" >
+       <input type="checkbox" name="v11" value="ffro" >
                Romanistika<br>
-       <input type="checkbox" name="v11" value="Slavenska filologija" >
+       <input type="checkbox" name="v11" value="ffsf" >
                Slavenska filologija<br>
-       <input type="checkbox" name="v11" value="Talijanistika" >
+       <input type="checkbox" name="v11" value="ffta" >
                Talijanistika<br>
-       <input type="checkbox" name="v11" value="Turkologija" >
+       <input type="checkbox" name="v11" value="fftu" >
                Turkologija<br>
-       <input type="checkbox" name="v11" value="MIC" >
-               Knji¾nica MIC-a za kasnu antiku i srednji vijek
+       <input type="checkbox" name="v11" value="ffhu" >
+               Hungarologija<br>
+       <input type="checkbox" name="v11" value="mic" >
+               Meðunarodni istra¾ivaèki centar za kasnu antiku i srednji vijek
         </td>
 
        <td class="limiter">
        ili samo pojedine<br> dru¹tvene knji¾nice:<br>
-       <input type="checkbox" name="v11" value="Informacijske znanosti" >
+       <input type="checkbox" name="v11" value="ffiz" >
                Informacijske znanosti<br>
-       <input type="checkbox" name="v11" value="Pedagogija" >
+       <input type="checkbox" name="v11" value="ffpe" >
                Pedagogija<br>
-       <input type="checkbox" name="v11" value="Psihologija" >
+       <input type="checkbox" name="v11" value="ffps" >
                Psihologija<br>
-       <input type="checkbox" name="v11" value="Sociologija" >
+       <input type="checkbox" name="v11" value="ffso" >
                Sociologija<br>
-       <br>&nbsp;
-       <br>&nbsp;
-       <input type="checkbox" name="v11" value="Sredi¹nja èitaonica" >
-               samo sredi¹nja èitaonica
+       <br/>
+       <input type="checkbox" name="v11" value="ffsr" >
+               sredi¹nja èitaonica
        </td>
        
       </tr>
@@ -290,4 +292,3 @@
 
        
 </form>
-</div>