bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New config file token: LocationAlias.

Browse Source
This commit is contained in:
Stas Degteff
2005-10-02 12:17:28 +00:00
parent 694e568d82
commit 9f8c325884
11 changed files with 188 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cfgs/config/advanced.cfg
View File

@@ -243,6 +243,13 @@ DISPAREANO YES ; Only shows it if available.
;DispHdrLocation No
DispHdrLocation Yes
// Substitutions for the city name retrieved from nodelist to display in
// message header delimeter line. May be used to show national-language
// names of the nodes cities.
// LocationAlias is used when "DispHdrLocation" sets to "Yes".
;LocationAlias "sity" "alias"
;INCLUDE aliasru.cfg ; Russian city names
// Positions and lengths of name/node/date fields in header display.
// These are the default values.
;DISPHDRNAMESET 8 36

6
cfgs/config/advanced.rus
View File

@@ -216,6 +216,12 @@ DispAreaNo Yes ;
;DispHdrLocation No
DispHdrLocation Yes
// <20><><EFBFBD><EFBFBD>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>த<EFBFBD><E0AEA4> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>ப<EFBFBD>-ࠧ<><E0A0A7><EFBFBD><EFBFBD>⥫<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// <20> ⥫<> ᮮ<>饭<EFBFBD><E9A5AD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>த<EFBFBD><E0AEA4>.
// <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ⮫쪮 <20><><EFBFBD> 㪠<><E3AAA0><EFBFBD><EFBFBD><EFBFBD> DispHdrLocation Yes.
;LocationAlias "<22><>த" "<22><><EFBFBD><EFBFBD><EFBFBD>"
;INCLUDE aliasru.cfg
// <20><>ᯮ<EFBFBD><E1AFAE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>࠭<EFBFBD>.
// <20><><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0><EFBFBD><EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD> <20><> 㬮<>砭<EFBFBD><E7A0AD>.
;DispHdrNameSet 8 36

140
cfgs/config/aliasru.cfg Executable file
View File

