Changeset 296

Timestamp:

05/18/06 17:06:43 (6 years ago)

Author:

nick

Message:

Finish shifting common code out into Listing.pm

Location:

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

Files:

• Atom.pm (modified) (2 diffs)
• Listing.pm (modified) (1 diff)
• RSS.pm (modified) (2 diffs)

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

@@ -55 +55 @@
 
     my @changes = $self->fetch_recently_changed_nodes(%args);
-    my $atom_timestamp = $self->feed_timestamp(%args);
+    my $atom_timestamp = $self->feed_timestamp(
+                              $self->fetch_oldest_for_recently_changed(%args)
+    );
 
     return $self->generate_node_list_feed($atom_timestamp, @changes);
@@ -147 +149 @@
 }
 
+=item B<feed_timestamp>
+
+Generate the timestamp for the Atom, based on the oldest node (if available)
+
+=cut
 sub feed_timestamp
 {
-  my ($self, %args) = @_;
-  
-  my %criteria = (ignore_case => 1);
-
-  $args{days} ? $criteria{days}           = $args{days}
-              : $criteria{last_n_changes} = $args{items} || 15;
-
-  $criteria{metadata_wasnt} = { major_change => 0 }     if $args{ignore_minor_edits};
-  $criteria{metadata_was}   = $args{filter_on_metadata} if $args{filter_on_metadata};
-
-  my @changes = $self->{wiki}->list_recent_changes(%criteria);
-
-  if ($changes[0]->{last_modified})
-  {
-    my $time = Time::Piece->strptime( $changes[0]->{last_modified}, $self->{timestamp_fmt} );
+  my ($self, $oldest_node) = @_;
+  
+  if ($oldest_node->{last_modified})
+  {
+    my $time = Time::Piece->strptime( $oldest_node->{last_modified}, $self->{timestamp_fmt} );
 
     my $utc_offset = $self->{utc_offset};

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

@@ -47 +47 @@
 
 =cut
+sub fetch_oldest_for_recently_changed {
+    my ($self, %args) = @_;
+
+    my %criteria = (ignore_case => 1);
+
+    $args{days} ? $criteria{days}           = $args{days}
+                : $criteria{last_n_changes} = $args{items} || 15;
+
+    $criteria{metadata_wasnt} = { major_change => 0 }     if $args{ignore_minor_edits};
+    $criteria{metadata_was}   = $args{filter_on_metadata} if $args{filter_on_metadata};
+
+    my @changes = $self->{wiki}->list_recent_changes(%criteria);
+
+    return $changes[0];
+}
 
 1;

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

@@ -62 +62 @@
 
   my @changes = $self->fetch_recently_changed_nodes(%args);
-  my $rss_timestamp = $self->rss_timestamp(%args);
+  my $rss_timestamp = $self->rss_timestamp(
+                              $self->fetch_oldest_for_recently_changed(%args)
+  );
 
   return $self->generate_node_list_feed($rss_timestamp, @changes);
@@ -214 +216 @@
 =item B<rss_timestamp>
 
-Generate the timestamp for the RSS, by figuring out the age range of
-the source data for the feed
+Generate the timestamp for the RSS, based on the oldest node (if available)
 
 =cut
 sub rss_timestamp
 {
-  my ($self, %args) = @_;
-  
-  my %criteria = (ignore_case => 1);
-
-  if ($args{days})
-  {
-    $criteria{days} = $args{days};
-  }
-  else
-  {
-    $criteria{last_n_changes} = $args{items} || 15;
-  }
-  
-  if ($args{ignore_minor_edits})
-  {
-    $criteria{metadata_wasnt} = { major_change => 0 };
-  }
-  
-  if ($args{filter_on_metadata})
-  {
-    $criteria{metadata_was} = $args{filter_on_metadata};
-  }
-
-  my @changes = $self->{wiki}->list_recent_changes(%criteria);
-
-  if ($changes[0]->{last_modified})
-  {
-    my $time = Time::Piece->strptime( $changes[0]->{last_modified}, $self->{timestamp_fmt} );
-
-    my $utc_offset = $self->{utc_offset};
-    
-    return $time->strftime( "%Y-%m-%dT%H:%M:%S$utc_offset" );
-  }
-  else
-  {
-    return '1970-01-01T00:00:00+0000';
-  }
+    my ($self, $oldest_node) = @_;
+
+    if ($oldest_node->{last_modified})
+    {
+        my $time = Time::Piece->strptime( $oldest_node->{last_modified}, $self->{timestamp_fmt} );
+
+        my $utc_offset = $self->{utc_offset};
+
+        return $time->strftime( "%Y-%m-%dT%H:%M:%S$utc_offset" );
+    }
+    else
+    {
+        return '1970-01-01T00:00:00+0000';
+    }
 }