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

[paul poulain]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	paul poulain <tipaul>	06/08/04 15:38:17

Modified files:
	C4             : Context.pm 
	zebraplugin/etc: koha.xml 

Log message:
	adding zebradir parameter & documenting koha.xml

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.18.2.5.2.11&r2=1.18.2.5.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/zebraplugin/etc/koha.xml?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: C4/Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.18.2.5.2.11
retrieving revision 1.18.2.5.2.12
diff -u -b -r1.18.2.5.2.11 -r1.18.2.5.2.12
--- C4/Context.pm	4 Aug 2006 15:24:06 -0000	1.18.2.5.2.11
+++ C4/Context.pm	4 Aug 2006 15:38:17 -0000	1.18.2.5.2.12
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Context.pm,v 1.18.2.5.2.11 2006/08/04 15:24:06 tipaul Exp $
+# $Id: Context.pm,v 1.18.2.5.2.12 2006/08/04 15:38:17 tipaul Exp $
 package C4::Context;
 use strict;
 use DBI;
@@ -25,7 +25,7 @@
 	qw($context),
 	qw(@context_stack);
 
-$VERSION = do { my @v = '$Revision: 1.18.2.5.2.11 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.18.2.5.2.12 $' =~ /\d+/g;
 		shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -435,8 +435,8 @@
 		$Zconn=new ZOOM::Connection($context->config("hostname"),$port,databaseName=>$context->{"config"}->{$server},
 		preferredRecordSyntax => "USmarc",elementSetName=> "F");
 
-        $Zconn->option(cqlfile=> $context->{"config"}->{"intranetdir"}."/zebraplugin/etc/cql.properties");
-        $Zconn->option(cclfile=> $context->{"config"}->{"intranetdir"}."/zebraplugin/etc/ccl.properties");
+        $Zconn->option(cqlfile=> $context->{"config"}->{"zebradir"}."/etc/cql.properties");
+        $Zconn->option(cclfile=> $context->{"config"}->{"zebradir"}."/etc/ccl.properties");
 	};
 	if ($@){
 ###Uncomment the lines below if you want to automatically restart your zebra if its stop
@@ -814,6 +814,9 @@
 
 =cut
 # $Log: Context.pm,v $
+# Revision 1.18.2.5.2.12  2006/08/04 15:38:17  tipaul
+# adding zebradir parameter & documenting koha.xml
+#
 # Revision 1.18.2.5.2.11  2006/08/04 15:24:06  tipaul
 # 1st commit on dev_week :
 #

Index: zebraplugin/etc/koha.xml
===================================================================
RCS file: /sources/koha/koha/zebraplugin/etc/Attic/koha.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- zebraplugin/etc/koha.xml	3 Jul 2006 21:56:45 -0000	1.1.2.1
+++ zebraplugin/etc/koha.xml	4 Aug 2006 15:38:17 -0000	1.1.2.2
@@ -1,31 +1,53 @@
 <yazgfs>
-<listen id="biblioserver" >tcp:@:9900</listen>
-<listen id="authorityserver">tcp:@:2100</listen>
-<server id="biblioserver"  listenref="biblioserver"> 
+
+    ############### 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"> 
     <directory>/koha/zebradb/biblios</directory>
     <config>/koha/etc/zebra-biblios.cfg</config>
     <cql2rpn>/koha/etc/pqf.properties</cql2rpn>
-</server>
-<server id="authorityserver"  listenref="authorityserver" > 
+    </server>
+    # authority setup (from 
+    <server id="authorityserver"  listenref="authorityserver" > 
     <directory>/koha/zebradb/authorities</directory>
     <cql2rpn>/koha/etc/pqf.properties</cql2rpn>
     <config>/koha/etc/zebra-authorities.cfg</config>
-</server>
-<config>
+    </server>
+    
+    ############### Koha config parameters
+    <config>
+        # the mySQL DB name
  <database>zoomkoha</database>
+        # mySQL hostname
  <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
  <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>