\n"
- << "
";
+ << "
";
_titleId = 0;
_htmlMode = false;
@@ -851,7 +965,7 @@ void DocWriter::writeDescription(std::ostream& ostr, const std::string& text)
{
std::string line;
while (it != end && *it != '\n') line += *it++;
- writeDescriptionLine(ostr, line, state);
+ writeDescriptionLine(ostr, line, state, pSstr);
if (it != end) ++it;
}
switch (state)
@@ -875,7 +989,7 @@ void DocWriter::writeDescription(std::ostream& ostr, const std::string& text)
}
-void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state)
+void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state, std::ostream* pSstr)
{
if (_htmlMode)
{
@@ -895,7 +1009,7 @@ void DocWriter::writeDescriptionLine(std::ostream& ostr, const std::string& text
switch (state)
{
case TEXT_PARAGRAPH:
- writeText(ostr, text);
+ writeText(ostr, text, pSstr);
break;
case TEXT_LIST:
ostr << "\n\n
";
@@ -1061,7 +1175,7 @@ std::string DocWriter::htmlizeName(const std::string& name)
}
-void DocWriter::writeText(std::ostream& ostr, const std::string& text)
+void DocWriter::writeText(std::ostream& ostr, const std::string& text, std::ostream* pSstr)
{
std::string::const_iterator it(text.begin());
std::string::const_iterator end(text.end());
@@ -1085,21 +1199,23 @@ void DocWriter::writeText(std::ostream& ostr, const std::string& text)
}
while (it != end && std::isspace(*it)) ++it;
ostr << "
<" << heading << ">" << format("
", _titleId++) << htmlize(std::string(it, end)) << "" << std::endl;
+ if (pSstr) *pSstr << std::string(it, end) << '\n';
return;
}
}
- writeText(ostr, it, end);
+ writeText(ostr, it, end, pSstr);
+ if (pSstr) *pSstr << ' ';
ostr << ' ';
}
-void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end)
+void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end, std::ostream* pSstr)
{
std::string token;
nextToken(begin, end, token);
while (!token.empty())
{
- if (!writeSymbol(ostr, token, begin, end) && !writeSpecial(ostr, token, begin, end))
+ if (!writeSymbol(ostr, token, begin, end, pSstr) && !writeSpecial(ostr, token, begin, end))
{
if (token == "[[")
{
@@ -1121,7 +1237,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin,
std::string target;
if (uri.compare(0, 7, "http://") == 0 || uri.compare(0, 8, "https://") == 0)
target = "_blank";
- writeTargetLink(ostr, uri, text, target);
+ writeTargetLink(ostr, uri, text, target, pSstr);
}
begin = it;
nextToken(begin, end, token);
@@ -1148,9 +1264,8 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin,
}
begin = it;
}
- if (token == "GH" || token == "PR")
+ if (token == "GH")
{
- bool isPR = token == "PR";
std::string uri(GITHUB_POCO_URI);
std::string::const_iterator it(begin);
std::string spc;
@@ -1172,7 +1287,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin,
nextToken(begin, end, n);
if (!n.empty() && std::isdigit(n[0]))
{
- uri += isPR ? "/pull/" : "/issues/";
+ uri += "/issues/";
uri += n;
writeTargetLink(ostr, uri, token + " #" + n, "_blank");
nextToken(begin, end, token);
@@ -1209,6 +1324,7 @@ void DocWriter::writeText(std::ostream& ostr, std::string::const_iterator begin,
else
{
ostr << htmlize(token);
+ if (pSstr) *pSstr << token;
}
nextToken(begin, end, token);
}
@@ -1237,7 +1353,7 @@ void DocWriter::writeDecl(std::ostream& ostr, std::string::const_iterator begin,
}
-bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end)
+bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end, std::ostream* pSstr)
{
if (std::isalnum(token[0]) && _pNameSpace)
{
@@ -1262,7 +1378,7 @@ bool DocWriter::writeSymbol(std::ostream& ostr, std::string& token, std::string:
Symbol* pSym = _pNameSpace->lookup(id);
if (pSym)
{
- writeLink(ostr, pSym, id);
+ writeLink(ostr, pSym, id, pSstr);
nextToken(begin, end, token);
return true;
}
@@ -1300,7 +1416,7 @@ bool DocWriter::writeSpecial(std::ostream& ostr, std::string& token, std::string
{
_htmlMode = false;
}
- else if (token == "")
- {
- prop.append(token);
- nextToken(begin, end, token);
- }
- Poco::trimInPlace(prop);
- Application& app = Application::instance();
- ostr << app.config().getString(prop, "");
- }
else if (_htmlMode)
{
ostr << token;
@@ -1401,10 +1504,7 @@ void DocWriter::nextToken(std::string::const_iterator& it, const std::string::co
{
token += *it++;
if (it != end && std::ispunct(*it)) token += *it++;
- if (token != "<[" && token != "<*" && token != "nameSpaces(nameSpaces);
@@ -1673,7 +1773,7 @@ void DocWriter::writeNameSpacesSummary(std::ostream& ostr, const NameSpace* pNam
}
-void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable nameSpaces;
pNameSpace->nameSpaces(nameSpaces);
@@ -1692,7 +1792,7 @@ void DocWriter::writeNameSpaces(std::ostream& ostr, const NameSpace* pNameSpace)
}
-void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable classes;
pNameSpace->classes(classes);
@@ -1709,7 +1809,7 @@ void DocWriter::writeClassesSummary(std::ostream& ostr, const NameSpace* pNameSp
}
-void DocWriter::writeClasses(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeClasses(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable classes;
pNameSpace->classes(classes);
@@ -1741,7 +1841,7 @@ void DocWriter::writeClassSummary(std::ostream& ostr, const Struct* pStruct)
}
-void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable types;
pNameSpace->typeDefs(types);
@@ -1758,7 +1858,7 @@ void DocWriter::writeTypesSummary(std::ostream& ostr, const NameSpace* pNameSpac
}
-void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable types;
pNameSpace->typeAliases(types);
@@ -1775,7 +1875,7 @@ void DocWriter::writeAliasesSummary(std::ostream& ostr, const NameSpace* pNameSp
}
-void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable types;
pNameSpace->typeDefs(types);
@@ -1791,13 +1891,13 @@ void DocWriter::writeTypes(std::ostream& ostr, const NameSpace* pNameSpace)
for (NameSpace::Iterator it = types.begin(); it != types.end(); ++it)
{
if (it->second->getAccess() != Symbol::ACC_PRIVATE)
- writeType(ostr, static_cast(it->second));
+ writeType(ostr, static_cast(it->second), pSstr);
}
}
}
-void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable types;
pNameSpace->typeAliases(types);
@@ -1813,13 +1913,13 @@ void DocWriter::writeAliases(std::ostream& ostr, const NameSpace* pNameSpace)
for (NameSpace::Iterator it = types.begin(); it != types.end(); ++it)
{
if (it->second->getAccess() != Symbol::ACC_PRIVATE)
- writeType(ostr, static_cast(it->second));
+ writeType(ostr, static_cast(it->second), pSstr);
}
}
}
-void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType)
+void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType, std::ostream* pSstr)
{
ostr << "";
writeAnchor(ostr, pType->name(), pType);
@@ -1829,11 +1929,11 @@ void DocWriter::writeType(std::ostream& ostr, const TypeDef* pType)
ostr << "
";
writeDecl(ostr, pType->declaration());
ostr << ";
\n";
- writeDescription(ostr, pType->getDocumentation());
+ writeDescription(ostr, pType->getDocumentation(), pSstr);
}
-void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable enums;
pNameSpace->enums(enums);
@@ -1849,13 +1949,13 @@ void DocWriter::writeEnums(std::ostream& ostr, const NameSpace* pNameSpace)
for (NameSpace::Iterator it = enums.begin(); it != enums.end(); ++it)
{
if (it->second->getAccess() != Symbol::ACC_PRIVATE)
- writeEnum(ostr, static_cast(it->second));
+ writeEnum(ostr, static_cast(it->second), pSstr);
}
}
}
-void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum)
+void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum, std::ostream* pSstr)
{
ostr << "";
const std::string& name = pEnum->name();
@@ -1866,7 +1966,7 @@ void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum)
if (pEnum->getAccess() != Symbol::ACC_PUBLIC)
writeIcon(ostr, "protected");
ostr << "
\n";
- writeDescription(ostr, pEnum->getDocumentation());
+ writeDescription(ostr, pEnum->getDocumentation(), pSstr);
for (Enum::Iterator it = pEnum->begin(); it != pEnum->end(); ++it)
{
const std::string& name = (*it)->name();
@@ -1876,7 +1976,7 @@ void DocWriter::writeEnum(std::ostream& ostr, const Enum* pEnum)
if (!value.empty())
ostr << " = " << htmlize(value);
ostr << "
\n";
- writeDescription(ostr, (*it)->getDocumentation());
+ writeDescription(ostr, (*it)->getDocumentation(), pSstr);
}
}
@@ -1928,7 +2028,7 @@ void DocWriter::writeMethods(std::ostream& ostr, const Struct* pStruct)
}
-void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable funcs;
pNameSpace->functions(funcs);
@@ -1950,7 +2050,7 @@ void DocWriter::writeFunctionsSummary(std::ostream& ostr, const NameSpace* pName
}
-void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable funcs;
pNameSpace->functions(funcs);
@@ -1965,7 +2065,7 @@ void DocWriter::writeFunctions(std::ostream& ostr, const NameSpace* pNameSpace)
}
-void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc)
+void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc, std::ostream* pSstr)
{
ostr << "
";
writeAnchor(ostr, pFunc->name(), pFunc);
@@ -1979,12 +2079,6 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc)
writeIcon(ostr, "inline");
ostr << "
\n";
ostr << "
";
-
- const std::string& attrs = pFunc->getAttributeList();
- if (!attrs.empty())
- {
- ostr << "" << htmlize(attrs) << "
";
- }
const std::string& decl = pFunc->declaration();
writeDecl(ostr, decl);
if (!std::isalnum(decl[decl.length() - 1]))
@@ -2022,7 +2116,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc)
ostr << " = 0";
ostr << ";
\n";
- if (pFunc->attrs().has("deprecated") || pFunc->getAttributeList().compare(0, 12, "[[deprecated") == 0)
+ if (pFunc->attrs().has("deprecated"))
{
writeDeprecated(ostr, "function");
}
@@ -2032,7 +2126,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc)
if (doc.empty() && pFunc->isPublic() && !pOverridden && !pFunc->isConstructor() && !pFunc->isDestructor())
logger().notice(std::string("Undocumented public function: ") + pFunc->fullName());
- writeDescription(ostr, doc);
+ writeDescription(ostr, doc, pSstr);
if (pOverridden)
{
ostr << "
" << tr("See_also") << ": ";
@@ -2042,7 +2136,7 @@ void DocWriter::writeFunction(std::ostream& ostr, const Function* pFunc)
}
-void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace)
+void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace, std::ostream* pSstr)
{
NameSpace::SymbolTable vars;
pNameSpace->variables(vars);
@@ -2059,18 +2153,18 @@ void DocWriter::writeVariables(std::ostream& ostr, const NameSpace* pNameSpace)
for (NameSpace::Iterator it = vars.begin(); it != vars.end(); ++it)
{
if (it->second->getAccess() == Symbol::ACC_PUBLIC)
- writeVariable(ostr, static_cast(it->second));
+ writeVariable(ostr, static_cast(it->second), pSstr);
}
for (NameSpace::Iterator it = vars.begin(); it != vars.end(); ++it)
{
if (it->second->getAccess() == Symbol::ACC_PROTECTED)
- writeVariable(ostr, static_cast(it->second));
+ writeVariable(ostr, static_cast(it->second), pSstr);
}
}
}
-void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar)
+void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar, std::ostream* pSstr)
{
ostr << "";
writeAnchor(ostr, pVar->name(), pVar);
@@ -2082,7 +2176,7 @@ void DocWriter::writeVariable(std::ostream& ostr, const Variable* pVar)
ostr << "
";
writeDecl(ostr, pVar->declaration());
ostr << ";
\n";
- writeDescription(ostr, pVar->getDocumentation());
+ writeDescription(ostr, pVar->getDocumentation(), pSstr);
}
@@ -2106,9 +2200,10 @@ void DocWriter::writeLink(std::ostream& ostr, const std::string& uri, const std:
}
-void DocWriter::writeLink(std::ostream& ostr, const Symbol* pSymbol, const std::string& name)
+void DocWriter::writeLink(std::ostream& ostr, const Symbol* pSymbol, const std::string& name, std::ostream* pSstr)
{
ostr << "" << htmlizeName(name) << "";
+ if (pSstr) *pSstr << name;
}
@@ -2118,7 +2213,7 @@ void DocWriter::writeLink(std::ostream& ostr, const std::string& uri, const std:
}
-void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target)
+void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target, std::ostream* pSstr)
{
if (_noFrames && target != "_blank")
ostr << "" << text << "";
@@ -2126,6 +2221,7 @@ void DocWriter::writeTargetLink(std::ostream& ostr, const std::string& uri, cons
ostr << "" << text << "";
else
ostr << "" << htmlize(text) << "";
+ if (pSstr) *pSstr << text;
}
@@ -2311,6 +2407,7 @@ void DocWriter::writePage(Page& page)
std::string path(pathFor(page.fileName));
std::ofstream ostr(path.c_str());
+ std::ostringstream sstr;
if (!ostr.good()) throw Poco::CreateFileException(path);
writeHeader(ostr, title, "js/iframeResizer.min.js");
writeTitle(ostr, tr(category), title);
@@ -2321,12 +2418,13 @@ void DocWriter::writePage(Page& page)
{
writeTOC(ostr, toc);
}
- writeDescription(ostr, text);
+ writeDescription(ostr, text, &sstr);
writeCopyright(ostr);
endContent(ostr);
endBody(ostr);
ostr << "" << std::endl;
writeFooter(ostr);
+ if (_searchIndex) writeSearchIndex(page.fileName, sstr.str());
}
diff --git a/PocoDoc/src/DocWriter.h b/PocoDoc/src/DocWriter.h
index 56bc16ecf..af2ee12e9 100644
--- a/PocoDoc/src/DocWriter.h
+++ b/PocoDoc/src/DocWriter.h
@@ -42,7 +42,7 @@ class DocWriter
/// to a directory.
{
public:
- DocWriter(const Poco::CppParser::NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode = true, bool noFrames = false);
+ DocWriter(const Poco::CppParser::NameSpace::SymbolTable& symbols, const std::string& path, bool prettifyCode = true, bool noFrames = false, bool searchIndex = false);
/// Creates the DocWriter.
~DocWriter();
@@ -56,6 +56,9 @@ public:
void addPage(const std::string& path);
/// Adds a page.
+
+ static const std::string DATABASE_DIR;
+ static const std::string DATABASE_NAME;
protected:
enum TextState
@@ -100,6 +103,10 @@ protected:
typedef std::map StringMap;
typedef std::map PageMap;
+ void initDatabase();
+ void writeSearchIndex(std::string link, std::string content);
+ static void writeSearchBox(std::ostream& ostr);
+
void writePages();
void writePage(Page& page);
void scanTOC(const std::string& text, TOC& toc);
@@ -134,18 +141,18 @@ protected:
static void endBody(std::ostream& ostr);
static void beginContent(std::ostream& ostr);
static void endContent(std::ostream& ostr);
- void writeDescription(std::ostream& ostr, const std::string& text);
- void writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state);
+ void writeDescription(std::ostream& ostr, const std::string& text, std::ostream* pSstr = nullptr);
+ void writeDescriptionLine(std::ostream& ostr, const std::string& text, TextState& state, std::ostream* pSstr = nullptr);
void writeSummary(std::ostream& ostr, const std::string& text, const std::string& uri);
static std::string htmlize(const std::string& str);
static std::string htmlize(char c);
static TextState analyzeLine(const std::string& line);
static std::string htmlizeName(const std::string& name);
- void writeText(std::ostream& ostr, const std::string& text);
- void writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end);
+ void writeText(std::ostream& ostr, const std::string& text, std::ostream* pSstr = nullptr);
+ void writeText(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end, std::ostream* pSstr = nullptr);
void writeDecl(std::ostream& ostr, const std::string& decl);
void writeDecl(std::ostream& ostr, std::string::const_iterator begin, const std::string::const_iterator& end);
- bool writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end);
+ bool writeSymbol(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end, std::ostream* pSstr = nullptr);
bool writeSpecial(std::ostream& ostr, std::string& token, std::string::const_iterator& begin, const std::string::const_iterator& end);
void nextToken(std::string::const_iterator& it, const std::string::const_iterator& end, std::string& token);
void writeListItem(std::ostream& ostr, const std::string& text);
@@ -155,31 +162,31 @@ protected:
void writeInheritance(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
void writeMethodSummary(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
void writeNestedClasses(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
- void writeNameSpacesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeNameSpaces(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeClassesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeClasses(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
+ void writeNameSpacesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeNameSpaces(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeClassesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeClasses(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
void writeClassSummary(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
- void writeTypesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeAliasesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeTypes(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeAliases(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeType(std::ostream& ostr, const Poco::CppParser::TypeDef* pType);
- void writeEnums(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeEnum(std::ostream& ostr, const Poco::CppParser::Enum* pEnum);
+ void writeTypesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeAliasesSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeTypes(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeAliases(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeType(std::ostream& ostr, const Poco::CppParser::TypeDef* pType, std::ostream* pSstr = nullptr);
+ void writeEnums(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeEnum(std::ostream& ostr, const Poco::CppParser::Enum* pEnum, std::ostream* pSstr);
void writeConstructors(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
void writeDestructor(std::ostream& ostr, const Poco::CppParser::Struct* pStruct);
void writeMethods(std::ostream& ostr, const Poco::CppParser::Struct* pNameSpace);
- void writeFunctionsSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeFunctions(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeFunction(std::ostream& ostr, const Poco::CppParser::Function* pFunc);
- void writeVariables(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace);
- void writeVariable(std::ostream& ostr, const Poco::CppParser::Variable* pVar);
+ void writeFunctionsSummary(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeFunctions(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeFunction(std::ostream& ostr, const Poco::CppParser::Function* pFunc, std::ostream* pSstr = nullptr);
+ void writeVariables(std::ostream& ostr, const Poco::CppParser::NameSpace* pNameSpace, std::ostream* pSstr = nullptr);
+ void writeVariable(std::ostream& ostr, const Poco::CppParser::Variable* pVar, std::ostream* pSstr = nullptr);
static void writeNameListItem(std::ostream& ostr, const std::string& name, const Poco::CppParser::Symbol* pSymbol, const Poco::CppParser::NameSpace* pNameSpace, bool& first);
static void writeLink(std::ostream& ostr, const std::string& uri, const std::string& text);
- static void writeLink(std::ostream& ostr, const Poco::CppParser::Symbol* pSymbol, const std::string& text);
+ static void writeLink(std::ostream& ostr, const Poco::CppParser::Symbol* pSymbol, const std::string& text, std::ostream* pSstr = nullptr);
static void writeLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& linkClass);
- void writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target);
+ void writeTargetLink(std::ostream& ostr, const std::string& uri, const std::string& text, const std::string& target, std::ostream* pSstr = nullptr);
static void writeImageLink(std::ostream& ostr, const std::string& uri, const std::string& image, const std::string& alt);
static void writeImage(std::ostream& ostr, const std::string& uri, const std::string& caption);
static void writeIcon(std::ostream& ostr, const std::string& icon);
@@ -212,6 +219,7 @@ private:
bool _pendingLine;
int _indent;
int _titleId;
+ bool _searchIndex;
static std::string _language;
static StringMap _strings;
diff --git a/PocoDoc/src/PocoDoc.cpp b/PocoDoc/src/PocoDoc.cpp
index 05fe0959d..3e9bbbc94 100644
--- a/PocoDoc/src/PocoDoc.cpp
+++ b/PocoDoc/src/PocoDoc.cpp
@@ -113,7 +113,8 @@ class PocoDocApp: public Application
public:
PocoDocApp():
_helpRequested(false),
- _writeEclipseTOC(false)
+ _writeEclipseTOC(false),
+ _searchIndexEnabled(false)
{
std::setlocale(LC_ALL, "");
}
@@ -168,6 +169,12 @@ protected:
.required(false)
.repeatable(false)
.callback(OptionCallback(this, &PocoDocApp::handleEclipse)));
+
+ options.addOption(
+ Option("search-index", "s", "Enable search index (requires FTS5 support).")
+ .required(false)
+ .repeatable(false)
+ .callback(OptionCallback(this, &PocoDocApp::handleSearchIndex)));
}
void handleHelp(const std::string& name, const std::string& value)
@@ -201,6 +208,11 @@ protected:
_writeEclipseTOC = true;
}
+ void handleSearchIndex(const std::string& name, const std::string& value)
+ {
+ _searchIndexEnabled = true;
+ }
+
void handleConfig(const std::string& name, const std::string& value)
{
loadConfiguration(value, -200);
@@ -233,7 +245,7 @@ protected:
for (StringTokenizer::Iterator itg = excTokenizer.begin(); itg != excTokenizer.end(); ++itg)
{
Glob glob(*itg);
- if (glob.match(p.getFileName()))
+ if (glob.match(p.getFileName()) || glob.match(p.toString()))
include = false;
}
if (include)
@@ -321,11 +333,6 @@ protected:
logger().log(exc);
++errors;
}
- catch (std::exception& exc)
- {
- logger().error(std::string(exc.what()));
- ++errors;
- }
}
return errors;
}
@@ -351,7 +358,21 @@ protected:
File file(path);
file.createDirectories();
- DocWriter writer(_gst, path.toString(), config().getBool("PocoDoc.prettifyCode", false), _writeEclipseTOC);
+ if (_searchIndexEnabled || config().getBool("PocoDoc.searchIndex", false))
+ {
+#if defined(POCO_ENABLE_SQLITE_FTS5)
+ std::string dbDirectory = path.toString() + DocWriter::DATABASE_DIR;
+ Path dbPath(dbDirectory);
+ dbPath.makeDirectory();
+ File dbFile(dbPath);
+ dbFile.createDirectories();
+ _searchIndexEnabled = true;
+#else
+ logger().error("FTS5 is not enabled, search is not supported");
+#endif
+ }
+
+ DocWriter writer(_gst, path.toString(), config().getBool("PocoDoc.prettifyCode", false), _writeEclipseTOC, _searchIndexEnabled);
if (config().hasProperty("PocoDoc.pages"))
{
@@ -520,6 +541,7 @@ protected:
private:
bool _helpRequested;
bool _writeEclipseTOC;
+ bool _searchIndexEnabled;
Poco::CppParser::NameSpace::SymbolTable _gst;
};
diff --git a/ProGen/ProGen_vs170.vcxproj b/ProGen/ProGen_vs170.vcxproj
index 865d38391..ee6dfd96d 100644
--- a/ProGen/ProGen_vs170.vcxproj
+++ b/ProGen/ProGen_vs170.vcxproj
@@ -981,4 +981,4 @@
-
+
\ No newline at end of file
diff --git a/configure b/configure
index c3bb3e204..056ed2c93 100755
--- a/configure
+++ b/configure
@@ -86,7 +86,7 @@ $(ls -C "$base"/build/config/)
Compile with -DPOCO_DATA_SQL_SERVER_BIG_STRINGS=1
Enables strings over 8000 bytes on MS SQL Server.
- --sqlite-fts=
+ --sqlite-fts
Compile with -DPOCO_DATA_SQLITE_FTS.
Compile SQLite with Full Text Search support.
@@ -276,7 +276,7 @@ while [ $# -ge 1 ]; do
flags="$flags -DSQLITE_THREADSAFE=$(echo "${1}" | awk '{print substr($0,22)}')" ;;
--sqlite-fts)
- flags="$flags -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_FTS3_PARENTHESIS" ;;
+ flags="$flags -DSQLITE_ENABLE_FTS5" ;;
--poquito)
flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_JSONCONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;;