X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=c6ed2536399a8e713efce419bf04e3d052678b68;hp=a405f75d640348a900ac320076d51c1b8567a095;hb=e353043ae5bf5a7df54f650c51f00d6c3b862ba9;hpb=a7ea2fcf98297e6e9e631082f778d11b17b13620

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index a405f75..c6ed253 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -22,6 +22,7 @@
 
 package Commods;
 use IO::File;
+use IO::Pipe;
 use HTTP::Request::Common ();
 use POSIX;
 use LWP::UserAgent;
@@ -36,7 +37,7 @@ BEGIN {
     @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
@@ -45,7 +46,8 @@ BEGIN {
 		      &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();
@@ -92,13 +94,14 @@ our %commods;
 # 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 %colours; # eg $colours{'c'}{'black'}= $sources
 my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
 
-my %colour_ordvals; # $colour_ordvals{'green'}= '30';
+my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
 my %commodclasses; # $commodclasses{'dye'}= '3';
 
 # IMPORTANT
@@ -120,11 +123,13 @@ sub parse_info1 ($$$) {
 	if (m/^\%(\w+)$/) {
 	    my $colourkind= $1;
 	    @ctx= (sub {
-		m/^(\S[^\t@]+\S)(?:\t+\@(\d+))?$/ or die;
-		my ($colour,$order)=$1;
+		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 $_; });
@@ -189,9 +194,10 @@ sub parse_info1 ($$$) {
 	
     %commods= ();
     my $ca;
+    my $lnoix=0;
     $ca= sub {
 	my ($s,$ss,$ordbase) = @_;
-#print "ca($s)\n";
+#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
 	if ($s !~ m/\%(\w+)/) {
 	    my ($name, $props) = $s =~
 		/^(\S[^\t]*\S)(?:\t+(\S.*\S))?$/
@@ -210,33 +216,34 @@ sub parse_info1 ($$$) {
 		} elsif ($prop =~ m/^\*([-a-z]+)$/) {
 		    $c->{Class}= $1;
 		    die "$1" unless exists $commodclasses{$1};
-		    $ordclassval= $commodclasses{$1} * 10000;
-		} elsif ($prop =~ m/^\@(\d+)$/) {
+		    $ordclassval= 1e7 + $commodclasses{$1} * 1e7;
+		} elsif ($prop =~ m/^\@(\d+\+?)$/) {
 		    $ordval= $1;
+		    $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
 		} else {
 		    die "unknown property $prop for $ucname";
 		}
 	    }
 	    if (defined $ordbase && defined $ordval && defined $ordclassval) {
-		$ordval += $ordbase + $ordval + $ordclassval;
-		$c->{Ordval}= $ordval;
-#print STDERR "ordval $name $ordval\n";
+		my $ordvalout= $ordbase + $ordval + $ordclassval;
+		$c->{Ordval}= $ordvalout;
+#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n";
 	    } else {
-#print STDERR "ordval $name NONE\n";
+#print STDERR "ordval NONE $name\n";
             }
 	    return;
 	}
 	die "unknown $&" unless defined $colours{$1};
 	my ($lhs,$pctlet,$rhs)= ($`,$1,$');
 	foreach my $c (keys %{ $colours{$pctlet} }) {
-	    my $ordcolour= $colour_ordvals{$c};
+	    my $ordcolour= $colour_ordvals{$pctlet}{$c};
 	    &$ca($lhs.$c.$rhs,
 		 $ss .'%'. $colours{$pctlet}{$c},
 		 defined($ordbase) && defined($ordcolour)
 		     ? $ordbase+$ordcolour : undef);
 	}
     };
-    foreach (@rawcm) { &$ca($_,$src,0); }
+    foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
 }
 
 sub parse_info_clientside () {
@@ -263,6 +270,7 @@ sub fetch_with_rsync ($) {
 
 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) = @_;
@@ -467,4 +475,38 @@ sub http_useragent ($) {
     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;