- fix Mason profiling to pass-through images (for graph/)

[freeside.git] / htetc / global.asa
diff --git a/htetc/global.asa b/htetc/global.asa

index d87f1ea..5b0ac49 100644 (file)
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -42,6 +42,7 @@ use FS::part_pkg;
  use FS::part_referral;
  use FS::part_svc;
  use FS::part_svc_router;
+use FS::part_virtual_field;
  use FS::pkg_svc;
  use FS::port;
  use FS::queue qw(joblisting);
@@ -53,11 +54,7 @@ use FS::svc_domain;
  use FS::svc_forward;
  use FS::svc_www;
  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;
@@ -75,7 +72,8 @@ sub Script_OnStart {
    &cgisuidsetup($cgi);
    $p = popurl(2);
    #print $cgi->header( '-expires' => 'now' );
-  dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+  #dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
  
    #really should check for FS::Profiler or something
      # Devel::AutoProfiler _our_ VERSION?  thanks a fucking lot
@@ -112,7 +110,7 @@ sub Script_OnFlush {
    #$$ref = $cgi->header() . $$ref;
    #warn "Script_OnFlush called with dbh ". dbh. "\n";
    #if ( dbh->can('sprintProfile') ) {
-  if ( UNIVERSAL::can(dbh,'sprintProfile') ) {
+  if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
      #warn "dbh can sprintProfile\n";
      if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
        #warn "contenttype is sprintProfile\n";
@@ -139,8 +137,12 @@ if ( defined(@DBIx::Profile::ISA) ) {
      my( $self, $location) = @_;
      my $page =
        $cgi->header.
-      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
-      '<PRE>'. encode_entities(dbh->sprintProfile()).
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+      '<BR><BR><PRE>'.
+        ( UNIVERSAL::can(dbh, 'sprintProfile')
+            ? encode_entities(dbh->sprintProfile())
+            : 'DBIx::Profile missing sprintProfile method;'.
+              'unpatched or too old?'                        ).
        "\n\n". &sprintAutoProfile().  '</PRE>'.
        '</BODY></HTML>';
      dbh->{'private_profile'} = {};
@@ -189,5 +191,9 @@ sub sprintAutoProfile {
  
  }
  
+sub include {
+  $Response->Include(@_);
+}
+
  1;