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
Show Stats 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>®¤áâ ­®¢ª  ­ §¢ ­¨© £®à®¤®¢ ¤«ï ¯®ª §  ¢ áâப¥-à §¤¥«¨â¥«¥ § £®«®¢ª 
// ¨ ⥫  á®®¡é¥­¨ï. Œ®¦­® ¨á¯®«ì§®¢ âì ¤«ï ¯®ª §  àãááª¨å ­ §¢ ­¨© £®à®¤®¢.
// ˆ¬¥¥â á¬ë᫠⮫쪮 ¯à¨ 㪠§ ­¨¨ DispHdrLocation Yes.
;LocationAlias "£®à®¤" " «¨ á"
;INCLUDE aliasru.cfg
// <20> á¯®«®¦¥­¨¥ ¨ ¤«¨­  ¯®«¥© ˆ¬ï/€¤à¥á/„ â  ¢ ¢¥àåã íªà ­ .
// ‡¤¥áì 㪠§ ­ë §­ ç¥­¨ï ¯® 㬮«ç ­¨î.
;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>¥«®§¥àë¥-—¥àª ááë
LocationAlias Komsomolsk-on-Amur Š®¬á®¬®«ìáª-­ -€¬ãà¥
LocationAlias "Naberezhnye Chelny" "<22> ¡¥à¥¦­ë¥ —¥«­ë"
LocationAlias Yuzhno-Sakhalinsk ž¦­®-‘ å «¨­áª
LocationAlias Dniepropetrowsk „­¥¯à®¯¥â஢áª
LocationAlias Ivano-Frankivsk ˆ¢ ­®-”à ­ª®¢áª
LocationAlias "Nizhny Novgorod" "<22>¨¦­¨© <20>®¢£®à®¤"
LocationAlias "Novaya Kakhovka" "<22>®¢ ï Š å®¢ª "
LocationAlias Novocheboksarsk <20>®¢®ç¥¡®ªá àáª
LocationAlias Petropavlovsk <20>¥âய ¢«®¢áª
LocationAlias Rostov-on-Don <20>®á⮢-­ -„®­ã
LocationAlias Severodonetsk ‘¥¢¥à®¤®­¥æª
LocationAlias St.Petersburg ‘ ­ªâ-<2D>¥â¥à¡ãà£
LocationAlias Chernyahovsk —¥à­ï客áª
LocationAlias Ekaterinburg …ª â¥à¨­¡ãà£
LocationAlias Yekaterinburg …ª â¥à¨­¡ãà£
LocationAlias Petrozavodsk <20>¥â஧ ¢®¤áª
LocationAlias St.Peterburg ‘ ­ªâ-<2D>¥â¥à¡ãà£
LocationAlias Chelyabinsk —¥«ï¡¨­áª
LocationAlias Joshkar-Ola ‰®èª à-Ž« 
LocationAlias Khmelnitsky •¬¥«ì­¨æª¨©
LocationAlias Krasnoyarsk Šà á­®ïàáª
LocationAlias Kuznetsovsk Šã§­¥æ®¢áª
LocationAlias Leninogorsk ‹¥­¨­®£®àáª
LocationAlias Nefteugansk <20>¥äâ¥ã£ ­áª
LocationAlias Novosibirsk <20>®¢®á¨¡¨àáª
LocationAlias Sayanogorsk ‘ ï­®£®àáª
LocationAlias Severomorsk ‘¥¢¥à®¬®àáª
LocationAlias Vladivostok ‚« ¤¨¢®á⮪
LocationAlias Zapolyarnie ‡ ¯®«ïà­ë©
LocationAlias Cheboksary —¥¡®ªá àë
LocationAlias Dzerzhinsk „§¥à¦¨­áª
LocationAlias Khabarovsk • ¡ à®¢áª
LocationAlias Michurinsk Œ¨çãਭáª
LocationAlias Sebastopol ‘¥¢ á⮯®«ì
LocationAlias Sevastopol ‘¥¢ á⮯®«ì
LocationAlias Simferopol ‘¨¬ä¥à®¯®«ì
LocationAlias Volgodonsk ‚®«£®¤®­áª
LocationAlias Zaporozhye ‡ ¯®à®¦ì¥
LocationAlias Cherkassy —¥àª ááë
LocationAlias Chornobyl —¥à­®¡ë«ì
LocationAlias Essentuky …áᥭâ㪨
LocationAlias Karaganda Š à £ ­¤ 
LocationAlias Krasnodar Šà á­®¤ à
LocationAlias Leningrad ‘ ­ªâ-<2D>¥â¥à¡ãà£
LocationAlias Lomonosov ‹®¬®­®á®¢
LocationAlias Samarkand ‘ ¬ àª ­¤
LocationAlias Stavropol ‘⠢ய®«ì
LocationAlias Ussuriisk “ááã਩áª
LocationAlias Volgograd ‚®«£®£à ¤
LocationAlias Zhukovsky †ãª®¢áª¨©
LocationAlias Alma-Ata €«¬ âë
LocationAlias Belgorod <20>¥«£®à®¤
LocationAlias Chisinau Š¨è¨­e¢
LocationAlias Gorlovka ƒ®à«®¢ª 
LocationAlias Kemerovo Š¥¬¥à®¢®
LocationAlias Kishinau Š¨è¨­e¢
LocationAlias Kishinev Š¨è¨­e¢
LocationAlias Kostroma Š®áâ஬ 
LocationAlias Markovka Œ àª®¢ª 
LocationAlias Murmansk Œãଠ­áª
LocationAlias Nikolaev <20>¨ª®« ¥¢
LocationAlias Novgorod <20>®¢£®à®¤
LocationAlias Orenburg Žà¥­¡ãà£
LocationAlias Pavlodar <20> ¢«®¤ à
LocationAlias Simbirsk ‘¨¬¡¨àáª
LocationAlias Smolensk ‘¬®«¥­áª
LocationAlias Tashkent ’ èª¥­â
LocationAlias Tiraspol ’¨à á¯®«ì
LocationAlias Vladimir ‚« ¤¨¬¨à
LocationAlias Voronezh ‚®à®­¥¦
LocationAlias Angarsk €­£ àáª
LocationAlias Barnaul <20> à­ ã«
LocationAlias Bendery <20>¥­¤¥àë
LocationAlias Borisov <20>®à¨á®¢
LocationAlias Bryansk <20>àï­áª
LocationAlias Donetsk „®­¥æª
LocationAlias Giessen ƒ¥áᥭ
LocationAlias Irkutsk ˆàªãâáª
LocationAlias Ivanovo ˆ¢ ­®¢®
LocationAlias Izhevsk ˆ¦¥¢áª
LocationAlias Kharkov • à쪮¢
LocationAlias Kherson •¥àá®­
LocationAlias kherson •¥àá®­
LocationAlias Klichev Š«¨ç¥¢
LocationAlias Kolomna Š®«®¬­ 
LocationAlias Lipetsk ‹¨¯¥âáª
LocationAlias Lugansk ‹ã£ ­áª
LocationAlias Poltava <20>®«â ¢ 
LocationAlias Pushkin <20>ã誨­
LocationAlias Saratov ‘ à â®¢
LocationAlias Vologda ‚®«®£¤ 
LocationAlias Vorkuta ‚®àªãâ 
LocationAlias Abakan €¡ ª ­
LocationAlias Astana €áâ ­ 
LocationAlias Bobrov <20>®¡à®¢
LocationAlias Bratsk <20>à âáª
LocationAlias Dniepr „­¥¯à
LocationAlias Kaluga Š «ã£ 
LocationAlias kurgan Šã࣠­
LocationAlias Kurgan Šã࣠­
LocationAlias Moscow Œ®áª¢ 
LocationAlias Odessa Ž¤¥áá 
LocationAlias Ryazan <20>易­ì
LocationAlias Samara ‘ ¬ à 
LocationAlias Surgut ‘ãà£ãâ
LocationAlias Tambov ’ ¬¡®¢
LocationAlias Tyumen ’­ì
LocationAlias Vyatka ‚ï⪠
LocationAlias Brest <20>à¥áâ
LocationAlias Cahul Š åã«
LocationAlias Dnepr „­¥¯à
LocationAlias Gomel Ĩ´Ǔ
LocationAlias Kazan Š § ­ì
LocationAlias Kijow Š¨¥¢
LocationAlias Kursk Šãàáª
LocationAlias Minsk Œ¨­áª
LocationAlias Penza <20>¥­§ 
LocationAlias Pskov <20>᪮¢
LocationAlias Tomsk ’®¬áª
LocationAlias Kiev Š¨¥¢
LocationAlias Kyiv Š¨¥¢
LocationAlias Lviv ‹ì¢®¢
LocationAlias Omsk Ž¬áª
LocationAlias Orel Žà¥«
LocationAlias Perm <20>¥à¬ì
LocationAlias Riga <20>¨£ 
LocationAlias Tula ’ã« 
LocationAlias Tver ’¢¥àì
LocationAlias Ufa “ä 

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);
}