canon: lift commod numbering base62 out of findcommod

[ypp-sc-tools.main.git] / yarrg / canon

diff --git a/yarrg/canon b/yarrg/canon
index a9f9801ee63bbebb8252bb8d86fac690ab6a5c5a..e756297e7d525ee880efb0fa7622f8432d87d6ef 100755 (executable)
--- a/yarrg/canon
+++ b/yarrg/canon
@@ -40,10 +40,9 @@ sub findcommod ($) {
     my ($cname) = @_;
     my $me= $commodmap{$cname};  return $me if defined $me;
     my $val= $nextcommod++;
-    my $res= alencodenum($val);
-    $commodmap{$cname}= $res;
+    $commodmap{$cname}= $val;
 #    printf "%s:%s\n", $res,$cname;
-    return $res;
+    return $val;
 }
 
 my $laststall='';
@@ -61,7 +60,7 @@ foreach my $k (sort keys %s) {
             printf "\"%s\n", $stall;
             $laststall= $stall;
         }
-        print findcommod($commod);
+        print alencodenum(findcommod($commod));
     };
 
     if (!defined($r[2])) {