[interchange-cvs] interchange - racke modified 6 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Tue Jul 1 06:47:00 2003
User: racke
Date: 2003-07-01 10:46:32 GMT
Modified: . WHATSNEW
Modified: code/UserTag usertrack.tag
Modified: lib/Vend Dispatch.pm Interpolate.pm Page.pm Server.pm
Log:
Call tracking functions only if Vend::Track object exists.
E.g. in jobs tracking isn't enabled.
Disabling tracking with a configuration option might follow
as well.
Revision Changes Path
2.138 +1 -0 interchange/WHATSNEW
rev 2.138, prev_rev 2.137
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.137
retrieving revision 2.138
diff -u -r2.137 -r2.138
--- WHATSNEW 30 Jun 2003 20:53:55 -0000 2.137
+++ WHATSNEW 1 Jul 2003 10:46:32 -0000 2.138
@@ -129,6 +129,7 @@
* Various minor cleanup, prevents warnings on startup.
+* Call tracking functions only if Vend::Track object exists.
------------------------------------------------------------------------------
1.2 +1 -1 interchange/code/UserTag/usertrack.tag
rev 1.2, prev_rev 1.1
Index: usertrack.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/code/UserTag/usertrack.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usertrack.tag 29 Jan 2002 05:52:42 -0000 1.1
+++ usertrack.tag 1 Jul 2003 10:46:32 -0000 1.2
@@ -1,3 +1,3 @@
UserTag usertrack Order tag value
-UserTag usertrack Routine sub { $Vend::Track->user(@_); }
+UserTag usertrack Routine sub { $Vend::Track->user(@_) if $Vend::Track; }
1.22 +4 -4 interchange/lib/Vend/Dispatch.pm
rev 1.22, prev_rev 1.21
Index: Dispatch.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Dispatch.pm 25 Jun 2003 15:02:03 -0000 1.21
+++ Dispatch.pm 1 Jul 2003 10:46:32 -0000 1.22
@@ -1,6 +1,6 @@
# Vend::Dispatch - Handle Interchange page requests
#
-# $Id: Dispatch.pm,v 1.21 2003/06/25 15:02:03 mheins Exp $
+# $Id: Dispatch.pm,v 1.22 2003/07/01 10:46:32 racke Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
package Vend::Dispatch;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.21 $, 10);
+$VERSION = substr(q$Revision: 1.22 $, 10);
use POSIX qw(strftime);
use Vend::Util;
@@ -471,7 +471,7 @@
$result_hash = {} unless $result_hash;
# TRACK
- $Vend::Track->finish_order ();
+ $Vend::Track->finish_order () if $Vend::Track;
# END TRACK
# This function (followed down) now does the rudimentary
# backend ordering with AsciiTrack and the order report.
@@ -1499,7 +1499,7 @@
}
# TRACK
- $Vend::Track->filetrack();
+ $Vend::Track->filetrack() if $Vend::Track;
# END TRACK
close_cat();
2.175 +3 -3 interchange/lib/Vend/Interpolate.pm
rev 2.175, prev_rev 2.174
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.174
retrieving revision 2.175
diff -u -r2.174 -r2.175
--- Interpolate.pm 18 Jun 2003 17:34:44 -0000 2.174
+++ Interpolate.pm 1 Jul 2003 10:46:32 -0000 2.175
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.174 2003/06/18 17:34:44 jon Exp $
+# $Id: Interpolate.pm,v 2.175 2003/07/01 10:46:32 racke Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.174 $, 10);
+$VERSION = substr(q$Revision: 2.175 $, 10);
@EXPORT = qw (
@@ -5011,7 +5011,7 @@
# This allows access from embedded Perl
$Tmp->{flycode} = $code;
# TRACK
- $Vend::Track->view_product($code);
+ $Vend::Track->view_product($code) if $Vend::Track;
# END TRACK
# LEGACY
2.12 +3 -3 interchange/lib/Vend/Page.pm
rev 2.12, prev_rev 2.11
Index: Page.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Page.pm,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- Page.pm 18 Jun 2003 17:34:44 -0000 2.11
+++ Page.pm 1 Jul 2003 10:46:32 -0000 2.12
@@ -1,6 +1,6 @@
# Vend::Page - Handle Interchange page routing
#
-# $Id: Page.pm,v 2.11 2003/06/18 17:34:44 jon Exp $
+# $Id: Page.pm,v 2.12 2003/07/01 10:46:32 racke Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -46,7 +46,7 @@
use vars qw/$VERSION/;
-$VERSION = substr(q$Revision: 2.11 $, 10);
+$VERSION = substr(q$Revision: 2.12 $, 10);
my $wantref = 1;
@@ -106,7 +106,7 @@
$page = readin($name);
# TRACK
- if (defined $page) {
+ if (defined $page && $Vend::Track) {
$Vend::Track->view_page($name);
}
# END TRACK
2.34 +4 -3 interchange/lib/Vend/Server.pm
rev 2.34, prev_rev 2.33
Index: Server.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Server.pm,v
retrieving revision 2.33
retrieving revision 2.34
diff -u -r2.33 -r2.34
--- Server.pm 18 Jun 2003 17:34:44 -0000 2.33
+++ Server.pm 1 Jul 2003 10:46:32 -0000 2.34
@@ -1,6 +1,6 @@
# Vend::Server - Listen for Interchange CGI requests as a background server
#
-# $Id: Server.pm,v 2.33 2003/06/18 17:34:44 jon Exp $
+# $Id: Server.pm,v 2.34 2003/07/01 10:46:32 racke Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -26,7 +26,7 @@
package Vend::Server;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.33 $, 10);
+$VERSION = substr(q$Revision: 2.34 $, 10);
use POSIX qw(setsid strftime);
use Vend::Util;
@@ -510,7 +510,8 @@
my $save = select $fh;
$| = 1;
select $save;
- $Vend::StatusLine .= "X-Track: " . $Vend::Track->header() . "\r\n";
+ $Vend::StatusLine .= "X-Track: " . $Vend::Track->header() . "\r\n"
+ if $Vend::Track;
# END TRACK
$Vend::StatusLine .= "Pragma: no-cache\r\n"
if delete $::Scratch->{mv_no_cache};