[OPEN-ILS-DEV] PATCH: bootstrap.conf -> opensrf_core.xml part 2 -
finish what I started
Dan Scott
denials at gmail.com
Sun Jul 1 22:30:48 EDT 2007
Argh.
Seeing Bill's recent commits for changing bootstrap.conf to
opensrf_core.xml suggests that I ran my grep over the source code a
little too finely. My apologies.
Attached are patches that complete the work that I should have done in
my first patch. I also modify the Makefile in OpenSRF to prevent
bootstrap.conf.example from being copied from the OpenSRF/examples
directory into /openils/conf/.
On the bright side, I can vouch for the thoroughness of the JSON ->
OpenSRF::Utils::JSON patch in comparison to the bootstrap.conf work.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have
the right to submit it under the open source license indicated in the
file; or
(b) The contribution is based upon previous work that, to the best of
my knowledge, is covered under an appropriate open source license and
I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record of
the contribution (including all personal information I submit with it,
including my sign-off) is maintained indefinitely and may be
redistributed consistent with this project or the open source license
indicated in the file.
--
Dan Scott
Laurentian University
-------------- next part --------------
Index: Evergreen/src/support-scripts/eg_gen_overdue.sh
===================================================================
--- Evergreen/src/support-scripts/eg_gen_overdue.sh (revision 7500)
+++ Evergreen/src/support-scripts/eg_gen_overdue.sh (working copy)
@@ -12,7 +12,7 @@
RECIPIENT=$2;
DATE=$(date +%Y-%m-%d);
DAY=$(date +%u);
-BSCONFIG="/openils/conf/bootstrap.conf"
+BSCONFIG="/openils/conf/opensrf_core.xml"
ODDIR="/openils/var/data/overdue";
export EG_OVERDUE_EMAIL_TEMPLATE="../extras/overdue_notice_email";
Index: Evergreen/src/extras/import/parse_patron_xml.pl
===================================================================
--- Evergreen/src/extras/import/parse_patron_xml.pl (revision 7500)
+++ Evergreen/src/extras/import/parse_patron_xml.pl (working copy)
@@ -17,7 +17,7 @@
use XML::LibXML;
my ($file,$config,$profileid,$identtypeid,$default_profile,$profile_map,$seenmap,$nosaveseen,$usermap) =
- ('return_file_0623-2.xml', '/openils/conf/bootstrap.conf', 1, 3, 'User', 'profile.map','/tmp/patron-import.seen');
+ ('return_file_0623-2.xml', '/openils/conf/opensrf_core.xml', 1, 3, 'User', 'profile.map','/tmp/patron-import.seen');
GetOptions(
'usermap=s' => \$usermap,
Index: Evergreen/src/extras/import/object_dumper.pl
===================================================================
--- Evergreen/src/extras/import/object_dumper.pl (revision 7500)
+++ Evergreen/src/extras/import/object_dumper.pl (working copy)
@@ -2,7 +2,7 @@
# ---------------------------------------------------------------------
# Generic databse object dumper.
# ./object_dumper.pl <bootstrap_config> <type>, <type>, ...
-# ./object_dumper.pl /openils/conf/bootstrap.conf permission.grp_tree
+# ./object_dumper.pl /openils/conf/opensrf_core.xml permission.grp_tree
# ---------------------------------------------------------------------
use strict;
Index: Open-ILS/src/support-scripts/fine_generator.pl
===================================================================
--- Open-ILS/src/support-scripts/fine_generator.pl (revision 7500)
+++ Open-ILS/src/support-scripts/fine_generator.pl (working copy)
@@ -2,7 +2,7 @@
# ---------------------------------------------------------------------
# Generic databse object dumper.
# ./object_dumper.pl <bootstrap_config> <type>, <type>, ...
-# ./object_dumper.pl /openils/conf/bootstrap.conf permission.grp_tree
+# ./object_dumper.pl /openils/conf/opensrf_core.xml permission.grp_tree
# ---------------------------------------------------------------------
use strict;
Index: Open-ILS/src/support-scripts/long-overdue-status-update.pl
===================================================================
--- Open-ILS/src/support-scripts/long-overdue-status-update.pl (revision 7500)
+++ Open-ILS/src/support-scripts/long-overdue-status-update.pl (working copy)
@@ -16,7 +16,7 @@
use Getopt::Long;
my ($od_length, $user, $password, $config) =
- ('180 days', 'admin', 'open-ils', '/openils/conf/bootstrap.conf');
+ ('180 days', 'admin', 'open-ils', '/openils/conf/opensrf_core.xml');
GetOptions(
'overdue=s' => \$od_length,
Index: Open-ILS/src/support-scripts/marc_export
===================================================================
--- Open-ILS/src/support-scripts/marc_export (revision 7500)
+++ Open-ILS/src/support-scripts/marc_export (working copy)
@@ -20,7 +20,7 @@
my @formats = qw/USMARC UNIMARC XML BRE/;
-my ($config,$format,$encoding,$location,$dollarsign,$idl,$help,$holdings) = ('/openils/conf/bootstrap.conf','USMARC','MARC8','','$');
+my ($config,$format,$encoding,$location,$dollarsign,$idl,$help,$holdings) = ('/openils/conf/opensrf_core.xml','USMARC','MARC8','','$');
GetOptions(
'help' => \$help,
@@ -37,7 +37,7 @@
print <<" HELP";
Usage: $0 [options]
--help or -h This screen.
- --config or -c Configuration file [/openils/conf/bootstrap.conf]
+ --config or -c Configuration file [/openils/conf/opensrf_core.xml]
--format or -f Output format (USMARC, UNIMARC, XML) [USMARC]
--encoding or -e Output Encoding (UTF-8, ISO-8859-?, MARC8) [MARC8]
--items or -i Include items (holdings) in the output
Index: Open-ILS/src/reporter/clark-kent.pl
===================================================================
--- Open-ILS/src/reporter/clark-kent.pl (revision 7500)
+++ Open-ILS/src/reporter/clark-kent.pl (working copy)
@@ -29,7 +29,7 @@
use open ':utf8';
-my ($count, $config, $sleep_interval, $lockfile, $daemon) = (1, '/openils/conf/bootstrap.conf', 10, '/tmp/reporter-LOCK');
+my ($count, $config, $sleep_interval, $lockfile, $daemon) = (1, '/openils/conf/opensrf_core.xml', 10, '/tmp/reporter-LOCK');
GetOptions(
"daemon" => \$daemon,
Index: Open-ILS/src/perlmods/OpenILS/WWW/Web.pm
===================================================================
--- Open-ILS/src/perlmods/OpenILS/WWW/Web.pm (revision 7500)
+++ Open-ILS/src/perlmods/OpenILS/WWW/Web.pm (working copy)
@@ -18,7 +18,7 @@
my $main_ttk = "opac/logic/page_router.ttk";
my $error_ttk = "opac/pages/error.ttk";
my $init_ttk = "opac/logic/page_init.ttk";
-my $bootstrap = "/pines/conf/bootstrap.conf";
+my $bootstrap = "/openils/conf/opensrf_core.xml";
my $child_init_ttk = "opac/logic/child_init.ttk";
my $includes = []; # [ '/pines/cvs/ILS/Open-ILS/src/templates' ];
Index: Open-ILS/src/perlmods/OpenILS/WWW/Method.pm
===================================================================
--- Open-ILS/src/perlmods/OpenILS/WWW/Method.pm (revision 7500)
+++ Open-ILS/src/perlmods/OpenILS/WWW/Method.pm (working copy)
@@ -79,7 +79,7 @@
sub child_init_handler {
OpenSRF::System->bootstrap_client(
- config_file => "/pines/conf/web_bootstrap.conf" );
+ config_file => "/openils/conf/opensrf_core.xml" );
}
Index: Open-ILS/src/extras/opensearch.ttk
===================================================================
--- Open-ILS/src/extras/opensearch.ttk (revision 7500)
+++ Open-ILS/src/extras/opensearch.ttk (working copy)
@@ -1,7 +1,7 @@
[%-
USE CGI;
USE ws = WebSession;
-j = ws.bootstrap_client("/pines/conf/bootstrap.conf");
+j = ws.bootstrap_client("/openils/conf/opensrf_core.xml");
rank_threshold = 5000;
base_url = 'http://dev.gapines.org/';
Index: Open-ILS/src/extras/Perl2REST.pl
===================================================================
--- Open-ILS/src/extras/Perl2REST.pl (revision 7500)
+++ Open-ILS/src/extras/Perl2REST.pl (working copy)
@@ -22,7 +22,7 @@
exit;
}
-OpenSRF::System->bootstrap_client( config_file => '/pines/conf/bootstrap.conf' );
+OpenSRF::System->bootstrap_client( config_file => '/openils/conf/opensrf_core.xml' );
print "Content-Type: text/xml\n\n";
my $val = '';
Index: Open-ILS/src/extras/import/marc2are.pl
===================================================================
--- Open-ILS/src/extras/import/marc2are.pl (revision 7500)
+++ Open-ILS/src/extras/import/marc2are.pl (working copy)
@@ -26,7 +26,7 @@
MARC::Charset->ignore_errors(1);
my ($utf8, $id_field, $count, $user, $password, $config, $marctype, $keyfile, @files, @trash_fields) =
- (0, '998', 1, 'admin', 'open-ils', '/openils/conf/bootstrap.conf', 'USMARC');
+ (0, '998', 1, 'admin', 'open-ils', '/openils/conf/opensrf_core.xml', 'USMARC');
GetOptions(
'startid=i' => \$count,
Index: Open-ILS/src/extras/import/pg_loader.pl
===================================================================
--- Open-ILS/src/extras/import/pg_loader.pl (revision 7500)
+++ Open-ILS/src/extras/import/pg_loader.pl (working copy)
@@ -15,7 +15,7 @@
my @files;
my ($config, $output, @auto, @order, @wipe) =
- ('/openils/conf/bootstrap.conf');
+ ('/openils/conf/opensrf_core.xml');
GetOptions(
'config=s' => \$config,
Index: Open-ILS/src/extras/import/marc2bre.pl
===================================================================
--- Open-ILS/src/extras/import/marc2bre.pl (revision 7500)
+++ Open-ILS/src/extras/import/marc2bre.pl (working copy)
@@ -22,7 +22,7 @@
#MARC::Charset->ignore_errors(1);
my ($id_field, $recid, $user, $config, $idlfile, $marctype, $keyfile, $dontuse_file, $enc, $force_enc, @files, @trash_fields) =
- ('', 1, 1, '/openils/conf/bootstrap.conf', '/openils/conf/fm_IDL.xml', 'USMARC');
+ ('', 1, 1, '/openils/conf/opensrf_core.xml', '/openils/conf/fm_IDL.xml', 'USMARC');
GetOptions(
'marctype=s' => \$marctype,
Index: Open-ILS/src/extras/import/direct_loader.pl
===================================================================
--- Open-ILS/src/extras/import/direct_loader.pl (revision 7500)
+++ Open-ILS/src/extras/import/direct_loader.pl (working copy)
@@ -28,7 +28,7 @@
my @files;
my ($type, $config, $autoprimary) =
- ('biblio.record_entry', '/openils/conf/bootstrap.conf', 0);
+ ('biblio.record_entry', '/openils/conf/opensrf_core.xml', 0);
GetOptions(
'type=s' => \$type,
Index: Open-ILS/src/extras/import/direct_ingest.pl
===================================================================
--- Open-ILS/src/extras/import/direct_ingest.pl (revision 7500)
+++ Open-ILS/src/extras/import/direct_ingest.pl (working copy)
@@ -27,7 +27,7 @@
MARC::Charset->ignore_errors(1);
my ($auth, $config) =
- (0, '/openils/conf/bootstrap.conf');
+ (0, '/openils/conf/opensrf_core.xml');
GetOptions(
'config=s' => \$config,
Index: Open-ILS/examples/json-request-test.pl
===================================================================
--- Open-ILS/examples/json-request-test.pl (revision 7500)
+++ Open-ILS/examples/json-request-test.pl (working copy)
@@ -20,7 +20,7 @@
my $root = shift(@ARGV);
-OpenSRF::System->bootstrap_client( config_file => $root.'/conf/bootstrap.conf');
+OpenSRF::System->bootstrap_client( config_file => $root.'/conf/opensrf_core.xml');
try {
OpenILS::Utils::ScriptRunner->add_path($root.'/var/web/opac/common/js/');
-------------- next part --------------
Index: doc/dokuwiki-doc-stubber.pl
===================================================================
--- doc/dokuwiki-doc-stubber.pl (revision 932)
+++ doc/dokuwiki-doc-stubber.pl (working copy)
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-use OpenSRF::System qw(/pines/conf/bootstrap.conf);
+use OpenSRF::System qw(/openils/conf/opensrf_core.xml);
use Getopt::Long
$| = 1;
Index: src/Makefile
===================================================================
--- src/Makefile (revision 984)
+++ src/Makefile (working copy)
@@ -86,7 +86,6 @@
cp -r ../include/opensrf $(INCLUDEDIR)
cp libopensrf/opensrf $(BINDIR)/opensrf-c
make -C c-apps install
- cp ../examples/bootstrap.conf.example $(ETCDIR)
cp ../bin/osrf_ctl.sh $(BINDIR)
cp ../examples/opensrf.xml.example $(ETCDIR)
cp ../examples/opensrf_core.xml.example $(ETCDIR)
Index: examples/math_bench.pl
===================================================================
--- examples/math_bench.pl (revision 987)
+++ examples/math_bench.pl (working copy)
@@ -13,7 +13,7 @@
print "usage: $0 <num_requests>\n" and exit unless $count;
# * connect to the Jabber network
-OpenSRF::System->bootstrap_client( config_file => "/openils/conf/bootstrap.conf" );
+OpenSRF::System->bootstrap_client( config_file => "/openils/conf/opensrf_core.xml" );
$log->set_service('math_bench');
# * create a new application session for the opensrf.math service
More information about the Open-ils-dev
mailing list