Changeset 1024

Timestamp:

04/21/07 14:17:26 (19 months ago)

Author:

kake

Message:

Fix to [1023] - I misunderstood how the format parameter should be supplied.

Location:

trunk

Files:

• lib/OpenGuides/Search.pm (modified) (1 diff)
• t/30_search_raw.t (modified) (3 diffs)

trunk/lib/OpenGuides/Search.pm

@@ -170 +170 @@
 
     my $want_raw;
-    if ( $args{format} && $args{format} eq "raw" ) {
+    if ( $args{vars}{format} && $args{vars}{format} eq "raw" ) {
         $want_raw = 1;
     }

trunk/t/30_search_raw.t

@@ -24 +24 @@
 my %results;
 
-%results = $search->run( format => "raw" );
+%results = $search->run( vars => { format => "raw" } );
 is_deeply( \%results, { },
            "raw search returns empty hash if no criteria supplied" );
-%results = $search->run( vars => { search => "banananana" }, format => "raw" );
+%results = $search->run( vars => { search => "banananana", format => "raw" } );
 is_deeply( \%results, { },
            "raw search returns empty hash if no hits on search string" );
@@ -54 +54 @@
                             );
 
-%results = $search->run( vars => { search => "arms" }, format => "raw" );
+%results = $search->run( vars => { search => "arms", format => "raw" } );
 is_deeply( [ sort keys %results ], [ "Blacksmiths Arms", "Carpenters Arms" ],
            "raw search on single word finds the right nodes" );
@@ -67 +67 @@
 # Now try a distance search.
 %results = $search->run(
-    vars => { os_dist => 1000, os_x => 500200, os_y => 150000 },
-    format => "raw" );
+                         vars => {
+                                   os_dist => 1000,
+                                   os_x    => 500200,
+                                   os_y    => 150000,
+                                   format  => "raw",
+                                 } );
 is_deeply( [ sort keys %results ], [ "Blacksmiths Arms", "Red Lion" ],
            "raw distance search finds the right nodes" );