[Koha-cvs] koha/misc/migration_tools rebuild_zebra.pl [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	06/12/06 10:04:36

Modified files:
	misc/migration_tools: rebuild_zebra.pl 

Log message:
	taking koha.xml directories into account for zebra configuration file generation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/migration_tools/rebuild_zebra.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.7&r2=1.4.2.8

Patches:
Index: rebuild_zebra.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/migration_tools/rebuild_zebra.pl,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -b -r1.4.2.7 -r1.4.2.8
--- rebuild_zebra.pl	6 Dec 2006 09:23:19 -0000	1.4.2.7
+++ rebuild_zebra.pl	6 Dec 2006 10:04:36 -0000	1.4.2.8
@@ -18,8 +18,10 @@
 my $directory;
 my $skip_export;
 my $keep_export;
+my $reset;
 GetOptions(
 	'd:s'      => \$directory,
+	'reset'      => \$reset,
 	's'        => \$skip_export,
 	'k'        => \$keep_export,
 	);
@@ -156,11 +158,11 @@
     $created_dir_or_file++;
 }
 
-unless (-d "$authorityserverdir/etc") {
-    mkdir "$authorityserverdir/etc";
-    print "Info: created $authorityserverdir/etc\n";
-    $created_dir_or_file++;
-}
+# unless (-d "$authorityserverdir/etc" || C4::Context->zebraconfig('authorityserver')->{config}) {
+#     mkdir "$authorityserverdir/etc";
+#     print "Info: created $authorityserverdir/etc\n";
+#     $created_dir_or_file++;
+# }
 
 #
 # AUTHORITIES : copying mandatory files
@@ -197,13 +199,13 @@
     $created_dir_or_file++;
 }
 
-unless (-f "$authorityserverdir/etc/ccl.properties") {
-    system("cp -f $kohadir/misc/zebra/ccl.properties $authorityserverdir/etc/ccl.properties");
+unless (-f C4::Context->zebraconfig('authorityserver')->{ccl2rpn}) {
+    system("cp -f $kohadir/misc/zebra/ccl.properties ".C4::Context->zebraconfig('authorityserver')->{ccl2rpn});
     print "Info: copied ccl.properties\n";
     $created_dir_or_file++;
 }
-unless (-f "$authorityserverdir/etc/pqf.properties") {
-    system("cp -f $kohadir/misc/zebra/pqf.properties $authorityserverdir/etc/pqf.properties");
+unless (-f C4::Context->zebraconfig('authorityserver')->{cql2rpn}) {
+    system("cp -f $kohadir/misc/zebra/pqf.properties ".C4::Context->zebraconfig('authorityserver')->{cql2rpn});
     print "Info: copied pqf.properties\n";
     $created_dir_or_file++;
 }
@@ -211,8 +213,8 @@
 #
 # AUTHORITIES : copying mandatory files
 #
-unless (-f "$authorityserverdir/etc/zebra-authorities.cfg") {
-open ZD,">$authorityserverdir/etc/zebra-authorities.cfg";
+unless (-f C4::Context->zebraconfig('authorityserver')->{config}) {
+open ZD,"> ".C4::Context->zebraconfig('authorityserver')->{config};
 print ZD "
 # generated by KOHA/misc/migration_tools/rebuild_zebra.pl 
 profilePath:\${srcdir:-.}:$authorityserverdir/tab/:$tabdir/tab/:\${srcdir:-.}/tab/
@@ -296,6 +298,7 @@
 print "====================\n";
 print "REINDEXING zebra\n";
 print "====================\n";
+system("zebraidx -g iso2709 -c $authorityserverdir/etc/zebra-authorities.cfg -d authorities init") if ($reset);
 system("zebraidx -g iso2709 -c $authorityserverdir/etc/zebra-authorities.cfg -d authorities update $directory/authorities");
 system("zebraidx -g iso2709 -c $authorityserverdir/etc/zebra-authorities.cfg -d authorities commit");
 
@@ -340,11 +343,11 @@
     print "Info: created $biblioserverdir/key\n";
     $created_dir_or_file++;
 }
-unless (-d "$biblioserverdir/etc") {
-    mkdir "$biblioserverdir/etc";
-    print "Info: created $biblioserverdir/etc\n";
-    $created_dir_or_file++;
-}
+# unless (-d "$biblioserverdir/etc" || C4::Context->zebraconfig('authorityserver')->{config}) {
+#     mkdir "$biblioserverdir/etc";
+#     print "Info: created $biblioserverdir/etc\n";
+#     $created_dir_or_file++;
+# }
 
 #
 # BIBLIOS : copying mandatory files
@@ -380,13 +383,13 @@
     print "Info: copied default.idx\n";
     $created_dir_or_file++;
 }
-unless (-f "$biblioserverdir/etc/ccl.properties") {
-    system("cp -f $kohadir/misc/zebra/ccl.properties $biblioserverdir/etc/ccl.properties");
+unless (-f C4::Context->zebraconfig('authorityserver')->{ccl2rpn}) {
+    system("cp -f $kohadir/misc/zebra/ccl.properties ".C4::Context->zebraconfig('authorityserver')->{ccl2rpn});
     print "Info: copied ccl.properties\n";
     $created_dir_or_file++;
 }
-unless (-f "$biblioserverdir/etc/pqf.properties") {
-    system("cp -f $kohadir/misc/zebra/pqf.properties $biblioserverdir/etc/pqf.properties");
+unless (-f C4::Context->zebraconfig('authorityserver')->{cql2rpn}) {
+    system("cp -f $kohadir/misc/zebra/pqf.properties ".C4::Context->zebraconfig('authorityserver')->{cql2rpn});
     print "Info: copied pqf.properties\n";
     $created_dir_or_file++;
 }
@@ -394,8 +397,8 @@
 #
 # BIBLIOS : copying mandatory files
 #
-unless (-f "$biblioserverdir/etc/zebra-biblios.cfg") {
-open ZD,">$biblioserverdir/etc/zebra-biblios.cfg";
+unless (-f C4::Context->zebraconfig('authorityserver')->{config}) {
+open ZD,">".C4::Context->zebraconfig('authorityserver')->{config};
 print ZD "
 # generated by KOHA/misc/migrtion_tools/rebuild_zebra.pl 
 profilePath:\${srcdir:-.}:$biblioserverdir/tab/:$tabdir/tab/:\${srcdir:-.}/tab/
@@ -533,6 +536,7 @@
 print "====================\n";
 print "REINDEXING zebra\n";
 print "====================\n";
+system("zebraidx -g iso2709 -c $biblioserverdir/etc/zebra-biblios.cfg -d biblios init") if ($reset);
 system("zebraidx -g iso2709 -c $biblioserverdir/etc/zebra-biblios.cfg -d biblios update $directory/biblios");
 system("zebraidx -g iso2709 -c $biblioserverdir/etc/zebra-biblios.cfg -d biblios commit");