From 93732484adcab512e594a928af2536955e8d6cab Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 29 Jul 2009 15:35:34 +0100 Subject: [PATCH] Rename main program from ypp-commodities to yarrg --- .gitignore | 2 +- yarrg/Makefile | 6 +++--- yarrg/README | 18 +++++++++--------- yarrg/README.charset | 2 +- yarrg/README.privacy | 6 +++--- yarrg/commod-update-receiver | 2 +- yarrg/convert.c | 2 +- yarrg/convert.h | 2 +- yarrg/dictionary-update-receiver | 2 +- yarrg/x.gdb | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 9b65e57..d8076a5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ yarrg/*.o yarrg/t.* yarrg/u.* -yarrg/ypp-commodities +yarrg/yarrg yarrg/_*.* yarrg/OCEAN-*.db diff --git a/yarrg/Makefile b/yarrg/Makefile index 0df5174..446ef98 100644 --- a/yarrg/Makefile +++ b/yarrg/Makefile @@ -31,13 +31,13 @@ DEBUG=-g CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG) -TARGETS= ypp-commodities +TARGETS= yarrg all: clean-other-directory $(TARGETS) CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o rgbimage.o resolve.o -ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm +yarrg: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -lpcre -lm $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CONVERT_OBJS): ocr.h convert.h structure.h common.h @@ -45,10 +45,10 @@ $(CONVERT_OBJS): ocr.h convert.h structure.h common.h clean: rm -f *.o core core.* *~ vgcore.* rm -f t t.* u u.* v v.* *.tmp *.orig *.rej + rm -f ypp-commodities realclean: clean rm -f $(TARGETS) - rm -f raw.tsv rm -f _pages.ppm _pages.ppm.gz _upload-*.html _commodmap.tsv rm -f _master-*.txt _master-*.txt.gz _local-*.txt rm -f ./#pages#.ppm ./#upload-*#.html ./#commodmap#.tsv diff --git a/yarrg/README b/yarrg/README index 82301b2..a41493e 100644 --- a/yarrg/README +++ b/yarrg/README @@ -13,19 +13,19 @@ To build, install the dependencies, cd to this directory and type `make'. To screenscrape and upload to both servers, select `trade commodities' from the hold of a vessel or building, and run: - ./ypp-commodities + ./yarrg Currently we upload to the dedicated yarrg server yarrg.chiark.net, and also to pctb.ilk.org (the testing instance of the PCTB database, pending approval from the operators of the main server). Or, for example, for a tab-separated values dump: - ./ypp-commodities --tsv >commods.tsv + ./yarrg --tsv >commods.tsv While it is capturing the screenshots, do not move the mouse or use -the keyboard. Keyboard focus must stay in the YPP client window. -If you use Gnome or KDE you must raise the YPP client window so that -it is completely unobscured - the ypp-commodities program tries to do -this but metacity and kwin do not honour the request. +the keyboard. Keyboard focus must stay in the YPP client window. If +you use Gnome or KDE you must raise the YPP client window so that it +is completely unobscured - the yarrg program tries to do this but +metacity and kwin do not honour the request. Command-line options @@ -102,10 +102,10 @@ The supplied helper programs commod-results-processor database-info-fetch must (currently) also be in the current working directory when you run -the main ypp-commodities program. +the main yarrg program. The data files (see README.files) are also left in the current working -directory. There is notyet any feature to have the data files and +directory. There is not yet any feature to have the data files and helpers be somewhere else. @@ -121,7 +121,7 @@ for me to download that will help. At least keep a copy of it. If the problem is a failure to cope with some particular YPP client display and is reproducible, try running: - ./ypp-commodities --raw-tsv --single-page + ./yarrg --raw-tsv --single-page If this reproduces the problem, please email me the screenshot file _pages.ppm, which will consist only of the single screen, plus the error messasge. I'll then be able to understand what's wrong, diff --git a/yarrg/README.charset b/yarrg/README.charset index 28a1108..4650aa0 100644 --- a/yarrg/README.charset +++ b/yarrg/README.charset @@ -159,7 +159,7 @@ Enabling interactive character set update Now that you have read this document, you should rerun your OCR job with the --edit-charset option. So run - ./ypp-commodities --edit-charset + ./yarrg --edit-charset In future, this option is not usually needed, because it is the default if there is a local character set dictionary _local-.txt for the relevant character height. diff --git a/yarrg/README.privacy b/yarrg/README.privacy index 96477fd..188a657 100644 --- a/yarrg/README.privacy +++ b/yarrg/README.privacy @@ -5,9 +5,9 @@ The Special Circumstances YPP yarrg client talks to several different servers for different purposes. (The information below is true if you invoke the system using the main -`ypp-commodities' program. If you want to know the relationships -between it and its various helper programs, and the specific -behaviours of the helpers, you'll have to read the source. Sorry.) +`yarrg' program. If you want to know the relationships between it and +its various helper programs, and the specific behaviours of the +helpers, you'll have to read the source. Sorry.) 1. YARRG and PCTB servers diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver index 2c02c11..1fe408f 100755 --- a/yarrg/commod-update-receiver +++ b/yarrg/commod-update-receiver @@ -32,7 +32,7 @@ # clientname "ypp-sc-tools" # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] # clientfixes "lastpage" [space separated list] -# data filename=deduped.tsv.gz output of ypp-commodities --tsv +# data filename=deduped.tsv.gz output of yarrg --tsv use strict (qw(vars)); diff --git a/yarrg/convert.c b/yarrg/convert.c index 1f13850..93b1a2f 100644 --- a/yarrg/convert.c +++ b/yarrg/convert.c @@ -1,5 +1,5 @@ /* - * ypp-commodities main program: argument parsing etc. + * yarrg main program: argument parsing etc. */ /* * This is part of ypp-sc-tools, a set of third-party tools for assisting diff --git a/yarrg/convert.h b/yarrg/convert.h index 11f534b..6c01118 100644 --- a/yarrg/convert.h +++ b/yarrg/convert.h @@ -1,5 +1,5 @@ /* - * general header file for ypp-commodities + * general header file for yarrg */ /* * This is part of ypp-sc-tools, a set of third-party tools for assisting diff --git a/yarrg/dictionary-update-receiver b/yarrg/dictionary-update-receiver index d088236..98e64d5 100755 --- a/yarrg/dictionary-update-receiver +++ b/yarrg/dictionary-update-receiver @@ -28,7 +28,7 @@ # upload testing runes: # -# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./ypp-commodities --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv +# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./yarrg --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv # ./dictionary-manager --debug --approve-updates '' . . use strict (qw(vars)); diff --git a/yarrg/x.gdb b/yarrg/x.gdb index 1133843..8336e4e 100644 --- a/yarrg/x.gdb +++ b/yarrg/x.gdb @@ -1,4 +1,4 @@ -file ypp-commodities +file yarrg set args -Drect 2>u --edit-charset --find-island --ocean sage #break structure.c:596 if here!=aa_background break mustfail2 -- 2.30.2