pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix doct_bin2epub and doct_bin2fb

Browse Source 
fixed sequence docx -> doct_bin -> html. Now only doct_bin is expected to exist
This commit is contained in:
Kulikova Svetlana
2021-02-26 11:23:11 +03:00
parent 7264e7f397
commit 8e8618380a
5 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fb2File/Fb2File.cpp
View File

@ -1707,13 +1707,13 @@ std::wstring GenerateUUID()
return sstream.str();
}
HRESULT CFb2File::FromHtml(const std::wstring& sSrc, const std::wstring& sDst)
HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sCoreFile, const std::wstring& sDst)
{
NSStringUtils::CStringBuilder oDocument;
oDocument.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\"?><FictionBook xmlns=\"http://www.gribuser.ru/xml/fictionbook/2.0\" xmlns:l=\"http://www.w3.org/1999/xlink\"><description>");
// description
std::wstring sCoreXml;
if (NSFile::CFileBinary::ReadAllTextUtf8(sSrc + L"/docx_unpacked/docProps/core.xml", sCoreXml))
if (NSFile::CFileBinary::ReadAllTextUtf8(sCoreFile, sCoreXml))
{
// title-info
oDocument.WriteString(L"<title-info>");
@ -1761,7 +1761,7 @@ HRESULT CFb2File::FromHtml(const std::wstring& sSrc, const std::wstring& sDst)
// body
oDocument.WriteString(L"</description><body><section>");
std::string sContent;
NSFile::CFileBinary::ReadAllTextUtf8A(sSrc + L"/doct_unpacked/index.html", sContent);;
NSFile::CFileBinary::ReadAllTextUtf8A(sHtmlFile, sContent);;
XmlUtils::CXmlLiteReader oIndexHtml;
std::vector<std::wstring> arrBinary;
if (oIndexHtml.FromString(htmlToXhtml(sContent)))