chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error message for ambiguous vessels in capacities
[ypp-sc-tools.db-live.git]
/
yarrg
/
web
/
lookup
diff --git
a/yarrg/web/lookup
b/yarrg/web/lookup
index 448ad6ec3441d38171735cbcbb0546b9a235ed0c..56b34fc36fb09d228cb4d9598f5c138a507ef444 100755
(executable)
--- a/
yarrg/web/lookup
+++ b/
yarrg/web/lookup
@@
-57,6
+57,8
@@
my %styles;
Before => 'Query: ',
Values => [ [ 'route', 'Trades for route' ],
[ 'commod', 'Prices for commodity' ],
Before => 'Query: ',
Values => [ [ 'route', 'Trades for route' ],
[ 'commod', 'Prices for commodity' ],
+ [ 'offers', 'Offers at location' ],
+ [ 'routesearch', 'Find profitable route' ],
[ 'age', 'Data age' ] ]
}, { Name => 'BuySell',
Before => '',
[ 'age', 'Data age' ] ]
}, { Name => 'BuySell',
Before => '',
@@
-78,6
+80,12
@@
my %styles;
[ 1, 'Show individual stalls' ],
],
QuerySpecific => 1,
[ 1, 'Show individual stalls' ],
],
QuerySpecific => 1,
+ }, { Name => 'RouteSearchType',
+ Before => 'Type of routes to search for: ',
+ Values => [ [ 0, 'Open-ended' ],
+ [ 1, 'Circular' ],
+ ],
+ QuerySpecific => 1,
});
foreach my $var (@vars) {
});
foreach my $var (@vars) {
@@
-118,7
+126,7
@@
$ours
% }
</%method>
% }
</%method>
-<html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title>
+<html
lang="en"
><head><title><% ucfirst $ahtml{Query} %> - YARRG</title>
<style type="text/css">
body {
color: #000000;
<style type="text/css">
body {
color: #000000;
@@
-138,13
+146,17
@@
tr.datarow1 { background: #ffffff; }
</&script>
</head><body>
</&script>
</head><body>
+% if (!printable($m)) {
<a href="<% $m->current_comp()->name() |u %>">YARRG</a> -
Yet Another Revenue Research Gatherer
|
<a href="intro">introduction</a>
|
<a href="docs">documentation</a>
<a href="<% $m->current_comp()->name() |u %>">YARRG</a> -
Yet Another Revenue Research Gatherer
|
<a href="intro">introduction</a>
|
<a href="docs">documentation</a>
+|
+<a href="devel">development</a>
<p>
<p>
+% }
<%perl>
foreach my $var (@vars) {
<%perl>
foreach my $var (@vars) {
@@
-155,8
+167,8
@@
foreach my $var (@vars) {
foreach my $var (keys %ARGS) {
next unless $var =~
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?: (?:route|commod|capacity)string |
- lossperleague |
+ m/^(?: (?:route|commod|capacity
|capital|island
)string |
+ lossperleague |
distance |
commodid |
islandid \d |
archipelago \d |
commodid |
islandid \d |
archipelago \d |
@@
-176,6
+188,7
@@
my $quri= sub {
my $prselector_core= sub {
my ($var)= @_;
my $prselector_core= sub {
my ($var)= @_;
+ return if printable($m);
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
@@
-241,10
+254,13
@@
my $someresults= sub {
$debug => 0
</%args>
$debug => 0
</%args>
+% if (!printable($m)) {
<hr>
<hr>
+% }
<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
quri => $quri, dbh => $dbh,
<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
quri => $quri, dbh => $dbh,
+ baseqf => \%baseqf, queryqf => \%queryqf, allargs => \%ARGS,
prselector => $prselector,
someresults => $someresults,
emsgokorprint => sub {
prselector => $prselector,
someresults => $someresults,
emsgokorprint => sub {