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

locationalias is case insensitive now

Browse Source
This commit is contained in:
Ianos Gnatiuc
2005-10-12 01:34:44 +00:00
parent fc011f01b9
commit 73b0d1b7d3
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cfgs/config/aliasru.cfg
View File

@@ -79,6 +79,7 @@ LocationAlias Cheboxary
LocationAlias Cherkassy <20><>ઠ<EFBFBD><E0AAA0><EFBFBD>
LocationAlias Chistopol <20><><EFBFBD>⮯<EFBFBD><E2AEAF>
LocationAlias Chornobyl <20><>୮<EFBFBD><E0ADAE><EFBFBD><EFBFBD>
LocationAlias Dalmatovo <20><><EFBFBD><EFBFBD><EFBFBD>⮢<EFBFBD>
LocationAlias Energodar <20><><EFBFBD>࣮<EFBFBD><E0A3AE><EFBFBD>
LocationAlias Essentuky <20><>ᥭ<EFBFBD>㪨
LocationAlias Karaganda <20><>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD>
@@ -100,7 +101,7 @@ LocationAlias Vasilyevo
LocationAlias Volgograd <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ࠤ
LocationAlias Yaroslavl <20><><EFBFBD>᫠<EFBFBD><E1ABA0><EFBFBD>
LocationAlias Zapolarny <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias zarechniy <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Zarechniy <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Zhukovsky <20>㪮<EFBFBD>᪨<EFBFBD>
LocationAlias Alma-Ata <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD>
LocationAlias Belgorod <20><><EFBFBD><EFBFBD><EFBFBD>த
@@ -135,6 +136,7 @@ LocationAlias Volzhsky
LocationAlias Voronezh <20><>஭<EFBFBD><E0AEAD>
LocationAlias Zauralie <20><><EFBFBD>ࠫ<EFBFBD><E0A0AB>
LocationAlias Angarsk <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Armavir <20>ଠ<EFBFBD><E0ACA0><EFBFBD>
LocationAlias Barnaul <20><>ୠ<EFBFBD><E0ADA0>
LocationAlias Bendery <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
LocationAlias Borisov <20><><EFBFBD><EFBFBD>ᮢ
@@ -146,7 +148,6 @@ LocationAlias Ivanovo
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>
@@ -176,7 +177,6 @@ LocationAlias Grodno
LocationAlias Kaluga <20><><EFBFBD>㣠
LocationAlias Ketovo <20><>⮢<EFBFBD>
LocationAlias Kobrin <20><><EFBFBD>ਭ
LocationAlias kurgan <20><>࣠<EFBFBD>
LocationAlias Kurgan <20><>࣠<EFBFBD>
LocationAlias Moscow <20><>᪢<EFBFBD>
LocationAlias Odessa <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

2
docs/notework.txt
View File

@@ -10,6 +10,8 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________
+ LocationAlias is case insensitive now.
+ Macro '@widepid' contains platform ID again.
! Golded+ now may be compiled on 64bit platforms.

2
golded3/gccfgg5.cpp
View File

@@ -326,7 +326,7 @@ void CfgLocationalias()
getkeyval(&key, &val);
StripQuotes(key);
StripQuotes(val);
CFG->locationalias.Add(key, val);
CFG->locationalias.Add(strupr(key), val);
}
// ------------------------------------------------------------------

17
golded3/genode.cpp
View File

@@ -30,6 +30,10 @@
#include <gftnnlge.h>
#include <gftnnlv7.h>
#if defined(__USE_ALLOCA__)
#include <malloc.h>
#endif
// ------------------------------------------------------------------
@@ -1141,12 +1145,19 @@ void LookupNodeLocation(GMsg* msg, std::string &location, int what)
if (strbag.First())
{
#if defined(__USE_ALLOCA__)
char *city_upr = (char*)alloca(city.length()+1);
#else
__extension__ char city_upr[city.length()+1];
#endif
strcpy(city_upr, city.c_str());
strupr(city_upr);
do
{
const char* str = strbag.Current1();
size_t pos = city.find(str);
if (pos != city.npos)
city.replace(pos, strlen(str), strbag.Current2());
const char* ptr = strstr(city_upr, str);
if (ptr) city.replace(ptr-city_upr, strlen(str), strbag.Current2());
}
while (strbag.Next());
}