X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fglobal.asa;h=d87f1eac6ba5b8f718ac0f0a2aecceb6d54af872;hb=b541a7851e891c8fb8150ba930c90600a4c68465;hp=4f1ca45d3842afeea14596610cb7f7f036166952;hpb=536d684c3e17375d45a5d62bc5d748fec0224860;p=freeside.git

diff --git a/htetc/global.asa b/htetc/global.asa
index 4f1ca45d3..d87f1eac6 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -1,6 +1,6 @@
-#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
+BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 #BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); }
-use Devel::AutoProfiler;
+#use Devel::AutoProfiler;
 
 use strict;
 use vars qw( $cgi $p );
@@ -41,6 +41,7 @@ use FS::part_bill_event;
 use FS::part_pkg;
 use FS::part_referral;
 use FS::part_svc;
+use FS::part_svc_router;
 use FS::pkg_svc;
 use FS::port;
 use FS::queue qw(joblisting);
@@ -48,15 +49,15 @@ use FS::raddb;
 use FS::session;
 use FS::svc_acct;
 use FS::svc_acct_pop qw(popselector);
-use FS::svc_acct_sm;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_www;
-use FS::ac_type;
-use FS::ac;
-use FS::part_ac_field;
-use FS::ac_field;
-use FS::ac_block;
+use FS::router;
+use FS::part_router_field;
+use FS::router_field;
+use FS::addr_block;
+use FS::part_sb_field;
+use FS::sb_field;
 use FS::svc_broadband;
 use FS::type_pkgs;
 use FS::part_export;
@@ -109,8 +110,12 @@ sub Script_OnFlush {
   my $ref = $Response->{BinaryRef};
   #$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
   #$$ref = $cgi->header() . $$ref;
-  if ( dbh->can('sprintProfile') ) {
-    if ( lc($Response->{ContentType}) eq 'text/html' ) {
+  #warn "Script_OnFlush called with dbh ". dbh. "\n";
+  #if ( dbh->can('sprintProfile') ) {
+  if ( UNIVERSAL::can(dbh,'sprintProfile') ) {
+    #warn "dbh can sprintProfile\n";
+    if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
+      #warn "contenttype is sprintProfile\n";
       $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
         or warn "can't remove";
   
@@ -125,7 +130,9 @@ sub Script_OnFlush {
   }
 }
 
-if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) {
+if ( defined(@DBIx::Profile::ISA) ) {
 
   #warn "enabling profiling redirects";
   *CGI::redirect = sub {