From 928ceb5cf1cf0296133264b08f07075c111584b6 Mon Sep 17 00:00:00 2001 From: miker Date: Mon, 2 Jul 2007 14:32:40 +0000 Subject: [PATCH] Patch from Dan Scott to finish up the removal of bootstrap.conf: Attached are patches that complete the work that I should have done in my first patch. git-svn-id: svn://svn.open-ils.org/ILS/trunk@7502 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/src/extras/import/object_dumper.pl | 2 +- Evergreen/src/extras/import/parse_patron_xml.pl | 2 +- Evergreen/src/support-scripts/eg_gen_overdue.sh | 2 +- Open-ILS/examples/json-request-test.pl | 2 +- Open-ILS/src/extras/Perl2REST.pl | 2 +- Open-ILS/src/extras/import/direct_ingest.pl | 2 +- Open-ILS/src/extras/import/direct_loader.pl | 2 +- Open-ILS/src/extras/import/marc2are.pl | 2 +- Open-ILS/src/extras/import/marc2bre.pl | 2 +- Open-ILS/src/extras/import/pg_loader.pl | 2 +- Open-ILS/src/extras/opensearch.ttk | 2 +- Open-ILS/src/perlmods/OpenILS/WWW/Method.pm | 2 +- Open-ILS/src/perlmods/OpenILS/WWW/Web.pm | 2 +- Open-ILS/src/reporter/clark-kent.pl | 2 +- Open-ILS/src/support-scripts/fine_generator.pl | 2 +- Open-ILS/src/support-scripts/long-overdue-status-update.pl | 2 +- Open-ILS/src/support-scripts/marc_export | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Evergreen/src/extras/import/object_dumper.pl b/Evergreen/src/extras/import/object_dumper.pl index bd9fc0cb31..de7f33df5b 100755 --- a/Evergreen/src/extras/import/object_dumper.pl +++ b/Evergreen/src/extras/import/object_dumper.pl @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Generic databse object dumper. # ./object_dumper.pl , , ... -# ./object_dumper.pl /openils/conf/bootstrap.conf permission.grp_tree +# ./object_dumper.pl /openils/conf/opensrf_core.xml permission.grp_tree # --------------------------------------------------------------------- use strict; diff --git a/Evergreen/src/extras/import/parse_patron_xml.pl b/Evergreen/src/extras/import/parse_patron_xml.pl index e98b1c3a45..0608c85e0d 100755 --- a/Evergreen/src/extras/import/parse_patron_xml.pl +++ b/Evergreen/src/extras/import/parse_patron_xml.pl @@ -17,7 +17,7 @@ use Time::HiRes qw/time/; 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, diff --git a/Evergreen/src/support-scripts/eg_gen_overdue.sh b/Evergreen/src/support-scripts/eg_gen_overdue.sh index 23a03cbbca..d0736e87a2 100755 --- a/Evergreen/src/support-scripts/eg_gen_overdue.sh +++ b/Evergreen/src/support-scripts/eg_gen_overdue.sh @@ -12,7 +12,7 @@ SSH_CLIENT=$1 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"; diff --git a/Open-ILS/examples/json-request-test.pl b/Open-ILS/examples/json-request-test.pl index 2b7dba8e3c..4ee7935e4a 100755 --- a/Open-ILS/examples/json-request-test.pl +++ b/Open-ILS/examples/json-request-test.pl @@ -20,7 +20,7 @@ USAGE 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/'); diff --git a/Open-ILS/src/extras/Perl2REST.pl b/Open-ILS/src/extras/Perl2REST.pl index 2f5fe3ddef..6a128f750f 100755 --- a/Open-ILS/src/extras/Perl2REST.pl +++ b/Open-ILS/src/extras/Perl2REST.pl @@ -22,7 +22,7 @@ unless( $method ) { 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 = ''; diff --git a/Open-ILS/src/extras/import/direct_ingest.pl b/Open-ILS/src/extras/import/direct_ingest.pl index 4159ff7ff5..a5f3c1e6d7 100755 --- a/Open-ILS/src/extras/import/direct_ingest.pl +++ b/Open-ILS/src/extras/import/direct_ingest.pl @@ -27,7 +27,7 @@ use MARC::Charset; MARC::Charset->ignore_errors(1); my ($auth, $config) = - (0, '/openils/conf/bootstrap.conf'); + (0, '/openils/conf/opensrf_core.xml'); GetOptions( 'config=s' => \$config, diff --git a/Open-ILS/src/extras/import/direct_loader.pl b/Open-ILS/src/extras/import/direct_loader.pl index c512585533..ea5c7f2c42 100755 --- a/Open-ILS/src/extras/import/direct_loader.pl +++ b/Open-ILS/src/extras/import/direct_loader.pl @@ -28,7 +28,7 @@ MARC::Charset->ignore_errors(1); 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, diff --git a/Open-ILS/src/extras/import/marc2are.pl b/Open-ILS/src/extras/import/marc2are.pl index e9abea9cd9..3391bc4d1d 100755 --- a/Open-ILS/src/extras/import/marc2are.pl +++ b/Open-ILS/src/extras/import/marc2are.pl @@ -26,7 +26,7 @@ use MARC::Charset; 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, diff --git a/Open-ILS/src/extras/import/marc2bre.pl b/Open-ILS/src/extras/import/marc2bre.pl index 0e2184b746..7bccc8c2fa 100755 --- a/Open-ILS/src/extras/import/marc2bre.pl +++ b/Open-ILS/src/extras/import/marc2bre.pl @@ -22,7 +22,7 @@ use MARC::Charset; #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, diff --git a/Open-ILS/src/extras/import/pg_loader.pl b/Open-ILS/src/extras/import/pg_loader.pl index ad5ee8885f..2aeb6e2afb 100755 --- a/Open-ILS/src/extras/import/pg_loader.pl +++ b/Open-ILS/src/extras/import/pg_loader.pl @@ -15,7 +15,7 @@ use Getopt::Long; my @files; my ($config, $output, @auto, @order, @wipe) = - ('/openils/conf/bootstrap.conf'); + ('/openils/conf/opensrf_core.xml'); GetOptions( 'config=s' => \$config, diff --git a/Open-ILS/src/extras/opensearch.ttk b/Open-ILS/src/extras/opensearch.ttk index 0c4bd7bed7..cba5fd37a9 100644 --- a/Open-ILS/src/extras/opensearch.ttk +++ b/Open-ILS/src/extras/opensearch.ttk @@ -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/'; diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Method.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Method.pm index 5e86d2b561..ab8f9c8a4e 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/Method.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/Method.pm @@ -79,7 +79,7 @@ sub handler { sub child_init_handler { OpenSRF::System->bootstrap_client( - config_file => "/pines/conf/web_bootstrap.conf" ); + config_file => "/openils/conf/opensrf_core.xml" ); } diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm index 6d6b1533df..a2e9dffa37 100644 --- a/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm +++ b/Open-ILS/src/perlmods/OpenILS/WWW/Web.pm @@ -18,7 +18,7 @@ use OpenSRF::System; 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' ]; diff --git a/Open-ILS/src/reporter/clark-kent.pl b/Open-ILS/src/reporter/clark-kent.pl index 35ec203147..82808cadec 100755 --- a/Open-ILS/src/reporter/clark-kent.pl +++ b/Open-ILS/src/reporter/clark-kent.pl @@ -29,7 +29,7 @@ use Email::Send; 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, diff --git a/Open-ILS/src/support-scripts/fine_generator.pl b/Open-ILS/src/support-scripts/fine_generator.pl index a14918708a..268e91a171 100755 --- a/Open-ILS/src/support-scripts/fine_generator.pl +++ b/Open-ILS/src/support-scripts/fine_generator.pl @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Generic databse object dumper. # ./object_dumper.pl , , ... -# ./object_dumper.pl /openils/conf/bootstrap.conf permission.grp_tree +# ./object_dumper.pl /openils/conf/opensrf_core.xml permission.grp_tree # --------------------------------------------------------------------- use strict; diff --git a/Open-ILS/src/support-scripts/long-overdue-status-update.pl b/Open-ILS/src/support-scripts/long-overdue-status-update.pl index 56ea3f1c17..903edab538 100755 --- a/Open-ILS/src/support-scripts/long-overdue-status-update.pl +++ b/Open-ILS/src/support-scripts/long-overdue-status-update.pl @@ -16,7 +16,7 @@ use Digest::MD5 qw/md5_hex/; 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, diff --git a/Open-ILS/src/support-scripts/marc_export b/Open-ILS/src/support-scripts/marc_export index 5d19212bcc..9a6baf8c34 100755 --- a/Open-ILS/src/support-scripts/marc_export +++ b/Open-ILS/src/support-scripts/marc_export @@ -20,7 +20,7 @@ use Getopt::Long; 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 @@ if ($help) { 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 -- 2.11.0