Changeset 1064

Timestamp:

06/11/07 03:23:11 (16 months ago)

Author:

kake

Message:

Add intercept_redirect parameter to Openguides->display_node - used with the return_output parameter for testing.

Location:

trunk

Files:

• lib/OpenGuides.pm (modified) (3 diffs)
• t/51_display_node.t (modified) (1 diff)
• t/54_redirect.t (modified) (1 diff)

trunk/lib/OpenGuides.pm

@@ -164 +164 @@
                       );
 
-If C<version> is omitted then the latest version will be displayed.
+If C<version> is omitted then it will assume you want the latest version.
+
+Note that if you pass the C<return_output> parameter, and your node is a
+redirecting node, this method will fake the redirect and return the output
+that will actually end up in the user's browser.  If instead you want to see
+the HTTP headers that will be printed in order to perform the redirect, pass
+the C<intercept_redirect> parameter as well.  The C<intercept_redirect>
+parameter has no effect if the node isn't a redirect, or if the
+C<return_output> parameter is omitted.
+
+(At the moment, C<return_tt_vars> acts as if the C<intercept_redirect>
+parameter was passed.)
 
 =cut
@@ -171 +182 @@
     my ($self, %args) = @_;
     my $return_output = $args{return_output} || 0;
+    my $intercept_redirect = $args{intercept_redirect};
     my $version = $args{version};
     my $id = $args{id} || $self->config->home_name;
@@ -277 +289 @@
         } elsif ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) {
             # Avoid loops by not generating redirects to the same node or the previous node.
-            my $output = $self->redirect_to_node($redirect, $id);
-            return $output if $return_output;
-            print $output;
+            if ( $return_output ) {
+                if ( $intercept_redirect ) {
+                    return $self->redirect_to_node( $redirect, $id );
+                } else {
+                    return $self->display_node( id            => $redirect,
+                                                oldid         => $id,
+                                                return_output => 1,
+                                              );
+                }
+            }
+            print $self->redirect_to_node( $redirect, $id );
             return 0;
         }

trunk/t/51_display_node.t

@@ -51 +51 @@
 $wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef );
 
-$output = $guide->display_node( id => 'Redirect Test', return_output => 1 );
+$output = $guide->display_node( id => 'Redirect Test',
+                                return_output => 1,
+                                intercept_redirect => 1 );
 
 like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms,

trunk/t/54_redirect.t

@@ -42 +42 @@
   or die "Can't write node";
 my $output = eval {
-    $guide->display_node( id => "Test Page", return_output => 1 );
+    $guide->display_node( id => "Test Page",
+                          return_output => 1,
+                          intercept_redirect => 1 );
 };
 is( $@, "", "->display_node doesn't die when page is a redirect" );