X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=etc%2Fkoha-conf.xml;h=2c188f844fda570cf6a0bd071f84c3e184713372;hb=b222e7d9218e353908ed8d7eda1407d8846b75b5;hp=a4d363d7019dc34d47799737e3a74b3f0e83e8a7;hpb=030fbd2e802714c71d6268380ddeb924baaa07ca;p=srvgit

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index a4d363d701..2c188f844f 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -6,75 +6,34 @@
 
 <listen id="biblioserver" >unix:__ZEBRA_RUN_DIR__/bibliosocket</listen>
 <listen id="authorityserver" >unix:__ZEBRA_RUN_DIR__/authoritysocket</listen>
-<!-- public server runs on tcp -->
-<!-- <listen id="publicserver" >tcp:@:9999</listen> -->
+
+<!-- Uncomment the following entry if you want to run the public Z39.50 server.
+    Also uncomment the <server> and <serverinfo> sections for id 'publicserver' 
+    under PUBLICSERVER'S BIBLIOGRAPHIC RECORDS title-->
+<!--
+<listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
+-->
+
+<!-- Settings for special biblio server instance for PazPar2.
+     Because PazPar2 only connects to a Z39.50 server using TCP/IP,
+     it cannot use the Unix-domain socket that biblioserver uses.
+     Therefore, a custom server is defined. -->
+__PAZPAR2_TOGGLE_XML_PRE__
+<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
+<server id="mergeserver"  listenref="mergeserver"> 
+    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
+    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
+    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
+</server>
+__PAZPAR2_TOGGLE_XML_POST__
 
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver"> 
     <directory>__ZEBRA_DATA_DIR__/biblios</directory>
-    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
+    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
     <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
-     <!-- <docpath>xsl</docpath> -->
-     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
-     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
-     <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
-       <retrieval syntax="xml" name="marcxml"
-                  identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="rss2">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
-         </backend>
-       </retrieval>
-     </retrievalinfo>
-    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>
-      <explain xmlns="http://explain.z3950.org/dtd/2.0/">
-          <serverInfo>
-            <host>__WEBSERVER_HOST__</host>
-            <port>9999</port>
-            <database>biblios</database>
-          </serverInfo>
-        </explain>
-      </xi:fallback>
-    </xi:include>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </server>
 <serverinfo id="biblioserver">
         <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
@@ -85,62 +44,10 @@
 <!-- AUTHORITY RECORDS -->
 <server id="authorityserver"  listenref="authorityserver" >
     <directory>__ZEBRA_DATA_DIR__/authorities</directory>
-    <config>__ZEBRA_CONF_DIR__/zebra-authorities.cfg</config>
+    <config>__ZEBRA_CONF_DIR__/__ZEBRA_AUTH_CFG__</config>
     <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
-     <!-- <docpath>xsl</docpath> -->
-     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
-     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
-     <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
-       <retrieval syntax="xml" name="marcxml"
-                  identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
-         </backend>
-       </retrieval>
-       <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
-           <marc inputformat="marc" outputformat="marcxml"
-                 inputcharset="utf-8"/>
-           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
-         </backend>
-       </retrieval>
-     </retrievalinfo>
-    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>
-      <explain xmlns="http://explain.z3950.org/dtd/2.0/">
-          <serverInfo>
-            <host>__WEBSERVER_HOST__</host>
-            <port>9999</port>
-            <database>authorities</database>
-          </serverInfo>
-        </explain>
-      </xi:fallback>
-    </xi:include>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </server>
 <serverinfo id="authorityserver">
     <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
@@ -148,8 +55,25 @@
     <password>__ZEBRA_PASS__</password>
 </serverinfo>
 
+<!-- PUBLICSERVER'S BIBLIOGRAPHIC RECORDS -->
+<!--
+<server id="publicserver"  listenref="publicserver"> 
+    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
+    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
+    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</server>
+<serverinfo id="publicserver">
+        <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
+        <user>__ZEBRA_USER__</user>    
+        <password>__ZEBRA_PASS__</password>
+</serverinfo>
+-->
+
 <!-- ADDITIONAL KOHA CONFIGURATION DIRECTIVE -->
 <!-- db_scheme should follow the DBD driver name --> 
+<!-- the DBD drivers supported by Koha are mysql and Pg -->
 <!-- port info: mysql:3306 Pg:5432 (5433 on Debian) -->
 <config>
  <db_scheme>__DB_TYPE__</db_scheme>
@@ -162,11 +86,59 @@
  <biblioservershadow>1</biblioservershadow>
  <authorityserver>authorities</authorityserver>
  <authorityservershadow>1</authorityservershadow>
+ <pluginsdir>__PLUGINS_DIR__</pluginsdir>
+ <enable_plugins>0</enable_plugins>
+ <upload_path></upload_path>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
  <intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs>
  <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
  <logdir>__LOG_DIR__</logdir>
+ <docdir>__DOC_DIR__</docdir>
+ <backupdir>__BACKUP_DIR__</backupdir>
+ <!-- Enable the two following to allow superlibrarians to download
+      database and configuration dumps (respectively) from the Export
+      tool -->
+ <backup_db_via_tools>0</backup_db_via_tools>
+ <backup_conf_via_tools>0</backup_conf_via_tools>
+ <!-- Uncomment the following line if you are not using packages and need to schedule reports through the web interface. supportdir should contain cronjobs/runreport.pl -->
+ <!--
+ <supportdir>__SCRIPT_NONDEV_DIR__</supportdir>
+ -->
+ <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
+ <install_log>__MISC_DIR__/koha-install-log</install_log>
+ <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
+ <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
+ <zebra_bib_index_mode>__BIB_INDEX_MODE__</zebra_bib_index_mode>
+ <zebra_auth_index_mode>__AUTH_INDEX_MODE__</zebra_auth_index_mode>
+ <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
+ <use_zebra_facets>1</use_zebra_facets>
+ <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
+ <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
+
+ <!-- Secret passphrase used by Mojolicious for signed cookies -->
+ <api_secret_passphrase>CHANGEME</api_secret_passphrase>
+
+ <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
+ <ttf>
+    <font type="TR" >__FONT_DIR__/DejaVuSerif.ttf</font>
+    <font type="TB" >__FONT_DIR__/DejaVuSerif-Bold.ttf</font>
+    <font type="TI" >__FONT_DIR__/DejaVuSerif-Italic.ttf</font>
+    <font type="TBI">__FONT_DIR__/DejaVuSerif-BoldItalic.ttf</font>
+    <font type="C"  >__FONT_DIR__/DejaVuSansMono.ttf</font>
+    <font type="CB" >__FONT_DIR__/DejaVuSansMono-Bold.ttf</font>
+    <font type="CO" >__FONT_DIR__/DejaVuSansMono-Oblique.ttf</font>
+    <font type="CBO">__FONT_DIR__/DejaVuSansMono-BoldOblique.ttf</font>
+    <font type="H"  >__FONT_DIR__/DejaVuSans.ttf</font>
+    <font type="HO" >__FONT_DIR__/DejaVuSans-Oblique.ttf</font>
+    <font type="HB" >__FONT_DIR__/DejaVuSans-Bold.ttf</font>
+    <font type="HBO">__FONT_DIR__/DejaVuSans-BoldOblique.ttf</font>
+ </ttf>
+
+ <!-- Path to the config file for SMS::Send -->
+  <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
 </config>
 </yazgfs>