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

Merge with develop

Browse source
This commit is contained in:
kervala 2015-12-16 00:07:51 +01:00
parent c91f9051e7
commit 335d0c00d6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/server/src/general_utilities_service/stat_globals.cpp
View file

@ -61,19 +61,19 @@ namespace STAT_GLOBALS
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }

6
code/ryzom/server/src/pd_support_service/stat_globals.cpp
View file

@ -61,19 +61,19 @@ namespace STAT_GLOBALS
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
{ {
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path; return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
} }