[Koha-cvs] koha/zebraplugin/etc koha.xml [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/09/29 14:20:23

Modified files:
        zebraplugin/etc: koha.xml 

Log message:
        adding new serverinfo directive

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/zebraplugin/etc/koha.xml?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: koha.xml
===================================================================
RCS file: /sources/koha/koha/zebraplugin/etc/Attic/koha.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha.xml    4 Aug 2006 15:38:17 -0000       1.1.2.2
+++ koha.xml    29 Sep 2006 14:20:23 -0000      1.1.2.3
@@ -1,53 +1,61 @@
 <yazgfs>
 
-    ############### ZEBRA config parameters
-    # the listening port for biblios
-    <listen id="biblioserver" >tcp:@:9900</listen>
-    # the listening port for authorities
-    <listen id="authorityserver">tcp:@:2100</listen>
-    # biblio setup
-    <server id="biblioserver"  listenref="biblioserver"> 
+<!-- [scheme:]host[:port][/databaseName] -->
+       <!-- scheme: tcp, ssl, unix, http, sru? -->
+<listen id="biblioserver" >tcp:@:9900</listen>
+<listen id="publicserver" >tcp:66.213.78.100:9999</listen>
+<listen id="authorityserver">tcp:@:2100</listen>
+
+<!-- BIBLIOGRAPHIC RECORDS -->
+<server id="biblioserver"  listenref="biblioserver"> 
         <directory>/koha/zebradb/biblios</directory>
         <config>/koha/etc/zebra-biblios.cfg</config>
         <cql2rpn>/koha/etc/pqf.properties</cql2rpn>
-    </server>
-    # authority setup (from 
-    <server id="authorityserver"  listenref="authorityserver" > 
+</server>
+<serverinfo id="biblioserver">
+       <ccl2rpn>/koha/etc/ccl.properties</ccl2rpn>
+       <user>kohaadmin</user>    
+       <password>K0h4R0ck$</password>
+</serverinfo>
+
+<!-- PUBLIC BIBLIOGRAPHIC SERVER -->
+<server id="publicserver"  listenref="publicserver">
+    <directory>/koha/zebradb/biblios</directory>
+    <config>/koha/etc/zebra-biblios.cfg</config>
+</server>
+<serverinfo id="publicserver">
+    <ccl2rpn>/koha/etc/ccl.properties</ccl2rpn>
+    <user>kohaadmin</user>
+    <password>K0h4R0ck$</password>
+</serverinfo>
+
+<!-- AUTHORITY RECORDS SERVER -->
+<server id="authorityserver"  listenref="authorityserver" > 
         <directory>/koha/zebradb/authorities</directory>
-        <cql2rpn>/koha/etc/pqf.properties</cql2rpn>
         <config>/koha/etc/zebra-authorities.cfg</config>
-    </server>
+</server>
+<serverinfo id="authorityserver">
+    <ccl2rpn>/koha/etc/ccl.properties</ccl2rpn>
+    <user>kohaadmin</user>
+    <password>K0h4R0ck$</password>
+</serverinfo>
     
-    ############### Koha config parameters
-    <config>
-        # the mySQL DB name
-        <database>zoomkoha</database>
-        # mySQL hostname
+<!-- ADDITIONAL KOHA CONFIGURATION DIRECTIVE -->
+<config>
+ <database>koha</database>
         <hostname>localhost</hostname>
-        # mySQL login
         <user>kohaadmin</user>
-        # mySQL password
         <pass>K0h4R0ck$</pass>
-        
-        # the path to zebra directory (where you find /etc for example. 
Warning : this should usually be the same as the path to zebra-biblios.cfg (see 
below)
-        <zebradir>/koha/zebraplugin</zebradir>
-        # the zebra user login for extended services (db-write) (read is 
requires just anonymous login)
-        <zebrauser>kohaadmin</zebrauser>
-        <zebrapass>K0h4R0ck$</zebrapass>
-        # the database name for biblios
+<!-- <zebrauser>kohaadmin</zebrauser> -->
+<!-- <zebrapass>K0h4R0ck$</zebrapass> -->
         <biblioserver>biblios</biblioserver>
-        # shadowing or not ? if yes, then a commit is issued after each update
         <biblioservershadow>1</biblioservershadow>
-        # the database name for authorities
         <authorityserver>authorities</authorityserver>
-        # shadowing or not ? if yes, then a commit is issued after each update
         <authorityservershadow>1</authorityservershadow>
-        
-        # previous koha parameters
         <intranetdir>/koha/intranet</intranetdir>
         <opacdir>/koha/opac</opacdir>
         <opachtdocs>/koha/opac/htdocs/opac-tmpl</opachtdocs>
         <intrahtdocs>/koha/intranet/htdocs/intranet-tmpl</intrahtdocs>
         
<includes>/koha/intranet/htdocs/intranet-tmpl/default/en/includes/</includes>
-    </config>
+</config>
 </yazgfs>