Changeset 818

Timestamp:

07/06/06 18:01:05 (2 years ago)

Author:

nick

Message:

Support (+test) searching as a feed

Location:

trunk

Files:

• MANIFEST (modified) (2 diffs)
• lib/OpenGuides/Search.pm (modified) (4 diffs)
• t/40_search_as_feed.t (added)

trunk/MANIFEST

@@ -67 +67 @@
 t/22_feed_recent_changes.t
 t/23_feed_node_all_versions.t
+t/24_feed_node_listings.t
 t/25_write_geo_data.t
 t/26_geo_data_search_form.t
@@ -81 +82 @@
 t/38_search_params.t
 t/39_search_form.t
+t/40_search_as_feed.t
 t/41_deletion.t
 t/51_display_node.t

trunk/lib/OpenGuides/Search.pm

@@ -150 +150 @@
 
     my %tt_vars = (
+                   format      => $args{'vars'}->{'format'},
                    ss_version  => $VERSION,
                    ss_info_url => 'http://openguides.org/page/search_help'
@@ -694 +695 @@
 }
 
-# thin wrapper around OpenGuides::Template
+# thin wrapper around OpenGuides::Template, or OpenGuides::Feed
 sub process_template {
     my ($self, %args) = @_;
@@ -702 +703 @@
     $tt_vars->{not_deletable} = 1;
     return %$tt_vars if $self->{return_tt_vars};
-    my $output =  OpenGuides::Template->output(
+
+    # Do we want a feed, or TT html?
+    my $output;
+    if($tt_vars->{'format'}) {
+        my $format = $tt_vars->{'format'};
+        my @nodes = @{$tt_vars->{'results'}};
+
+        my $feed = OpenGuides::Feed->new(
+                                               wiki       => $self->wiki,
+                                               config     => $self->config,
+                                               og_version => $VERSION,
+                                        );
+        $output  = "Content-Type: ".$feed->default_content_type($format)."\n";
+        $output .= $feed->build_mini_feed_for_nodes($format,@nodes);
+    } else {
+        $output =  OpenGuides::Template->output(
                                                 wiki     => $self->wiki,
                                                 config   => $self->config,
@@ -708 +724 @@
                                                 vars     => $tt_vars,
                                               );
+    }
+
     return $output if $self->{return_output};