smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ change call of function appendToFirstOccurence() and replaceRegex()

This commit is contained in:
kelson42 2012-06-28 12:53:06 +00:00
parent 084af011dd
commit 28138e7ff9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/kiwix/library.cpp
View File

@ -63,10 +63,10 @@ namespace kiwix {
std::string id = path; std::string id = path;
if (!id.empty()) { if (!id.empty()) {
removeAccents(id); removeAccents(id);
replaceRegex(id, "", "^.*/"); id = replaceRegex(id, "", "^.*/");
replaceRegex(id, "", "\\.zim[a-z]*$"); id = replaceRegex(id, "", "\\.zim[a-z]*$");
replaceRegex(id, "_", " "); id = replaceRegex(id, "_", " ");
replaceRegex(id, "plus", "\\+"); id = replaceRegex(id, "plus", "\\+");
} }
return id; return id;
} }

12
src/common/regexTools.cpp
View File

@ -53,7 +53,7 @@ bool matchRegex(const std::string &content, const std::string &regex) {
return matcher->find(); return matcher->find();
} }
void replaceRegex(std::string &content, const std::string &replacement, const std::string &regex) { std::string replaceRegex(const std::string &content, const std::string &replacement, const std::string &regex) {
ucnv_setDefaultName("UTF-8"); ucnv_setDefaultName("UTF-8");
UnicodeString ucontent = UnicodeString(content.c_str()); UnicodeString ucontent = UnicodeString(content.c_str());
UnicodeString ureplacement = UnicodeString(replacement.c_str()); UnicodeString ureplacement = UnicodeString(replacement.c_str());
@ -63,10 +63,10 @@ void replaceRegex(std::string &content, const std::string &replacement, const st
UnicodeString uresult = matcher->replaceAll(ureplacement, status); UnicodeString uresult = matcher->replaceAll(ureplacement, status);
std::string tmp; std::string tmp;
uresult.toUTF8String(tmp); uresult.toUTF8String(tmp);
content=tmp; return tmp;
} }
void appendToFirstOccurence(std::string &content, const std::string regex, const std::string &replacement) { std::string appendToFirstOccurence(const std::string &content, const std::string regex, const std::string &replacement) {
ucnv_setDefaultName("UTF-8"); ucnv_setDefaultName("UTF-8");
UnicodeString ucontent = UnicodeString(content.c_str()); UnicodeString ucontent = UnicodeString(content.c_str());
UnicodeString ureplacement = UnicodeString(replacement.c_str()); UnicodeString ureplacement = UnicodeString(replacement.c_str());
@ -78,7 +78,9 @@ void appendToFirstOccurence(std::string &content, const std::string regex, cons
ucontent.insert(matcher->end(status), ureplacement); ucontent.insert(matcher->end(status), ureplacement);
std::string tmp; std::string tmp;
ucontent.toUTF8String(tmp); ucontent.toUTF8String(tmp);
content=tmp; return tmp;
} }
return content;
} }

4
src/common/regexTools.h
View File

@ -26,7 +26,7 @@
#include <map> #include <map>
bool matchRegex(const std::string &content, const std::string &regex); bool matchRegex(const std::string &content, const std::string &regex);
void replaceRegex(std::string &content, const std::string &replacement, const std::string &regex); std::string replaceRegex(const std::string &content, const std::string &replacement, const std::string &regex);
void appendToFirstOccurence(std::string &content, const std::string regex, const std::string &replacement); std::string appendToFirstOccurence(const std::string &content, const std::string regex, const std::string &replacement);
#endif #endif