[interchange-cvs] interchange - kwalsh modified lib/Vend/Dispatch.pm

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Jul 5 18:52:19 EDT 2007


User:      kwalsh
Date:      2007-07-05 22:52:19 GMT
Modified:  lib/Vend Dispatch.pm
Log:
    * The "add_session" and "use_global" Jobs parameters now accept
      Yes/No and True/False as well as simply 1 and 0.

Revision  Changes    Path
1.81      +5 -4      interchange/lib/Vend/Dispatch.pm


rev 1.81, prev_rev 1.80
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Dispatch.pm	5 Jul 2007 11:48:38 -0000	1.80
+++ Dispatch.pm	5 Jul 2007 22:52:19 -0000	1.81
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.80 2007/07/05 11:48:38 pajamian Exp $
+# $Id: Dispatch.pm,v 1.81 2007/07/05 22:52:19 kwalsh Exp $
 #
 # Copyright (C) 2002-2006 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.80 $, 10);
+$VERSION = substr(q$Revision: 1.81 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -727,7 +727,7 @@
 		my ($d, $global_dir, $tmp);
 		my @jobdirs = ([$jobscfg->{base_directory} || 'etc/jobs', 0]);
 
-		if ($jobscfg->{use_global}) {
+		if (is_yes($jobscfg->{use_global})) {
 			push (@jobdirs, ["$Global::ConfDir/jobs", 1]);
 		}
 
@@ -749,6 +749,7 @@
 			my @f = glob("$dir/*");
 			@f = grep ! -d $_, @f;
 			@f = grep $_ !~ /$Vend::Cfg->{HTMLsuffix}$/, @f;
+			@f = grep $_ =~ /$jobscfg->{suffix}$/, @f;
 			for(@f) {
 #::logGlobal("found jobs piece file=$_");
 				push @itl, [$_, readfile($_)];
@@ -829,7 +830,7 @@
 	my $out = join "", @out;
 	my $filter = $jobscfg->{filter} || 'strip';
 	$out = Vend::Interpolate::filter_value($filter, $out);
-	$out .= full_dump() if $jobscfg->{add_session};
+	$out .= full_dump() if if_yes($jobscfg->{add_session});
 
 	logError("Finished jobs group=%s pid=$$", $job || 'INTERNAL');
 	








More information about the interchange-cvs mailing list