chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use commas to separate islands in route database for easier editing
[ypp-sc-tools.main.git]
/
pctb
/
Commods.pm
diff --git
a/pctb/Commods.pm
b/pctb/Commods.pm
index 75d48c4ee9d2ed707d4da20268274cdbfe474546..b348c17812373ab72405c9eebdfd8a0a4c56c977 100644
(file)
--- a/
pctb/Commods.pm
+++ b/
pctb/Commods.pm
@@
-84,7
+84,7
@@
sub parse_master_master1 ($$) {
} elsif (m/^routes (\w+)$/) {
my $ocean= $1;
@ctx= (sub {
} elsif (m/^routes (\w+)$/) {
my $ocean= $1;
@ctx= (sub {
- m/^(\S[^\t]*\S)
\t+(\S[^\t]*\S)\t+
([1-9][0-9]{0,2})$/ or die;
+ m/^(\S[^\t]*\S)
,\s*(\S[^\t]*\S),\s*
([1-9][0-9]{0,2})$/ or die;
$routes{$ocean}{$1}{$2}= $3;
});
} elsif (m/^client (\S+.*\S)$/) {
$routes{$ocean}{$1}{$2}= $3;
});
} elsif (m/^client (\S+.*\S)$/) {