@@ -0,0 +1,140 @@
LocationAlias " Belarus" ""
LocationAlias " Crimea" ""
LocationAlias " Kazakhstan" ""
LocationAlias " Mari El" ""
LocationAlias " MariEl" ""
LocationAlias " region" ""
LocationAlias " Russia" ""
LocationAlias " UA" ""
LocationAlias " Ukraina" ""
LocationAlias " Ukraine" ""
LocationAlias "Belozerye Cherkassy" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><>ઠ<EFBFBD><E0AAA0><EFBFBD>
LocationAlias Komsomolsk-on-Amur <20><><EFBFBD>ᮬ<EFBFBD><E1AEAC><EFBFBD><EFBFBD><EFBFBD>-<2D><>-<2D><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias "Naberezhnye Chelny" "<22><><EFBFBD><EFBFBD>०<EFBFBD><E0A5A6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
LocationAlias Yuzhno-Sakhalinsk <20><><EFBFBD><EFBFBD>-<2D><>堫<EFBFBD><E5A0AB><EFBFBD><EFBFBD>
LocationAlias Dniepropetrowsk <20><><EFBFBD><EFBFBD>ய<EFBFBD><E0AEAF>஢<EFBFBD><E0AEA2>
LocationAlias Ivano-Frankivsk <20><><EFBFBD><EFBFBD><EFBFBD>-<2D>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias "Nizhny Novgorod" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>த"
LocationAlias "Novaya Kakhovka" "<22><><EFBFBD><EFBFBD><EFBFBD> <20><>客<EFBFBD><E5AEA2>"
LocationAlias Novocheboksarsk <20><><EFBFBD><EFBFBD>祡<EFBFBD><E7A5A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Petropavlovsk <20><><EFBFBD>ய<EFBFBD><E0AEAF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Rostov-on-Don <20><><EFBFBD>⮢-<2D><>-<2D><><EFBFBD><EFBFBD>
LocationAlias Severodonetsk <20><><EFBFBD><EFBFBD>த<EFBFBD><E0AEA4><EFBFBD><EFBFBD><EFBFBD>
LocationAlias St.Petersburg <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Chernyahovsk <20><><EFBFBD><EFBFBD><EFBFBD>客<EFBFBD><E5AEA2>
LocationAlias Ekaterinburg <20><><EFBFBD><EFBFBD><EFBFBD>ਭ<EFBFBD><E0A8AD><EFBFBD><EFBFBD>
LocationAlias Yekaterinburg <20><><EFBFBD><EFBFBD><EFBFBD>ਭ<EFBFBD><E0A8AD><EFBFBD><EFBFBD>
LocationAlias Petrozavodsk <20><><EFBFBD>஧<EFBFBD><E0AEA7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias St.Peterburg <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Chelyabinsk <20><><EFBFBD><EFBFBD><EFA1A8><EFBFBD>
LocationAlias Joshkar-Ola <20><>誠<EFBFBD>-<2D><><EFBFBD>
LocationAlias Khmelnitsky <20><><EFBFBD><EFBFBD>쭨檨<ECADA8>
LocationAlias Krasnoyarsk <20><><EFBFBD>᭮<EFBFBD><E1ADAE><EFBFBD><EFBFBD>
LocationAlias Kuznetsovsk <20>㧭<EFBFBD>殢<EFBFBD><E6AEA2>
LocationAlias Leninogorsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Nefteugansk <20><><EFBFBD><EFBFBD><EFBFBD>㣠<EFBFBD><E3A3A0><EFBFBD>
LocationAlias Novosibirsk <20><><EFBFBD><EFBFBD>ᨡ<EFBFBD><E1A8A1><EFBFBD><EFBFBD>
LocationAlias Sayanogorsk <20><>ﭮ<EFBFBD><EFADAE><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Severomorsk <20><><EFBFBD><EFBFBD>஬<EFBFBD><E0AEAC><EFBFBD><EFBFBD>
LocationAlias Vladivostok <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⮪
LocationAlias Zapolyarnie <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Cheboksary <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Dzerzhinsk <20><><EFBFBD>ন<EFBFBD><E0A6A8><EFBFBD>
LocationAlias Khabarovsk <20><><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2>
LocationAlias Michurinsk <20><><EFBFBD><EFBFBD>ਭ<EFBFBD><E0A8AD>
LocationAlias Sebastopol <20><><EFBFBD><EFBFBD><EFBFBD>⮯<EFBFBD><E2AEAF><EFBFBD>
LocationAlias Sevastopol <20><><EFBFBD><EFBFBD><EFBFBD>⮯<EFBFBD><E2AEAF><EFBFBD>
LocationAlias Simferopol <20><><EFBFBD><EFBFBD><EFBFBD>ய<EFBFBD><E0AEAF><EFBFBD>
LocationAlias Volgodonsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Zaporozhye <20><><EFBFBD><EFBFBD>஦<EFBFBD><E0AEA6>
LocationAlias Cherkassy <20><>ઠ<EFBFBD><E0AAA0><EFBFBD>
LocationAlias Chornobyl <20><>୮<EFBFBD><E0ADAE><EFBFBD><EFBFBD>
LocationAlias Essentuky <20><>ᥭ<EFBFBD>㪨
LocationAlias Karaganda <20><>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD>
LocationAlias Krasnodar <20><><EFBFBD>᭮<EFBFBD><E1ADAE><EFBFBD>
LocationAlias Leningrad <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Lomonosov <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ
LocationAlias Samarkand <20><><EFBFBD><EFBFBD>ઠ<EFBFBD><E0AAA0>
LocationAlias Stavropol <20>⠢ய<E2A0A2><E0AEAF><EFBFBD>
LocationAlias Ussuriisk <20><><EFBFBD><EFBFBD>਩<EFBFBD><E0A8A9>
LocationAlias Volgograd <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ࠤ
LocationAlias Zhukovsky <20>㪮<EFBFBD>᪨<EFBFBD>
LocationAlias Alma-Ata <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Belgorod <20><><EFBFBD><EFBFBD><EFBFBD>த
LocationAlias Chisinau <20><>設e<E8A8AD>
LocationAlias Gorlovka <20><>૮<EFBFBD><E0ABAE><EFBFBD>
LocationAlias Kemerovo <20><><EFBFBD><EFBFBD>஢<EFBFBD>
LocationAlias Kishinau <20><>設e<E8A8AD>
LocationAlias Kishinev <20><>設e<E8A8AD>
LocationAlias Kostroma <20><><EFBFBD><EFBFBD>஬<EFBFBD>
LocationAlias Markovka <20><>મ<EFBFBD><E0AAAE><EFBFBD>
LocationAlias Murmansk <20><>ଠ<EFBFBD><E0ACA0><EFBFBD>
LocationAlias Nikolaev <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Novgorod <20><><EFBFBD><EFBFBD><EFBFBD>த
LocationAlias Orenburg <20>७<EFBFBD><E0A5AD><EFBFBD><EFBFBD>
LocationAlias Pavlodar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Simbirsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Smolensk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Tashkent <20><>誥<EFBFBD><E8AAA5>
LocationAlias Tiraspol <20><><EFBFBD><EFBFBD>ᯮ<EFBFBD><E1AFAE>
LocationAlias Vladimir <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Voronezh <20><>஭<EFBFBD><E0AEAD>
LocationAlias Angarsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Barnaul <20><>ୠ<EFBFBD><E0ADA0>
LocationAlias Bendery <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Borisov <20><><EFBFBD><EFBFBD>ᮢ
LocationAlias Bryansk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Donetsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Giessen <20><><EFBFBD>ᥭ
LocationAlias Irkutsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Ivanovo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Izhevsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Kharkov <20><><EFBFBD>쪮<EFBFBD>
LocationAlias Kherson <20><><EFBFBD>ᮭ
LocationAlias kherson <20><><EFBFBD>ᮭ
LocationAlias Klichev <20><><EFBFBD>祢
LocationAlias Kolomna <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Lipetsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Lugansk <20>㣠<EFBFBD><E3A3A0><EFBFBD>
LocationAlias Poltava <20><><EFBFBD>⠢<EFBFBD>
LocationAlias Pushkin <20><>誨<EFBFBD>
LocationAlias Saratov <20><><EFBFBD><EFBFBD>⮢
LocationAlias Vologda <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Vorkuta <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Abakan <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Astana <20><>⠭<EFBFBD>
LocationAlias Bobrov <20><><EFBFBD>஢
LocationAlias Bratsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Dniepr <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Kaluga <20><><EFBFBD>㣠
LocationAlias kurgan <20><>࣠<EFBFBD>
LocationAlias Kurgan <20><>࣠<EFBFBD>
LocationAlias Moscow <20><>᪢<EFBFBD>
LocationAlias Odessa <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Ryazan <20>易<EFBFBD><EFA7A0>
LocationAlias Samara <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Surgut <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Tambov <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Tyumen <20><EFBFBD><EEACA5>
LocationAlias Vyatka <20><>⪠
LocationAlias Brest <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Cahul <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Dnepr <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Gomel <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Kazan <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Kijow <20><><EFBFBD><EFBFBD>
LocationAlias Kursk <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Minsk <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Penza <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Pskov <20>᪮<EFBFBD>
LocationAlias Tomsk <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Kiev <20><><EFBFBD><EFBFBD>
LocationAlias Kyiv <20><><EFBFBD><EFBFBD>
LocationAlias Lviv <20>좮<EFBFBD>
LocationAlias Omsk <20><><EFBFBD><EFBFBD>
LocationAlias Orel <20>५
LocationAlias Perm <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Riga <20><><EFBFBD><EFBFBD>
LocationAlias Tula <20>㫠
LocationAlias Tver <20><><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Ufa <20><><EFBFBD>

