diff options
| author | ivan <ivan> | 1998-11-15 05:31:03 +0000 |
|---|---|---|
| committer | ivan <ivan> | 1998-11-15 05:31:03 +0000 |
| commit | 8fc1c5f0c2225a5d7a6a2316a9f0b77710cb5a70 (patch) | |
| tree | c76aa9a8530a50d648876a1aa556ad4090dc0e62 /site_perl | |
| parent | 57c5b4de544c1609597e568da88195290eeef4c3 (diff) | |
bugfix for new config layout
Diffstat (limited to 'site_perl')
| -rw-r--r-- | site_perl/Record.pm | 11 | ||||
| -rw-r--r-- | site_perl/cust_main.pm | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/site_perl/Record.pm b/site_perl/Record.pm index 111bb82a2..dbfae95ec 100644 --- a/site_perl/Record.pm +++ b/site_perl/Record.pm @@ -4,7 +4,7 @@ use strict; use vars qw($dbdef_file $dbdef $setup_hack $AUTOLOAD @ISA @EXPORT_OK); use subs qw(reload_dbdef); use Exporter; -use Carp; +use Carp qw(carp cluck croak confess); use File::CounterFile; use FS::UID qw(dbh checkruid swapuid getotaker datasrc); use FS::dbdef; @@ -14,7 +14,7 @@ use FS::dbdef; #ask FS::UID to run this stuff for us later $FS::UID::callback{'FS::Record'} = sub { - $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters". datasrc; + $File::CounterFile::DEFAULT_DIR = "/usr/local/etc/freeside/counters.". datasrc; $dbdef_file = "/usr/local/etc/freeside/dbdef.". datasrc; &reload_dbdef unless $setup_hack; #$setup_hack needed now? }; @@ -181,7 +181,7 @@ sub qsearch { eval 'create FS::'. $table. ' ( $sth->fetchrow_hashref );'; } ( 1 .. $sth->execute ); } else { - carp "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects"; + cluck "qsearch: warning: FS::$table not loaded; returning generic FS::Record objects"; map { new FS::Record ($table,$sth->fetchrow_hashref); } ( 1 .. $sth->execute ); @@ -871,7 +871,10 @@ added pod documentation ivan@sisd.com 98-sep-6 ut_phonen got ''; at the end ivan@sisd.com 98-sep-27 $Log: Record.pm,v $ -Revision 1.5 1998-11-13 09:56:51 ivan +Revision 1.6 1998-11-15 05:31:03 ivan +bugfix for new config layout + +Revision 1.5 1998/11/13 09:56:51 ivan change configuration file layout to support multiple distinct databases (with own set of config files, export, etc.) diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm index 83a7d786d..496efd908 100644 --- a/site_perl/cust_main.pm +++ b/site_perl/cust_main.pm @@ -19,7 +19,8 @@ use FS::cust_pkg; use FS::cust_bill; use FS::cust_bill_pkg; use FS::cust_pay; -#use FS::cust_pay_batch; +use FS::cust_credit; +use FS::cust_pay_batch; @ISA = qw(FS::Record Exporter); @EXPORT_OK = qw(hfields); @@ -868,7 +869,10 @@ enable cybercash, cybercash v3 support, don't need to import FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21 $Log: cust_main.pm,v $ -Revision 1.3 1998-11-13 09:56:54 ivan +Revision 1.4 1998-11-15 05:30:48 ivan +bugfix for new config layout + +Revision 1.3 1998/11/13 09:56:54 ivan change configuration file layout to support multiple distinct databases (with own set of config files, export, etc.) |