Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-01-16 23:47:58 +01:00
parent 06eb63183e
commit 5b3e181227
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/ryzom/client/src/browse_faq.cpp
View file

@ -52,6 +52,7 @@ void browseFAQ(NLMISC::CConfigFile &cf)
} }
} }
} }
if (url.empty()) if (url.empty())
{ {
// not found // not found

46
code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp
View file

@ -59,19 +59,19 @@ struct CSheetWordListBuilder : public IWordListBuilder
virtual bool buildWordList(std::vector<string> &allWords, string workSheetFileName) virtual bool buildWordList(std::vector<string> &allWords, string workSheetFileName)
{ {
SheetExt= toLower(SheetExt); SheetExt= toLower(SheetExt);
// verify the directory is correct // verify the directory is correct
if(!CFile::isDirectory(SheetPath)) if(!CFile::isDirectory(SheetPath))
{ {
nlwarning("Error: Directory '%s' not found. '%s' Aborted", SheetPath.c_str(), workSheetFileName.c_str()); nlwarning("Error: Directory '%s' not found. '%s' Aborted", SheetPath.c_str(), workSheetFileName.c_str());
return false; return false;
} }
// list all files. // list all files.
std::vector<string> allFiles; std::vector<string> allFiles;
allFiles.reserve(100000); allFiles.reserve(100000);
CPath::getPathContent(SheetPath, true, false, true, allFiles, NULL); CPath::getPathContent(SheetPath, true, false, true, allFiles, NULL);
// Keep only the extension we want, and remove "_" (parent) // Keep only the extension we want, and remove "_" (parent)
allWords.clear(); allWords.clear();
allWords.reserve(allFiles.size()); allWords.reserve(allFiles.size());
@ -91,7 +91,7 @@ struct CSheetWordListBuilder : public IWordListBuilder
return true; return true;
} }
}; };
@ -103,7 +103,7 @@ struct CRegionPrimWordListBuilder : public IWordListBuilder
{ {
string PrimPath; string PrimPath;
vector<string> PrimFilter; vector<string> PrimFilter;
virtual bool buildWordList(std::vector<string> &allWords, string workSheetFileName) virtual bool buildWordList(std::vector<string> &allWords, string workSheetFileName)
{ {
// verify the directory is correct // verify the directory is correct
@ -112,12 +112,12 @@ struct CRegionPrimWordListBuilder : public IWordListBuilder
nlwarning("Error: Directory '%s' not found. '%s' Aborted", PrimPath.c_str(), workSheetFileName.c_str()); nlwarning("Error: Directory '%s' not found. '%s' Aborted", PrimPath.c_str(), workSheetFileName.c_str());
return false; return false;
} }
// list all files. // list all files.
std::vector<string> allFiles; std::vector<string> allFiles;
allFiles.reserve(100000); allFiles.reserve(100000);
CPath::getPathContent(PrimPath, true, false, true, allFiles, NULL); CPath::getPathContent(PrimPath, true, false, true, allFiles, NULL);
// parse all primitive that match the filter // parse all primitive that match the filter
allWords.clear(); allWords.clear();
allWords.reserve(100000); allWords.reserve(100000);
@ -146,11 +146,11 @@ struct CRegionPrimWordListBuilder : public IWordListBuilder
return false; return false;
} }
CPrimitiveContext::instance().CurrentPrimitive = NULL; CPrimitiveContext::instance().CurrentPrimitive = NULL;
// For all primitives of interest // For all primitives of interest
const char *listClass[]= {"continent", "region", "place", "stable", const char *listClass[]= {"continent", "region", "place", "stable",
"teleport_destination", "room_template"}; "teleport_destination", "room_template"};
const char *listProp[]= {"name", "name", "name", "name", const char *listProp[]= {"name", "name", "name", "name",
"place_name", "place_name"}; "place_name", "place_name"};
const uint numListClass= sizeof(listClass)/sizeof(listClass[0]); const uint numListClass= sizeof(listClass)/sizeof(listClass[0]);
const uint numListProp= sizeof(listProp)/sizeof(listProp[0]); const uint numListProp= sizeof(listProp)/sizeof(listProp[0]);
@ -178,7 +178,7 @@ struct CRegionPrimWordListBuilder : public IWordListBuilder
} }
} }
} }
return true; return true;
} }
}; };
@ -199,7 +199,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
} }
// get the key column index // get the key column index
uint keyColIndex = 0; uint keyColIndex = 0;
if(!workSheet.findCol(columnId, keyColIndex)) if(!workSheet.findCol(columnId, keyColIndex))
{ {
nlwarning("Error: Don't find the column '%s'. '%s' Aborted", columnId.c_str(), workSheetFileName.c_str()); nlwarning("Error: Don't find the column '%s'. '%s' Aborted", columnId.c_str(), workSheetFileName.c_str());
@ -220,7 +220,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
ucstring key= workSheetLwr.getData(i, keyColIndex); ucstring key= workSheetLwr.getData(i, keyColIndex);
workSheetLwr.setData(i, keyColIndex, toLower(key)); workSheetLwr.setData(i, keyColIndex, toLower(key));
} }
// **** List all words with the builder given // **** List all words with the builder given
std::vector<string> allWords; std::vector<string> allWords;
@ -247,7 +247,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
workSheet.resize(workSheet.size()+1); workSheet.resize(workSheet.size()+1);
workSheet.setData(rowIdx, keyColIndex, keyName); workSheet.setData(rowIdx, keyColIndex, keyName);
workSheet.setData(rowIdx, nameColIndex, string("<GEN>")+keyName); workSheet.setData(rowIdx, nameColIndex, string("<GEN>")+keyName);
nbAdd++; nbAdd++;
} }
} }
@ -284,7 +284,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
{ {
nbRemove++; nbRemove++;
// log // log
NLMISC::InfoLog->displayRawNL("'%s': '%s' entry erased at line '%d'.", workSheetFileName.c_str(), NLMISC::InfoLog->displayRawNL("'%s': '%s' entry erased at line '%d'.", workSheetFileName.c_str(),
keyStr.c_str(), i); keyStr.c_str(), i);
} }
} }
@ -343,12 +343,12 @@ int extractNewSheetNames(int argc, char *argv[])
return -1; return -1;
} }
} }
// **** avoid some flood // **** avoid some flood
NLMISC::createDebug(); NLMISC::createDebug();
NLMISC::DebugLog->addNegativeFilter("numCol changed to"); NLMISC::DebugLog->addNegativeFilter("numCol changed to");
NLMISC::InfoLog->addNegativeFilter("CPath::addSearchPath"); NLMISC::InfoLog->addNegativeFilter("CPath::addSearchPath");
// **** read the configuration file // **** read the configuration file
CConfigFile cf; CConfigFile cf;
@ -375,14 +375,12 @@ int extractNewSheetNames(int argc, char *argv[])
LigoConfig.readPrimitiveClass(ligoPath.c_str(), false); LigoConfig.readPrimitiveClass(ligoPath.c_str(), false);
NLLIGO::Register(); NLLIGO::Register();
CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig; CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig;
// **** Parse all the different type of sheets // **** Parse all the different type of sheets
const char *sheetDefs[]= const char *sheetDefs[]=
{ {
// 1st is the name of the worksheet file. // 1st is the name of the worksheet file.
// 2nd is the Key column identifier. // 2nd is the Key column identifier.
// 3rd is the sheet extension // 3rd is the sheet extension
// 4th is the directory where to find new sheets // 4th is the directory where to find new sheets
"work/item_words_wk.txt", "item ID", "sitem", "leveldesign/game_element/sitem", "work/item_words_wk.txt", "item ID", "sitem", "leveldesign/game_element/sitem",
@ -391,7 +389,7 @@ int extractNewSheetNames(int argc, char *argv[])
"work/sphrase_words_wk.txt", "sphrase ID", "sphrase", "leveldesign/game_element/sphrase", "work/sphrase_words_wk.txt", "sphrase ID", "sphrase", "leveldesign/game_element/sphrase",
}; };
uint numSheetDefs= sizeof(sheetDefs) / (4*sizeof(sheetDefs[0])); uint numSheetDefs= sizeof(sheetDefs) / (4*sizeof(sheetDefs[0]));
// For all different type of sheet // For all different type of sheet
for(uint i=0;i<numSheetDefs;i++) for(uint i=0;i<numSheetDefs;i++)
{ {
@ -401,7 +399,6 @@ int extractNewSheetNames(int argc, char *argv[])
extractNewWords(sheetDefs[i*4+0], sheetDefs[i*4+1], builder); extractNewWords(sheetDefs[i*4+0], sheetDefs[i*4+1], builder);
} }
// **** Parse place and region names // **** Parse place and region names
{ {
// build place names // build place names
@ -412,7 +409,6 @@ int extractNewSheetNames(int argc, char *argv[])
extractNewWords("work/place_words_wk.txt", "placeId", builder); extractNewWords("work/place_words_wk.txt", "placeId", builder);
} }
return 0; return 0;
} }