Changeset 314

Timestamp:

05/25/06 17:46:22 (6 years ago)

Author:

nick

Message:

Add an option to also return the feed timestamp

Location:

wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed

Files:

• Atom.pm (modified) (4 diffs)
• RSS.pm (modified) (5 diffs)

wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/Atom.pm

@@ -55 +55 @@
 using any supplied parameters to narrow the results.
 
+If the argument "also_return_timestamp" is supplied, it will return an
+array of the feed, and the feed timestamp. Otherwise it just returns the feed.
+
 =cut
 sub recent_changes
@@ -65 +68 @@
     );
 
-    return $self->generate_node_list_feed($atom_timestamp, @changes);
+    my $feed = $self->generate_node_list_feed($atom_timestamp, @changes);
+
+    if($args{'also_return_timestamp'}) {
+        return ($feed,$feed_timestamp);
+    } else {
+        return $feed;
+    }
 }
 
@@ -72 +81 @@
 
 Build an Atom Feed of all the different versions of a given node.
+
+If the argument "also_return_timestamp" is supplied, it will return an
+array of the feed, and the feed timestamp. Otherwise it just returns the feed.
 
 =cut
@@ -81 +93 @@
     my $feed_timestamp = $self->feed_timestamp( $all_versions[0] );
 
-    return $self->generate_node_list_feed($feed_timestamp, @all_versions);
+    my $feed = $self->generate_node_list_feed($feed_timestamp, @all_versions);
+
+    if($args{'also_return_timestamp'}) {
+        return ($feed,$feed_timestamp);
+    } else {
+        return $feed;
+    }
 } 
 

wiki-toolkit/trunk/lib/Wiki/Toolkit/Feed/RSS.pm

@@ -56 +56 @@
 using any supplied parameters to narrow the results.
 
+If the argument "also_return_timestamp" is supplied, it will return an
+array of the feed, and the feed timestamp. Otherwise it just returns the feed.
+
 =cut
 sub recent_changes
@@ -66 +69 @@
     );
 
-    return $self->generate_node_list_feed($feed_timestamp, @changes);
+    my $feed = $self->generate_node_list_feed($feed_timestamp, @changes);
+
+    if($args{'also_return_timestamp'}) {
+        return ($feed,$feed_timestamp);
+    } else {
+        return $feed;
+    }
 }
 
@@ -73 +82 @@
 
 Build an RSS Feed of all the different versions of a given node.
+
+If the argument "also_return_timestamp" is supplied, it will return an
+array of the feed, and the feed timestamp. Otherwise it just returns the feed.
 
 =cut
@@ -82 +94 @@
     my $feed_timestamp = $self->feed_timestamp( $all_versions[0] );
 
-    return $self->generate_node_list_feed($feed_timestamp, @all_versions);
+    my $feed = $self->generate_node_list_feed($feed_timestamp, @all_versions);
+
+    if($args{'also_return_timestamp'}) {
+        return ($feed,$feed_timestamp);
+    } else {
+        return $feed;
+    }
 }
 
@@ -265 +283 @@
     }
 }
-# Compatibility method
+
+# Compatibility method - use feed_timestamp with a node instead
 sub rss_timestamp {
-    return feed_timestamp(@_);
+    my ($self, %args) = @_;
+
+    warn("Old style method used - please convert to calling feed_timestamp with a node!");
+    my $feed_timestamp = $self->feed_timestamp(
+                              $self->fetch_newest_for_recently_changed(%args)
+    );
+    return $feed_timestamp;
 }