X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=dff539d87166a7e3b7e114d6a0d9d68be6c0f06c;hp=65cf4eb03ad381cfef565c8635728c7d3e457ec0;hb=2cf70baa979e0c460e4e46a9c1a53677b09a1972;hpb=5054fcc355306f2bccdef9ea1aa8fb79488a9561

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 65cf4eb..dff539d 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -41,20 +41,25 @@ BEGIN {
 		      &pipethrough_prep &pipethrough_run
 		      &pipethrough_run_along &pipethrough_run_finish
 		      &pipethrough_run_gzip
-		      &cgipostform &yarrgpostform);
+		      &cgipostform &yarrgpostform &cgi_get_caller
+		      &set_ctype_utf8);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
 our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources;
-our %commods; # eg $commods{'Fine black cloth'}= $sources;
 our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ];
 our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources  NB abbrevs!
 our %route_mysteries; # eg $route_mysteries{'Midnight'}{'Norse'}= 3
 # $sources = 's[l]b';
 #       's' = Special Circumstances; 'l' = local ; B = with Bleach
 
+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]
+
 our (%pctb_commodmap,@pctb_commodmap);
 
 my %colours; # eg $colours{'c'}{'black'}= $sources
@@ -115,10 +120,29 @@ sub parse_info1 ($$) {
     $ca= sub {
 	my ($s,$ss) = @_;
 #print "ca($s)\n";
-	if ($s !~ m/\%(\w+)/) { $commods{ucfirst $s} .= $ss; return; }
+	if ($s !~ m/\%(\w+)/) {
+	    my ($name, $props) = $s =~
+		/^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
+		or die "bad commodspec $s";
+	    my $ucname= ucfirst $name;
+	    $commods{$ucname}{Srcs} .= $ss;
+	    my $c= $commods{$ucname};
+	    $c->{Volume}= 1000;
+	    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;
+		} else {
+		    die "unknown property $prop for $ucname";
+		}
+	    }
+	    return;
+	}
 	die "unknown $&" unless defined $colours{$1};
-	foreach my $c (keys %{ $colours{$1} }) {
-	    &$ca($`.$c.$', $ss .'%'. $colours{$1}{$c});
+	my ($lhs,$pctlet,$rhs)= ($`,$1,$');
+	foreach my $c (keys %{ $colours{$pctlet} }) {
+	    &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c});
 	}
     };
     foreach (@rawcm) { &$ca($_,$src); }
@@ -195,16 +219,16 @@ sub parse_info_serverside_ocean ($) {
 
 sub parse_pctb_commodmap () {
     undef %pctb_commodmap;
-    foreach my $commod (keys %commods) { $commods{$commod} =~ s/b//; }
+    foreach my $commod (keys %commods) { $commods{$commod}{Srcs} =~ s/b//; }
 
-    my $c= new IO::File '_commodmap.tsv' or die $!;
+    my $c= new IO::File '_commodmap.tsv';
     if (!$c) { $!==&ENOENT or die $!; return 0; }
 
     while (<$c>) {
 	m/^(\S.*\S)\t(\d+)\n$/ or die "$_";
 	die if defined $pctb_commodmap{$1};  $pctb_commodmap{$1}= $2;
 	die if defined $pctb_commodmap[$2];  $pctb_commodmap[$2]= $1;
-	$commods{$1} .= 'b';
+	$commods{$1}{Srcs} .= 'b';
     }
     $c->error and die $!;
     close $c or die $!;
@@ -216,10 +240,13 @@ sub get_our_version ($$) {
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
     $aref->{"${prefix}fixes"}= 'lastpage';
 
-    my $version= `git-describe --tags HEAD`; $? and die $?;
+    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;
+    # clientname	"ypp-sc-tools"
+    # clientversion	2.1-g2e06a26  [from git-describe --tags HEAD]
+    # clientfixes	"lastpage"  [space separated list]
 }
 
 sub pipethrough_prep () {
@@ -229,6 +256,7 @@ sub pipethrough_prep () {
 
 sub pipethrough_run_along ($$$@) {
     my ($tf, $childprep, $cmd, @a) = @_;
+    $tf->error and die $!;
     $tf->flush or die $!;
     $tf->seek(0,0) or die $!;
     my $fh= new IO::File;
@@ -299,7 +327,8 @@ sub cgipostform ($$$) {
 	return $';
     } else {
 	my $resp= $ua->request($req);
-	die $resp->status_line unless $resp->is_success;
+	die $resp->status_line."\n".$resp->content."\n "
+	    unless $resp->is_success;
 	return $resp->content();
     }
 }
@@ -353,4 +382,8 @@ sub cgi_get_caller () {
     return $caller;
 }
 
+sub set_ctype_utf8 () {
+    setlocale(LC_CTYPE, "en.UTF-8");
+}
+
 1;