changed back to local installation directory /data/webpac-hidra/

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

diff --git a/all2xml.conf b/all2xml.conf
index 345ff13..9523ded 100644 (file)
--- a/all2xml.conf
+++ b/all2xml.conf
@@ -32,84 +32,72 @@
 #      type=isis_hidra_bib
 #      collection_code=SDSZ_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-sdsz-e]
 #      isis_db=/data/hidra/SDSZ-E/BIB
 #      type=isis_hidra_bib_en
 #      collection_code=SDSZ_E
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-sdmo-h]
 #      isis_db=/data/hidra/SDMO-H/BIB
 #      type=isis_hidra_bib
 #      collection_code=SDMO_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-sdmo-e]
 #      isis_db=/data/hidra/SDMO-E/BIB
 #      type=isis_hidra_bib_en
 #      collection_code=SDMO_E
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-bibs-h]
 #      isis_db=/data/hidra/BIBS-H/BIB
 #      type=isis_hidra_bib
 #      collection_code=BIBS_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-bibs-e]
 #      isis_db=/data/hidra/BIBS-E/BIB
 #      type=isis_hidra_bib_en
 #      collection_code=BIBS_E
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-nn-h]
 #      isis_db=/data/hidra/NN-H/BIB
 #      type=isis_hidra_bib
 #      collection_code=NN_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[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/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-mul-h]
 #      isis_db=/data/hidra/MUL-H/BIB
 #      type=isis_hidra_bib
 #      collection_code=MUL_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[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/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[hidra-bil-h]
 #      isis_db=/data/hidra/BIL-H/BIB
 #      type=isis_hidra_bib
 #      collection_code=BIL_H
 #      library_url=http://www.hidra.hr/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 #[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/
-#      lookup_open=/data/webpac-hidra2/thes.lookup
 
 ## ADR baze ##
 

diff --git a/global.conf b/global.conf
index 5631f9f..be53879 100644 (file)
--- a/global.conf
+++ b/global.conf
@@ -3,7 +3,7 @@
 [global]
        # define database to use for indexes
        dbi_dbd=SQLite
-       dbi_dsn=dbname=/data/webpac-hidra2/index.sqlite
+       dbi_dsn=dbname=/data/webpac-hidra/index.sqlite
 #      dbi_dbd=Pg
 #      dbi_dsn=dbname=webpac-hidra
 
@@ -18,17 +18,17 @@
        # original charset, and if you have anything other than plain
        # 7-bit ascii in your data, your words will end-up splitted in
        # index on 8-bit characters and you won't be able to find them!
-       my_unac_filter = /data/webpac/my_unac_string.pm
+       my_unac_filter = /data/webpac-hidra/my_unac_string.pm
 
 [webpac]
        # path to template html files
-       template_html = /data/webpac-hidra2/template_html-hidra
+       template_html = /data/webpac-hidra/template_html-hidra
        # charset encoding for template file *and* users (default iso-8859-1)
        charset = ISO-8859-2
        # path to swish binary (default /usr/bin/swish-e)
        swish = /usr/bin/swish-e
        # path to index file
-       index = /data/webpac-hidra2/index/webpac.index
+       index = /data/webpac-hidra/index/webpac.index
        # this is hard-coded maximum hits for ALL user. (default 0=disable)
        max_hits = 0
        # number of results on each pager page (default 10)
@@ -41,7 +41,7 @@
        min_wildcard = 2
        # master template which will be used to enable global design changes
        # (it will replace ##webpac## in this template with output of webpac)
-       template = /data/webpac-hidra2/public_html-hidra/template.html
+       template = /data/webpac-hidra/public_html-hidra/template.html
        # this base path is used to decide what is base URL of your webpac
        # e.g. /webpac/. Normally, you will have index.cgi after it in
        # URL. However, if you install additional aliases in your httpd.conf
@@ -51,5 +51,5 @@
        # and make en directory in public_html and/or template_html with
        # files localized for english (in case that's not your default
        # language)
-       base_path = /webpac-hidra2
+       base_path = /webpac-hidra
 

