package Commods;
use IO::File;
+use IO::Pipe;
use HTTP::Request::Common ();
use POSIX;
use LWP::UserAgent;
@ISA = qw(Exporter);
@EXPORT = qw(&parse_info_clientside &fetch_with_rsync
&parse_info_serverside &parse_info_serverside_ocean
- %oceans %commods %clients
+ %oceans %commods %clients %commodclasses
%vessels %shotname2damage
&parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
- &get_our_version &check_tsv_line
+ &get_our_version &check_tsv_line &errsan
&pipethrough_prep &pipethrough_run
&pipethrough_run_along &pipethrough_run_finish
&pipethrough_run_gzip &http_useragent &version_core
&http_useragent_string_map
&cgipostform &yarrgpostform &cgi_get_caller
- &set_ctype_utf8 $masterinfoversion);
+ &set_ctype_utf8 $masterinfoversion
+ &source_tarball);
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
# eg $commods{'Fine black cloth'}{Srcs}= $sources;
# eg $commods{'Fine black cloth'}{Mass}= 700 [g]
# eg $commods{'Fine black cloth'}{Volume}= 1000 [ml]
+# eg $commods{'Fine black cloth'}{Ordval}= 203921
our (%pctb_commodmap,@pctb_commodmap);
my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
-my %commodclasses; # $commodclasses{'dye'}= '3';
+our %commodclasses; # $commodclasses{'dye'}= '3';
# IMPORTANT
# when extending the format of source-info in a non-backward
if (m/^\%(\w+)$/) {
my $colourkind= $1;
@ctx= (sub {
- m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die;
+ m/^(\S[^\t@]*\S)(?:\t+\@(\d+\+?))?$/ or die "$_ ?";
my ($colour,$order)=($1,$2);
$colours{$colourkind}{$colour} .= $src;
- $colour_ordvals{$colourkind}{$colour}= $order
- if defined $order;
+ if (defined $order) {
+ $order =~ s/^(\d+)\+$/ $1 + $. * 10 /e;
+ $colour_ordvals{$colourkind}{$colour}= $order;
+ }
});
} elsif (m/^commods$/) {
@ctx= (sub { push @rawcm, lc $_; });
@ctx= (sub { push @nocm, lc $_; });
} elsif (m/^commodclasses$/) {
@ctx= (sub {
- die unless m/^\*([-a-z]+)$/;
+ die unless m/^\*([_a-z]+)$/;
$commodclasses{$1}= scalar keys %commodclasses;
});
} elsif (m/^ocean (\w+)$/) {
%commods= ();
my $ca;
+ my $lnoix=0;
$ca= sub {
my ($s,$ss,$ordbase) = @_;
#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
$commods{$ucname}{Srcs} .= $ss;
my $c= $commods{$ucname};
$c->{Volume}= 1000;
+ $c->{Flags}= '';
my ($ordval, $ordclassval);
foreach my $prop (defined $props ? split /\s+/, $props : ()) {
if ($prop =~ m/^([1-9]\d*)(k?)g$/) {
$c->{Mass}= $1 * ($2 ? 1000 : 1);
} elsif ($prop =~ m/^([1-9]\d*)l$/) {
$c->{Volume}= $1 * 1000;
- } elsif ($prop =~ m/^\*([-a-z]+)$/) {
+ } elsif ($prop =~ m/^\*([_a-z]+)$/) {
$c->{Class}= $1;
die "$1" unless exists $commodclasses{$1};
- $ordclassval= $commodclasses{$1} * 1000000;
- } elsif ($prop =~ m/^\@(\d+)$/) {
+ $ordclassval= 1e7 + $commodclasses{$1} * 1e7;
+ } elsif ($prop =~ m/^\@(\d+\+?)$/) {
$ordval= $1;
+ $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
+ } elsif ($prop =~ m/^\!([a-z]+)$/) {
+ $c->{Flags} .= $1;
} else {
die "unknown property $prop for $ucname";
}
}
+ $c->{ClassOrdval}= $ordclassval;
if (defined $ordbase && defined $ordval && defined $ordclassval) {
my $ordvalout= $ordbase + $ordval + $ordclassval;
$c->{Ordval}= $ordvalout;
-print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
} else {
-print STDERR "ordval NONE $name\n";
+#print STDERR "ordval NONE $name\n";
}
return;
}
? $ordbase+$ordcolour : undef);
}
};
- foreach (@rawcm) { &$ca($_,$src,0); }
+ foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
}
sub parse_info_clientside () {
sub parse_info_serverside () {
parse_info1('source-info.txt','s',0);
+ parse_info1('tree-info.txt','t',1);
}
sub parse_info_serverside_ocean ($) {
my ($oceanname) = @_;
our %check_tsv_done;
+sub errsan ($) {
+ my ($value) = @_;
+ $value =~ s/[^-+\'. A-Za-z0-9]/ sprintf "\\x%02x",ord $& /ge;
+ return "\"$value\"";
+}
+
sub check_tsv_line ($$) {
my ($l, $bad_data_callback) = @_;
my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); };
chomp($l) or &$bad_data('missing end-of-line');
- $l !~ m/\P{IsPrint}/ or &$bad_data('nonprinting char(s)');
+ $l !~ m/\P{IsPrint}/ or &$bad_data('nonprinting char(s) '.sprintf "%#x", ord $&);
my @v= split /\t/, $l, -1;
@v==6 or &$bad_data('wrong number of fields');
+ $v[1] =~ s/^\s+//; $v[1] =~ s/\s+$//; # ooo don't check :-(
my ($commod,$stall) = @v;
!keys %commods or
defined $commods{$commod} or
- &$bad_data("unknown commodity \`$commod'");
+ &$bad_data("unknown commodity ".errsan($commod));
- $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised");
- !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data");
+ $stall =~ m/^\p{IsAlnum}/ or
+ &$bad_data("stall does not start with alphanumeric ".errsan($stall));
+ !exists $check_tsv_done{$commod,$stall} or
+ &$bad_data("repeated data ".errsan($commod).",".errsan($stall));
$check_tsv_done{$commod,$stall}= 1;
foreach my $i (2..5) {
my $f= $v[$i];
- $f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or &$bad_data("bad field $i");
- ($i % 2) or ($f !~ m/\>/) or &$bad_data("> in field $i price");
+ $f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or
+ &$bad_data("bad field $i ".errsan($f));
+ ($i % 2) or ($f !~ m/\>/) or
+ &$bad_data("> in field $i price ".errsan($f));
}
foreach my $i (2,4) {
return $ua;
}
+sub source_tarball ($$) {
+ my ($sourcebasedir,$spitoutfn) = @_;
+
+ my $pipe= new IO::Pipe or die $!;
+ my $pid= fork(); defined $pid or die $!;
+ if (!$pid) {
+ $ENV{'YPPSC_YARRG_SRCBASE'}= $sourcebasedir;
+ $pipe->writer();
+ exec '/bin/sh','-c','
+ cd -P "$YPPSC_YARRG_SRCBASE"
+ (
+ git-ls-files -z;
+ git-ls-files -z --others --exclude-from=.gitignore;
+ if test -d .git; then find .git -print0; fi
+ ) | (
+ cpio -Hustar -o --quiet -0 -R 1000:1000 || \
+ cpio -Hustar -o --quiet -0
+ ) | gzip
+ ';
+ die $!;
+ }
+ $pipe->reader();
+
+ my ($d, $l);
+ while ($l= read $pipe, $d, 65536) {
+ $spitoutfn->($d);
+ }
+ waitpid $pid,0;
+ defined $l or die "read pipe $!";
+ $pipe->error and die "pipe error $!";
+ close $pipe;
+ # deliberately ignore errors
+}
+
1;
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff