[interchange-cvs] interchange - ramoore modified 2 files

[interchange-cvs at icdevgroup.org]

User:      ramoore
Date:      2003-07-07 22:24:04 GMT
Modified:  lib/Vend Util.pm Interpolate.pm
Log:
Handling the anchor option in the area and page tags was being handled
in 2 places vendUrl and in tag_area.  Removed handling code from tag_area
and fixed code in vendUrl.

Revision  Changes    Path
2.61      +9 -9      interchange/lib/Vend/Util.pm


rev 2.61, prev_rev 2.60
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -r2.60 -r2.61
--- Util.pm	25 Jun 2003 16:38:17 -0000	2.60
+++ Util.pm	7 Jul 2003 22:24:04 -0000	2.61
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.60 2003/06/25 16:38:17 mheins Exp $
+# $Id: Util.pm,v 2.61 2003/07/07 22:24:04 ramoore Exp $
 # 
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -87,7 +87,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.60 $, 10);
+$VERSION = substr(q$Revision: 2.61 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -1214,7 +1214,7 @@
 
 	$path = escape_chars_url($path)
 		if $path =~ $need_escape;
-    $r .= '/' . $path;
+    	$r .= '/' . $path;
 	$r .= '.html' if $opt->{add_dot_html} and $r !~ /\.html?$/;
 
 	if($opt->{add_source} and $Vend::Session->{source}) {
@@ -1222,15 +1222,15 @@
 		push @parms, "$::VN->{mv_source}=$sn";
 	}
 
-	push @parms, "$::VN->{mv_session_id}=$id"			 if $id;
-	push @parms, "$::VN->{mv_arg}=" . hexify($arguments) if defined $arguments;
-	push @parms, "$::VN->{mv_pc}=$ct"                 	 if $ct;
-	push @parms, "$::VN->{mv_cat}=$Vend::Cat"            if $Vend::VirtualCat;
+	push @parms, "$::VN->{mv_session_id}=$id"		if $id;
+	push @parms, "$::VN->{mv_arg}=" . hexify($arguments) 	if defined $arguments;
+	push @parms, "$::VN->{mv_pc}=$ct"                 	if $ct;
+	push @parms, "$::VN->{mv_cat}=$Vend::Cat"            	if $Vend::VirtualCat;
 
-    $r .= '?' . join($Global::UrlJoiner, @parms) if @parms;
+    	$r .= '?' . join($Global::UrlJoiner, @parms) if @parms;
 	if($opt->{anchor}) {
 		$opt->{anchor} =~ s/^#//;
-		$r .= $opt->{anchor};
+		$r .= '#' . $opt->{anchor};
 	}
 	return $r;
 } 



2.181     +3 -7      interchange/lib/Vend/Interpolate.pm


rev 2.181, prev_rev 2.180
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.180
retrieving revision 2.181
diff -u -r2.180 -r2.181
--- Interpolate.pm	7 Jul 2003 16:35:27 -0000	2.180
+++ Interpolate.pm	7 Jul 2003 22:24:04 -0000	2.181
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.180 2003/07/07 16:35:27 mheins Exp $
+# $Id: Interpolate.pm,v 2.181 2003/07/07 22:24:04 ramoore 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.180 $, 10);
+$VERSION = substr(q$Revision: 2.181 $, 10);
 
 @EXPORT = qw (
 
@@ -2841,11 +2841,7 @@
 
 	$urlroutine = $opt->{secure} ? \&secure_vendUrl : \&vendUrl;
 
-	my $anchor = '';
-	if($opt->{anchor}) {
-		$anchor = '#' . $opt->{anchor};
-	}
-	return $urlroutine->($page, $arg, undef, $opt) . $anchor;
+	return $urlroutine->($page, $arg, undef, $opt);
 }
 
 }