[interchange-cvs] interchange - kwalsh modified code/SystemTag/process.coretag

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2007-10-31 11:25:53 GMT
Modified:  code/SystemTag process.coretag
Log:
    * Don't add a ".html" suffix to the "process" page URI if
      [process add_dot_html=no] is specified.  If the "add_dot_html"
      parameter is not specified then the "mv_add_dot_html" scratchpad
      variable will be in control of the suffix.

Revision  Changes    Path
1.13      +7 -3      interchange/code/SystemTag/process.coretag


rev 1.13, prev_rev 1.12
Index: process.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/process.coretag,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- process.coretag	21 Sep 2007 16:15:48 -0000	1.12
+++ process.coretag	31 Oct 2007 11:25:53 -0000	1.13
@@ -5,14 +5,14 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: process.coretag,v 1.12 2007/09/21 16:15:48 kwalsh Exp $
+# $Id: process.coretag,v 1.13 2007/10/31 11:25:53 kwalsh Exp $
 
 UserTag process-target Alias     process
 UserTag process-order  Alias     process
 
 UserTag process        Order     target secure
 UserTag process        addAttr
-UserTag process        Version   $Revision: 1.12 $
+UserTag process        Version   $Revision: 1.13 $
 UserTag process        Routine   <<EOR
 # Returns the href to process the completed order form or do the search.
 sub {
@@ -21,12 +21,15 @@
 	$secure = defined $secure ? $secure : $CGI::secure;
 
 	my $page = $opt->{href} || $Vend::Cfg->{ProcessPage};
+	$opt->{add_dot_html} = $::Scratch->{mv_add_dot_html} unless defined $opt->{add_dot_html};
+
 	if($opt->{download_name}) {
 		$page .= "/$opt->{download_name}";
 	}
-	elsif ($::Scratch->{mv_add_dot_html} || $opt->{add_dot_html}) {
+	elsif (Vend::Util::is_yes($opt->{add_dot_html})) {
 		$page .= '.html' unless $page =~ m{(?:/|\.html?)$};
 	}
+
 	my $url;
 	if($secure) {
 		$url = $Vend::Cfg->{SecurePostURL} || $Vend::Cfg->{SecureURL};
@@ -36,6 +39,7 @@
 	}
 	$url =~ s,/*$,/,;
 	$url .= $page;
+
 	if($Global::TolerateGet and ! $opt->{no_session}) {
 		my @args;
 		push @args, "$::VN->{mv_session_id}=$Vend::SessionID"