Rename yppsc-* helpers

diff --git a/pctb/README b/pctb/README
index c747534a1328c770cc373ae5d25de03308575eda..003df0ce009eff0690535e20554a2e846bf1ce39 100644 (file)
--- a/pctb/README
+++ b/pctb/README
@@ -94,8 +94,8 @@ The program reads and writes the following files:
 
 These files are all in the current working directory.  There is not
 yet any feature to have them be somewhere else.  The helper programs
 
 These files are all in the current working directory.  There is not
 yet any feature to have them be somewhere else.  The helper programs

-  yppsc-ocr-resolver
-  yppsc-commod-processor
+  dictionary-manager
+  commod-results-processor

 must (currently) also be in the current directory.
 
 Future versions may have more helpers and more data files.
 must (currently) also be in the current directory.
 
 Future versions may have more helpers and more data files.

diff --git a/pctb/yppsc-commod-processor b/pctb/commod-results-processor
similarity index 100%
rename from pctb/yppsc-commod-processor
rename to pctb/commod-results-processor

diff --git a/pctb/convert.c b/pctb/convert.c
index b9325e88dcfacaf05be5ce374b6400e5fdae3915..bb1073f4bf6ac20a391dbfc5bddadc4fef2f43f9 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -97,9 +97,7 @@ static void run_analysis(void) {
 
   if (!processor) {
     sysassert( dup2(fileno(tf),0) ==0 );
 
   if (!processor) {
     sysassert( dup2(fileno(tf),0) ==0 );

-    execlp("./yppsc-commod-processor", "yppsc-commod-processor",
-          o_outputmode, (char*)0);
-    sysassert(!"execlp commod-processor failed");
+    EXECLP_HELPER("commod-results-processor", o_outputmode, (char*)0);

   }
 
   waitpid_check_exitstatus(processor, "output processor/uploader");
   }
 
   waitpid_check_exitstatus(processor, "output processor/uploader");

diff --git a/pctb/yppsc-decode-marketdata b/pctb/decode-pctb-marketdata
similarity index 100%
rename from pctb/yppsc-decode-marketdata
rename to pctb/decode-pctb-marketdata

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index aaa9e132e457297435b425d0c58cc6f6e8a84a87..0037a2a6f57474e6770dea0ad6ab54966874a6d9 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -335,7 +335,7 @@ proc required/pixmap {} {
     set data [exec pnmscale 2 << $ppm]
     image create photo image/main -data $data
 
     set data [exec pnmscale 2 << $ppm]
     image create photo image/main -data $data
 

-    set alloptions [exec ./yppsc-resolver-pixoptions $unk_what]
+    set alloptions [exec ./dictionary-pixmap-options $unk_what]

 
     read_database ./pixmaps.txt
 
 
     read_database ./pixmaps.txt
 

diff --git a/pctb/yppsc-resolver-pixoptions b/pctb/dictionary-pixmap-options
similarity index 100%
rename from pctb/yppsc-resolver-pixoptions
rename to pctb/dictionary-pixmap-options

diff --git a/pctb/yppsc-ppmlookup b/pctb/yppsc-ppmlookup
deleted file mode 100755 (executable)
index efb785d..0000000
--- a/pctb/yppsc-ppmlookup
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -ex
-
-needle=$(pnmnoraw)
-
-exec 3<database.ppm
-
-while true; do
-       read <&3 title
-       if [ x"$title" = x. ]; then
-               exit 0
-       fi
-       straw=$(pnmnoraw <&3)
-       if [ x"$straw" = x"$needle" ]; then
-               printf "%s\n" "$title"
-               exit 0
-       fi
-done