Break out generation of commodity and route form entry boxes into enter_* components

[ypp-sc-tools.db-test.git] / yarrg / web / query_commod

diff --git a/yarrg/web/query_commod b/yarrg/web/query_commod
index 81e8208d1b34abd3fda1bb38e0181eb29949762c..5db6330c6cb2df4999c7c4bac682a301745be79d 100644 (file)
--- a/yarrg/web/query_commod
+++ b/yarrg/web/query_commod
@@ -57,34 +57,10 @@ my $qa= \%ARGS;
 
 <form action="<% $quri->() |h %>" method="get">
 
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
-
-Enter commodity (abbreviations are OK):<br>
-
-<&| qtextstring, qa => $qa, dbh => $dbh,
-    thingstring => 'commodstring', emsgstore => \$emsg,
-    onresults => sub { ($commodname,$cmid)= @{ $_[0] }; }
+<& enter_commod, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+       commodname_r => \$commodname,
+       cmid_r => \$cmid
  &>
- size=80
-</&>
-
-% } else { #---------- dropdowns, user selects from menus ----------
-
-%      my $sth= $dbh->prepare("SELECT commodname,commodid FROM commods
-%                                      ORDER BY commodname");
-%      $sth->execute();
-%      my $row;
-<select name="commodid">
-<option value="">Select commodity...</option>
-%      while ($row= $sth->fetchrow_arrayref) {
-%              my $selected= $commodid eq $row->[1] ? 'selected' : '';
-<option value="<% $row->[1] %>" <% $selected %>><% $row->[0] |h %></option>
-%              ($commodname,$cmid) = @$row if $selected;
-%      }
-</select>
-
-% } #---------- end of dropdowns, now common middle of page code ----------
 
 <input type=submit name=submit value="Go">
 % my $ours= sub { $_[0] =~ m/^commodstring|^commodid/; };