diff --git a/httpd-hidra.conf b/httpd-hidra.conf
index 4d72ee5..4e10120 100644 (file)
--- a/httpd-hidra.conf
+++ b/httpd-hidra.conf
@@ -1,14 +1,14 @@
 
 # make swish indexing interface available
-#Alias /webpac-hidra2 /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-bib /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-bib-en /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-adr /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-adr-en /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-ths /data/webpac-hidra2/public_html-hidra
-Alias /webpac-hidra2-ths-en /data/webpac-hidra2/public_html-hidra
+Alias /webpac-hidra /data/webpac-hidra/public_html-hidra
+Alias /webpac-hidra-bib /data/webpac-hidra/public_html-hidra
+Alias /webpac-hidra-bib-en /data/webpac-hidra/public_html-hidra
+Alias /webpac-hidra-adr /data/webpac-hidra/public_html-hidra
+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
 AddHandler cgi-script .cgi
-<Directory /data/webpac-hidra2/public_html-hidra/>
+<Directory /data/webpac-hidra/public_html-hidra/>
        DirectoryIndex index.cgi
        Options ExecCGI FollowSymLinks Indexes
        AllowOverride None

diff --git a/import_xml/isis_hidra_ths.xml b/import_xml/isis_hidra_ths.xml
index d9e15fc..d76e34d 100644 (file)
--- a/import_xml/isis_hidra_ths.xml
+++ b/import_xml/isis_hidra_ths.xml
@@ -271,28 +271,10 @@
                <isis type="display" append="1" delimiter=" " format_name="IDths" format_delimiter=";;">5761;;576a</isis>
        </MicrothesaurusGE>
 -->
-       <!--
-               order is important for type="lookup_key|lookup_val"
-               They create internal hash file for lookups from other
-               fields. Therefore, you mist ensure (in config file) that
-               databases which are source of lookup are called before
-               databases that use lookup fields.
-               Those lookup are then used using special ##lookup##
-               token inside formating instructions like this:
-               <isis type="lookup">999x</isis>
-       -->
 
-<!--
        <IDths name="ID" order="300">
-               <isis type="lookup_key">900</isis>
                <isis type="swish">900</isis>
        </IDths>
 
-       <SubjectIndex name="Predmetno kazalo" order="301">
-               <isis type="lookup_val">eval{v901^a eq "Deskriptor"} / [5624] 562a</isis>
-               <isis type="lookup_val">eval{v901^a eq "Deskriptor"} [251]</isis>
-       </SubjectIndex>
--->
-
     </indexer>
 </config>

diff --git a/import_xml/isis_hidra_ths_en.xml b/import_xml/isis_hidra_ths_en.xml
index 345a13e..5ccc3cb 100644 (file)
--- a/import_xml/isis_hidra_ths_en.xml
+++ b/import_xml/isis_hidra_ths_en.xml
@@ -262,29 +262,11 @@
                <isis type="display" append="1" delimiter=" " format_name="IDths" format_delimiter=";;">5761;;576a</isis>
        </MicrothesaurusGE>
 -->
-       <!--
-               order is important for type="lookup_key|lookup_val"
-               They create internal hash file for lookups from other
-               fields. Therefore, you mist ensure (in config file) that
-               databases which are source of lookup are called before
-               databases that use lookup fields.
-               Those lookup are then used using special ##lookup##
-               token inside formating instructions like this:
-               <isis type="lookup">999x</isis>
-       -->
 
        <IDths name="ID" order="300">
-               <isis type="lookup_key">900</isis>
                <isis type="swish">900</isis>
        </IDths>
 
-       <SubjectIndex name="Predmetno kazalo" order="301">
-               <isis type="lookup_val">eval{v901^a eq "Deskriptor"} / [5724] 572a</isis>
-               <isis type="lookup_val">eval{v901^a eq "Deskriptor"} [251]</isis>
-               <!--
-               <isis type="lookup_val" append="1"> 562a</isis>
-               -->
-       </SubjectIndex>
 
     </indexer>
 </config>