HtmlFile linux

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63938 954022d7-b5bf-4e40-9824-e11837661b57

HtmlFile/HtmlFile.cpp

@@ -147,7 +147,7 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
     std::wstring sTempFileForParams = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"XML");
     NSFile::CFileBinary oFile;
     oFile.CreateFileW(sTempFileForParams);
-    oFile.WriteStringUTF8(sXml, true);
+    oFile.WriteStringUTF8(oBuilder.GetData(), true);
     oFile.CloseFile();
 
     pid_t pid = fork(); // create child process

HtmlFile/test/main.cpp

@@ -3,16 +3,18 @@
 
 int main(int argc, char *argv[])
 {
-#if 1
+#if 0
 
+    std::vector<std::wstring> arFiles;
 #ifdef WIN32
     std::wstring sPath = NSFile::GetProcessDirectory() + L"/../../Internal/windows/Release/";
 
-    std::vector<std::wstring> arFiles;
     arFiles.push_back(L"file:///C:/Users/oleg.korshul/Desktop/original_message%20(5).html");
     std::wstring sDstFolder = L"D:/test/Document";
 #else
     std::wstring sPath = NSFile::GetProcessDirectory() + L"/../../Internal/linux/Release/";
+
+    arFiles.push_back(L"/home/oleg/activex/test.html");
     std::wstring sDstFolder = L"/home/oleg/activex/1/";
 #endif
 
@@ -24,15 +26,19 @@ int main(int argc, char *argv[])
 
 #ifdef WIN32
     std::wstring sPath = NSFile::GetProcessDirectory() + L"/../../Internal/windows/Release/";
+
+    std::wstring sSrc = L"D:\\37898EB";
     std::wstring sDstFolder = L"D:/test/Document";
 #else
     std::wstring sPath = NSFile::GetProcessDirectory() + L"/../../Internal/linux/Release/";
+
+    std::wstring sSrc = L"/home/oleg/activex/37898EB";
     std::wstring sDstFolder = L"/home/oleg/activex/1/";
 #endif
 
     CHtmlFile oFile;
     std::wstring sMetaInfo;
-    int nResult = oFile.ConvertEpub(L"D:\\37898EB", sMetaInfo, sDstFolder, sPath);
+    int nResult = oFile.ConvertEpub(sSrc, sMetaInfo, sDstFolder, sPath);
     nResult;
 
 #endif