3
docs/notework.txt
View File

@@ -10,6 +10,9 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________
+ New config file token: LocationAlias. Used to display national city names
in bottom delimeter of the message header.
- Fix MS Visual C 6.0 library bug in vector::sort(). GoldNode+/MSVC sort
nodelist correctly with nodes quantity > 32767 now.
(Patch from Ianos Gnatiuc 2:5030/830.17)

3
docs/tokencfg.txt
View File

@@ -1,5 +1,4 @@
* Golded+ config file tokens list.
*$Id$
==========================================================================
ADDRESS
ADDRESSBOOKADD
@@ -216,8 +215,8 @@ KEYBMODE
KEYBSTACK
KLUDGE
KLUDGECHRS
LAST_CRC
LOADLANGUAGE
LOCATIONALIAS
LOGFILE
LOGFORMAT
LOGLEVEL

1
golded3/gccfgg.h
View File

@@ -238,6 +238,7 @@ const word CRC_KEYBSTACK = 0x5F23;
const word CRC_KLUDGE = 0xA600;
const word CRC_KLUDGECHRS = 0x0EEF;
const word CRC_LOADLANGUAGE = 0x9F1B;
const word CRC_LOCATIONALIAS = 0x1B5F;
const word CRC_LOGFILE = 0x8ACE;
const word CRC_LOGFORMAT = 0x9E51;
const word CRC_LOGLEVEL = 0xCF59;

1
golded3/gccfgg0.cpp
View File

@@ -410,6 +410,7 @@ SwitchK:
SwitchL:
switch(crc) {
case CRC_LOADLANGUAGE : CfgLoadlanguage (); break;
case CRC_LOCATIONALIAS : CfgLocationalias (); break;
case CRC_LOGFILE : CfgLogfile (); break;
case CRC_LOGFORMAT : CfgLogformat (); break;
default : found = false;

11
golded3/gccfgg5.cpp
View File

@@ -320,6 +320,17 @@ void CfgLoadlanguage() {
// ------------------------------------------------------------------
void CfgLocationalias()
{
char* key;
getkeyval(&key, &val);
StripQuotes(key);
StripQuotes(val);
CFG->locationalias.Add(key, val);
}
// ------------------------------------------------------------------
void CfgLogfile() {
strcpy(CFG->logfile, val);

1
golded3/gcprot.h
View File

@@ -228,6 +228,7 @@ void CfgKeybstack ();
void CfgKludge ();
void CfgKludgechrs ();
void CfgLoadlanguage ();
void CfgLocationalias ();
void CfgLogfile ();
void CfgLogformat ();
void CfgLookupecho ();

1
golded3/gecfgg.h
View File

@@ -254,6 +254,7 @@ public:
char keybstack[80]; // keybuf[80];
gstrarray kludge;
Path loadlanguage;
GStrBag2 locationalias;
Path logfile; // goldedlog;
int logformat;
std::vector<MailList> mailinglist;

17
golded3/genode.cpp
View File

@@ -1136,7 +1136,22 @@ void LookupNodeLocation(GMsg* msg, std::string &location, int what)
if (addr.invalid())
buf[0] = NUL;
item.loc = location = buf;
std::string city = buf;
GStrBag2 &strbag = CFG->locationalias;
if (strbag.First())
{
do
{
const char* str = strbag.Current1();
size_t pos = city.find(str);
if (pos != city.npos)
city.replace(pos, strlen(str), strbag.Current2());
}
while (strbag.Next());
}
item.loc = location = city;
cash.insert(it, item);
}