Changeset 700 for trunk/wiki.cgi

Timestamp:

10/23/05 20:00:10 (3 years ago)

Author:

earle

Message:

Change "action=rss" parameter to "action=rc;format=rss". Extract RecentChanges code in OpenGuides.pm to its own sub (display_recent_changes()). Fix references to old params in templates. Put redirect to URL with new parameters into wiki.cgi for old parameter.

Files:

• trunk/wiki.cgi (modified) (3 diffs)

trunk/wiki.cgi

@@ -2 +2 @@
 
 use strict;
+use lib qw( /home/earle/openguides.org/testing/lib );
 use warnings;
 
 use vars qw( $VERSION );
-$VERSION = '0.50';
+$VERSION = '0.51';
 
 use CGI qw/:standard/;
@@ -98 +99 @@
     } elsif ($action eq 'list_all_versions') {
         $guide->list_all_versions( id => $node );
+    } elsif ($action eq 'rc') {
+        if ($format && $format eq 'rss') {
+            my $feed = $q->param("feed");
+            if ( !defined $feed or $feed eq "recent_changes" ) {
+                my %args = map { $_ => ( $q->param($_) || "" ) }
+                           qw( feed items days ignore_minor_edits username
+                               category locale );
+                $guide->display_rss( %args );
+            } elsif ( $feed eq "chef_dan" ) {
+                display_node_rdf( node => $node );
+            } else {
+                croak "Unknown RSS feed type '$feed'";
+            }
+        } else {
+            $guide->display_node( id => 'RecentChanges' );
+        }
     } elsif ($action eq 'rss') {
-        my $feed = $q->param("feed");
-        if ( !defined $feed or $feed eq "recent_changes" ) {
-            my %args = map { $_ => ( $q->param($_) || "" ) }
-                       qw( feed items days ignore_minor_edits username
-                           category locale );
-            $guide->display_rss( %args );
-        } elsif ( $feed eq "chef_dan" ) {
-            display_node_rdf( node => $node );
-        } else {
-            croak "Unknown RSS feed type '$feed'";
-        }
+        print $q->redirect( $script_url . '?action=rc;format=rss' );
     } else { # Default is to display a node.
         if ( $format and $format eq "rdf" ) {
@@ -120 +127 @@
         } else {
             my $version = $q->param("version");
-        my $other_ver = $q->param("diffversion");
+            my $other_ver = $q->param("diffversion");
             if ( $other_ver ) {
                 $guide->display_diffs(