Changeset 547

Timestamp:

11/16/04 13:50:24 (4 years ago)

Author:

kake

Message:

Fix bugs with latlong representation.

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/OpenGuides.pm (modified) (3 diffs)
• lib/OpenGuides/Template.pm (modified) (1 diff)
• t/66_bug_latlong_representation.t (added)
• templates/node.tt (modified) (1 diff)

trunk/MANIFEST

@@ -75 +75 @@
 t/63_bug_map_link_no_address.t
 t/64_bug_node_history.t
+t/66_bug_latlong_representation.t
 t/templates/15_test.tt
 wiki.cgi

trunk/lib/OpenGuides.pm

@@ -527 +527 @@
     my $node = $args{id};
     my $q = $args{cgi_obj};
+    my $return_output = $args{return_output};
     my $wiki = $self->wiki;
     my $config = $self->config;
@@ -541 +542 @@
 
     $metadata{opening_hours_text} = $q->param("hours_text") || "";
+
+    # Pick out the unmunged versions of lat/long if they're set.
+    # (If they're not, it means they weren't munged in the first place.)
+    $metadata{latitude} = delete $metadata{latitude_unmunged}
+        if $metadata{latitude_unmunged};
+    $metadata{longitude} = delete $metadata{longitude_unmunged}
+        if $metadata{longitude_unmunged};
 
     # Check to make sure all the indexable nodes are created
@@ -577 +585 @@
 
     if ($written) {
-        print $self->redirect_to_node($node);
+        my $output = $self->redirect_to_node($node);
+        return $output if $return_output;
+        print $output;
     } else {
         my %node_data = $wiki->retrieve_node($node);

trunk/lib/OpenGuides/Template.pm

@@ -297 +297 @@
 
     # Check whether we need to munge lat and long.
+    # Store them unmunged as well so commit_node can get hold of them.
     my %prefs = OpenGuides::CGI->get_prefs_from_cookie( config => $config );
     if ( $prefs{latlong_traditional} ) {
         foreach my $var ( qw( latitude longitude ) ) {
+            $vars{$var."_unmunged"} = $vars{$var};
             $vars{$var} = Geography::NationalGrid->deg2string($vars{$var});
         }

trunk/templates/node.tt

@@ -33 +33 @@
     </select>
     of here.
-    <input type="hidden" name="lat" value="[% latitude %]" />
-    <input type="hidden" name="long" value="[% longitude %]" />
+    <input type="hidden" name="lat" value="[% IF latitude_unmunged %][% latitude_unmunged %][% ELSE %][% latitude %][% END %]" />
+    <input type="hidden" name="long" value="[% IF longitude_unmunged %][% longitude_unmunged %][% ELSE %][% longitude %][% END %]" />
     <input type="submit" name="Go" value="Go" class="form_button" />
   </form>