chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mason/master'
[ypp-sc-tools.web-test.git]
/
yarrg
/
CommodsScrape.pm
diff --git
a/yarrg/CommodsScrape.pm
b/yarrg/CommodsScrape.pm
index 2b1d4a9add9ed0bf0d1cc49d63e55a6996348e97..ccc2d98bd0ea4624fb7d977e5411b8459a414686 100644
(file)
--- a/
yarrg/CommodsScrape.pm
+++ b/
yarrg/CommodsScrape.pm
@@
-46,7
+46,7
@@
sub yppedia_chart_parse ($$ $$$$ $) {
$conv_nxy, $on_archlabel, $on_island, $on_league,
$on_incomprehensible) = @_;
$conv_nxy, $on_archlabel, $on_island, $on_league,
$on_incomprehensible) = @_;
- my ($x,$y, $arch,$island,$solid,$dirn);
+ my ($x,$y, $arch,$island,$s
izecol,$s
olid,$dirn);
my $nn= sub { return $conv_nxy->($x,$y) };
# We don't even bother with tag soup; instead we do line-oriented parsing.
my $nn= sub { return $conv_nxy->($x,$y) };
# We don't even bother with tag soup; instead we do line-oriented parsing.
@@
-55,6
+55,7
@@
sub yppedia_chart_parse ($$ $$$$ $) {
s/^\s*//; chomp; s/\s+$//; s/\s+/ /g;
s/\<\/?(?:b|em)\>//g;
s/\{\{(?:chart\ style|Chart league difficulty)\|[^{}]*\}\}//gi;
s/^\s*//; chomp; s/\s+$//; s/\s+/ /g;
s/\<\/?(?:b|em)\>//g;
s/\{\{(?:chart\ style|Chart league difficulty)\|[^{}]*\}\}//gi;
+ s/^\{\{(?:testing|current)\}\}//;
next unless m/\{\{/; # only interested in chart template stuff
if (($x,$y,$arch) =
next unless m/\{\{/; # only interested in chart template stuff
if (($x,$y,$arch) =
@@
-68,12
+69,12
@@
sub yppedia_chart_parse ($$ $$$$ $) {
$on_archlabel->($x,$y,$arch);
} elsif (m/^\{\{ chart\ label \|\d+\|\d+\|
\<big\> \'+ \[\[ .* \b ocean \]\]/xi) {
$on_archlabel->($x,$y,$arch);
} elsif (m/^\{\{ chart\ label \|\d+\|\d+\|
\<big\> \'+ \[\[ .* \b ocean \]\]/xi) {
- } elsif (($x,$y,$island) =
+ } elsif (($x,$y,$island
,$sizecol
) =
m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\|
m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\|
- ([^| ][^|]*[^| ]) \| .*\}\}$/xi) {
+ ([^| ][^|]*[^| ]) \|
[^|]* \| (\w+) \|
.*\}\}$/xi) {
my $n= $nn->();
printf $debugfh "%2d,%-2d island %s\n", $x,$y,$island;
my $n= $nn->();
printf $debugfh "%2d,%-2d island %s\n", $x,$y,$island;
- $on_island->($n, $island);
+ $on_island->($n, $island
, $sizecol
);
} elsif (($solid,$x,$y,$dirn) =
m/^\{\{ chart\ league((?:\ solid)?) \|(\d+)\|(\d+)\|
\.?([-\/\\o])\.? \| .*\}\}$/xi) {
} elsif (($solid,$x,$y,$dirn) =
m/^\{\{ chart\ league((?:\ solid)?) \|(\d+)\|(\d+)\|
\.?([-\/\\o])\.? \| .*\}\}$/xi) {