| 62 |
|
std::transform(one.begin(), one.end(), one_.begin(), ::tolower); |
| 63 |
|
std::transform(two.begin(), two.end(), two_.begin(), ::tolower); |
| 64 |
|
|
| 65 |
+ |
if (one_ == two_) return one < two; |
| 66 |
+ |
|
| 67 |
|
return one_ < two_; |
| 68 |
|
} |
| 69 |
|
|
| 75 |
|
this->path = *node/"jargon"; |
| 76 |
|
this->matcher = *node/"matcher"; |
| 77 |
|
|
| 78 |
< |
char* path[] = { new char[this->path.size()] }; |
| 78 |
> |
char* path[] = { new char[this->path.GetData().GetSize()] }; |
| 79 |
|
|
| 80 |
< |
std::strcpy(path[0], this->path.c_str()); |
| 80 |
> |
std::strcpy(path[0], this->path.NullTerminate()); |
| 81 |
|
|
| 82 |
|
::FTS* traversal(::fts_open(path, FTS_LOGICAL, NULL)); |
| 83 |
|
Matcher matcher("^" + this->path + "/(" + this->matcher + ")$"); |
| 173 |
|
{ |
| 174 |
|
api::Cout << "Content-Type: text/html; charset=UTF-8\r\n\r\n"; |
| 175 |
|
|
| 176 |
< |
_M::iterator include(cgi.find("include")); |
| 177 |
< |
|
| 178 |
< |
if (include != cgi.end()) |
| 179 |
< |
{ |
| 178 |
< |
Jargon jargon(path + "/" + selection, |
| 179 |
< |
lexical_cast<bool>(include->second)); |
| 176 |
> |
Jargon jargon(path, selection, cgi.find("include") != cgi.end() |
| 177 |
> |
&& lexical_cast<bool>(ext::String(cgi.find("include")->second)), |
| 178 |
> |
cgi.find("relative") != cgi.end() |
| 179 |
> |
? ext::String(cgi.find("relative")->second) : ext::String()); |
| 180 |
|
|
| 181 |
< |
api::Cout << jargon; |
| 182 |
< |
} |
| 183 |
< |
else |
| 184 |
< |
{ |
| 185 |
< |
Jargon jargon(path + "/" + selection); |
| 186 |
< |
|
| 187 |
< |
api::Cout << jargon; |
| 188 |
< |
} |
| 181 |
> |
api::Cout << jargon; |
| 182 |
|
} |
| 183 |
|
else |
| 184 |
|
{ |
