From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Aug 2009 18:25:14 +0000 (+0100)
Subject: Preserve form values across submissions
X-Git-Tag: 3.4~215
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=598b6371434047312704df43e69cab629e1f3a3d

Preserve form values across submissions
---

diff --git a/yarrg/web/route b/yarrg/web/route
index 84b61e4..1366345 100644
--- a/yarrg/web/route
+++ b/yarrg/web/route
@@ -22,21 +22,40 @@ my @vars;
 
 foreach my $var (@vars) {
 	my $name= $var->{Name};
+	my $lname= lc $name;
 	$var->{Before}= '' unless exists $var->{Before};
 	$var->{CmpCanon}= sub { $_[0]; } unless exists $var->{CmpCanon};
 	foreach my $val (@{ $var->{Values} }) {
 		next if ref $val;
 		$val= [ $val, encode_entities($val) ];
 	}
-	if (exists $ARGS{lc $name}) {
-		$a{$name}= $ARGS{lc $name};
+	if (exists $ARGS{$lname}) {
+		$a{$name}= $ARGS{$lname};
 	} else {
 		$a{$name}= $var->{Values}[0][0];
 	}
 }
 
+my %baseqf;
+foreach my $var (@vars) {
+	my $lname= lc $var->{Name};
+	next unless exists $ARGS{$lname};
+	$baseqf{$lname}= $ARGS{$lname};
+}
+
+my %queryqf;
+foreach my $var (keys %ARGS) {
+	next unless $var =~
+		m/^(?:routestring|islandid\d|archipelago\d|debug)$/;
+	$queryqf{$var}= $ARGS{$var};
+}
+
+my $uri= URI->new($m->current_comp()->name());
+my $quri= sub { $uri->query_form(@_); $uri->path_query(); };
+
 foreach my $var (@vars) {
 	my $name= $var->{Name};
+	my $lname= lc $var->{Name};
 	my $delim= $var->{Before};
 	my $canon= &{$var->{CmpCanon}}($a{$name});
 	my $cvalix= 0;
@@ -49,21 +68,10 @@ foreach my $var (@vars) {
 			print '<b>';
 			$after= '</b>';
 		} else {
-			my %qf= ();
-			foreach my $innerr (@vars) {
-				my $n= lc $innerr->{Name};
-				if ($n ne lc $name) {
-					next unless exists $ARGS{$n};
-					$qf{$n}= $ARGS{$n};
-				} else {
-					next if !$cvalix;
-					$qf{$n}= $value;
-				}
-			}
-			my $uri= URI->new($m->current_comp()->name());
-			$qf{'debug'}=1 if $debug;
-			$uri->query_form(%qf);
-			print '<a href="', $uri->path_query(), '">';
+			my %qf= (%baseqf,%queryqf);
+			delete $qf{$lname};
+			$qf{$lname}= $value if $cvalix;
+			print '<a href="',&$quri(%qf),'">';
 			$after= '</a>';
 		}
 		print $html, $after;
@@ -83,10 +91,11 @@ db_connect();
 </%perl>
 <%args>
 $debug => 0
+$routestring => ''
 </%args>
 
 <h1>Specify route</h1>
-<form action="/ucgi/~clareb/mason/something" method="get">
+<form action="<% &$quri() %>" method="get">
 
 %#---------- textbox, user enters route as string ----------
 % if (!$a{Dropdowns}) {
@@ -135,19 +144,41 @@ function tr_Ready() {
 </script>
 
 <input type="text" id="routestring" name="routestring" size=80
+ value="<% $routestring |h %>"
  onchange="tr_Needed();"
  onkeyup="tr_Later();"><br>
 <div id="routeresults">&nbsp;</div><br/>
 
+% if (length $routestring) {
+
+<pre>
+DATA FOR 
+<% $routestring |h %>
+WOULD GO HERE
+</pre>
+
+% }
+
 % } else { #---------- dropdowns, user selects from menus ----------
 
 <%perl>
 my ($sth,$row);;
-my $archlistdata='';
+my @archlistdata;
 my %islandlistdata;
-$islandlistdata{'none'}= <<END;
-<option value="none">Select island...</option>
-END
+$islandlistdata{'none'}= [ [ "none", "Select island..." ] ];
+
+my $optionlistmap= sub {
+	my ($optlist, $selected) = @_;
+	my $out='';
+	foreach my $entry (@$optlist) {
+		$out.= sprintf('<option value="%s" %s>%s</option>',
+			encode_entities($entry->[0]),
+			defined $selected && $entry->[0] eq $selected
+				? 'selected' : '',
+			encode_entities($entry->[1]));
+	}
+	return $out;
+};
 
 $sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
 			    ORDER BY archipelago;");
@@ -155,12 +186,8 @@ $sth->execute();
 
 while ($row=$sth->fetchrow_arrayref) {
 	my ($arch)= @$row;
-	$archlistdata.=
-		sprintf('<option value="%s">%s</option>',
-			map { encode_entities($_) } ($arch,$arch));
-	$islandlistdata{$arch}= <<END;
-<option value="none">Whole arch</option>
-END
+	push @archlistdata, [ $arch, $arch ];
+	$islandlistdata{$arch}= [ [ "none", "Whole arch" ] ];
 }
 
 $sth= $dbh->prepare("SELECT islandid,islandname,archipelago
@@ -170,16 +197,22 @@ $sth->execute();
 
 while ($row=$sth->fetchrow_arrayref) {
 	my $arch= $row->[2];
-	my $here= sprintf('<option value="%s">%s</option>',
-			map { encode_entities($_) } @$row[0..1]);
-	$islandlistdata{'none'} .= $here;
-	$islandlistdata{$arch} .= $here;
+	push @{ $islandlistdata{'none'} }, [ @$row ];
+	push @{ $islandlistdata{$arch} }, [ @$row ];
+}
+
+my %resetislandlistdata;
+foreach my $arch (keys %islandlistdata) {
+	$resetislandlistdata{$arch}=
+		&$optionlistmap($islandlistdata{$arch}, '');
 }
 
 </%perl>
 
+<input type=hidden name=dropdowns value="<% $a{Dropdowns} %>">
+
 <script type="text/javascript">
-ms_lists= <% to_json(\%islandlistdata) %>;
+ms_lists= <% to_json(\%resetislandlistdata) %>;
 function ms_Setarch(dd) {
   debug('ms_SetArch '+dd+' arch='+arch);
   var arch= document.getElementsByName('archipelago'+dd).item(0).value;
@@ -197,16 +230,20 @@ function ms_Setarch(dd) {
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
 <td>
-<select  name="archipelago<% $dd %>" onchange="ms_Setarch(<% $dd %>)">
+<select name="archipelago<% $dd %>" onchange="ms_Setarch(<% $dd %>)">
 <option value="none">Whole ocean</option>
-<% $archlistdata %></select></td>
+<% &$optionlistmap(\@archlistdata, $ARGS{"archipelago$dd"}) %></select></td>
 %	}
 </tr>
 
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
-<td><select name="islandid<% $dd %>">
-<% $islandlistdata{'none'} %></select></td>
+%		my $arch= $ARGS{"archipelago$dd"};
+%		$arch= 'none' if !defined $arch;
+<td>
+<select name="islandid<% $dd %>">
+<% &$optionlistmap($islandlistdata{$arch}, $ARGS{"islandid$dd"}) %>
+</select></td>
 %	}
 </tr>
 
@@ -217,6 +254,8 @@ function ms_Setarch(dd) {
 <input type=submit name=submit value="Go">
 </form>
 
+%#---------- debugging and epilogue ----------
+
 % if ($debug) {
 <p>
 <pre id="debug_log">