Removing Install

[wxWidgets.git] / src / html / helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 9c2fe511302a73681ecd8d695fa245008f71ee76..b08700cbaa8932c729d8b195f085467d6d5fcbe2 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "helpdata.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -29,6 +29,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include <ctype.h>
+

 #include "wx/html/helpdata.h"
 #include "wx/tokenzr.h"
 #include "wx/wfstream.h"
 #include "wx/html/helpdata.h"
 #include "wx/tokenzr.h"
 #include "wx/wfstream.h"


@@ -38,6 +40,7 @@
 #include "wx/log.h"
 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"
 #include "wx/log.h"
 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"

+#include "wx/html/htmlfilt.h"

 #include "wx/filename.h"
 
 #include "wx/arrimpl.cpp"
 #include "wx/filename.h"
 
 #include "wx/arrimpl.cpp"


@@ -48,17 +51,17 @@ WX_DEFINE_OBJARRAY(wxHtmlBookRecArray)
 //-----------------------------------------------------------------------------
 
 // Reads one line, stores it into buf and returns pointer to new line or NULL.
 //-----------------------------------------------------------------------------
 
 // Reads one line, stores it into buf and returns pointer to new line or NULL.

-static char* ReadLine(char *line, char *buf, size_t bufsize)
+static const wxChar* ReadLine(const wxChar *line, wxChar *buf, size_t bufsize)

 {
 {

-    char *writeptr = buf;
-    char *endptr = buf + bufsize - 1;
-    char *readptr = line;
+    wxChar *writeptr = buf;
+    wxChar *endptr = buf + bufsize - 1;
+    const wxChar *readptr = line;

 
 

-    while (*readptr != 0 && *readptr != '\r' && *readptr != '\n' &&
+    while (*readptr != 0 && *readptr != _T('\r') && *readptr != _T('\n') &&

            writeptr != endptr) 
         *(writeptr++) = *(readptr++);
     *writeptr = 0;
            writeptr != endptr) 
         *(writeptr++) = *(readptr++);
     *writeptr = 0;

-    while (*readptr == '\r' || *readptr == '\n')
+    while (*readptr == _T('\r') || *readptr == _T('\n'))

         readptr++;
     if (*readptr == 0)
         return NULL;
         readptr++;
     if (*readptr == 0)
         return NULL;


@@ -111,6 +114,8 @@ class HP_TagHandler : public wxHtmlTagHandler
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);
         void ReadIn(wxHtmlContentsItem* array, int size);
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);
         void ReadIn(wxHtmlContentsItem* array, int size);

+
+    DECLARE_NO_COPY_CLASS(HP_TagHandler)

 };
 
 
 };
 
 


@@ -251,8 +256,8 @@ wxHtmlHelpData::~wxHtmlHelpData()
 bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, const wxString& indexfile, const wxString& contentsfile)
 {
     wxFSFile *f;
 bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, const wxString& indexfile, const wxString& contentsfile)
 {
     wxFSFile *f;

-    char *buf;
-    int sz;
+    wxHtmlFilterHTML filter;
+    wxString buf;

     wxString string;
 
     HP_Parser parser;
     wxString string;
 
     HP_Parser parser;


@@ -262,34 +267,32 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
     f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
     if (f)
     {
     f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
     if (f)
     {

-        sz = f->GetStream()->GetSize();
-        buf = new char[sz + 1];
-        buf[sz] = 0;
-        f->GetStream()->Read(buf, sz);
+        buf.clear();
+        buf = filter.ReadFile(*f);

         delete f;
         handler->ReadIn(m_Contents, m_ContentsCnt);
         parser.Parse(buf);
         handler->WriteOut(m_Contents, m_ContentsCnt);
         delete f;
         handler->ReadIn(m_Contents, m_ContentsCnt);
         parser.Parse(buf);
         handler->WriteOut(m_Contents, m_ContentsCnt);

-        delete[] buf;

     }
     else
     }
     else

+    {

         wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
         wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());

+    }

 
     f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
     if (f)
     {
 
     f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
     if (f)
     {

-        sz = f->GetStream()->GetSize();
-        buf = new char[sz + 1];
-        buf[sz] = 0;
-        f->GetStream()->Read(buf, sz);
+        buf.clear();
+        buf = filter.ReadFile(*f);

         delete f;
         handler->ReadIn(m_Index, m_IndexCnt);
         parser.Parse(buf);
         handler->WriteOut(m_Index, m_IndexCnt);
         delete f;
         handler->ReadIn(m_Index, m_IndexCnt);
         parser.Parse(buf);
         handler->WriteOut(m_Index, m_IndexCnt);

-        delete[] buf;

     }
     else if (!indexfile.IsEmpty())
     }
     else if (!indexfile.IsEmpty())

+    {

         wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
         wxLogError(_("Cannot open index file: %s"), indexfile.c_str());

+    }

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -309,22 +312,39 @@ inline static wxInt32 CacheReadInt32(wxInputStream *f)
 }
 
 inline static void CacheWriteString(wxOutputStream *f, const wxChar *str)
 }
 
 inline static void CacheWriteString(wxOutputStream *f, const wxChar *str)

-{
-    size_t len = wxStrlen(str)+1;
+{    
+#if wxUSE_UNICODE
+    wxWX2MBbuf mbstr(wxConvUTF8.cWX2MB(str));
+#else
+    const wxChar *mbstr = str;
+#endif
+    size_t len = strlen(mbstr)+1;

     CacheWriteInt32(f, len);
     CacheWriteInt32(f, len);

-    f->Write(str, len * sizeof(wxChar));
+    f->Write(mbstr, len);

 }
 
 }
 

-inline static wxChar *CacheReadString(wxInputStream *f)
+inline static wxChar* CacheReadString(wxInputStream *f)

 {
 {

-    wxChar *str;
+    char *str;

     size_t len = (size_t)CacheReadInt32(f);
     size_t len = (size_t)CacheReadInt32(f);

-    str = new wxChar[len];
-    f->Read(str, len * sizeof(wxChar));
+    str = new char[len];
+    f->Read(str, len);
+#if !wxUSE_UNICODE

     return str;
     return str;

+#else
+    wxMB2WXbuf wxstr(wxConvUTF8.cMB2WX(str));
+    wxChar *outstr = new wxChar[wxStrlen(wxstr)+1];
+    wxStrcpy(outstr, wxstr);
+    return outstr;
+#endif

 }
 
 }
 

-#define CURRENT_CACHED_BOOK_VERSION     2
+#define CURRENT_CACHED_BOOK_VERSION     4
+
+// Additional flags to detect incompatibilities of the runtime environment:
+#define CACHED_BOOK_FORMAT_FLAGS \
+                     (wxUSE_UNICODE << 0)
+

 
 bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 {
 
 bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 {


@@ -333,7 +353,7 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 
     /* load header - version info : */
     version = CacheReadInt32(f);
 
     /* load header - version info : */
     version = CacheReadInt32(f);

-
+    

     if (version != CURRENT_CACHED_BOOK_VERSION)
     {
         // NB: We can just silently return FALSE here and don't worry about
     if (version != CURRENT_CACHED_BOOK_VERSION)
     {
         // NB: We can just silently return FALSE here and don't worry about


@@ -343,6 +363,9 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
         return FALSE;
     }
 
         return FALSE;
     }
 

+    if (CacheReadInt32(f) != CACHED_BOOK_FORMAT_FLAGS)
+        return FALSE;
+

     /* load contents : */
     st = m_ContentsCnt;
     m_ContentsCnt += CacheReadInt32(f);
     /* load contents : */
     st = m_ContentsCnt;
     m_ContentsCnt += CacheReadInt32(f);


@@ -380,6 +403,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
 
     /* save header - version info : */
     CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION);
 
     /* save header - version info : */
     CacheWriteInt32(f, CURRENT_CACHED_BOOK_VERSION);

+    CacheWriteInt32(f, CACHED_BOOK_FORMAT_FLAGS);

 
     /* save contents : */
     for (cnt = 0, i = 0; i < m_ContentsCnt; i++) 
 
     /* save contents : */
     for (cnt = 0, i = 0; i < m_ContentsCnt; i++) 


@@ -452,11 +476,18 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     int IndexOld = m_IndexCnt,
         ContentsOld = m_ContentsCnt;
 
     int IndexOld = m_IndexCnt,
         ContentsOld = m_ContentsCnt;
 

-    if (! path.IsEmpty())
+    if (!path.IsEmpty())

         fsys.ChangePathTo(path, TRUE);
 
         fsys.ChangePathTo(path, TRUE);
 

-    bookr = new wxHtmlBookRecord(fsys.GetPath(), title, deftopic);
+    size_t booksCnt = m_BookRecords.GetCount();
+    for (size_t i = 0; i < booksCnt; i++)
+    {
+        if ( m_BookRecords[i].GetBookFile() == bookfile.GetLocation() )
+            return TRUE; // book is (was) loaded
+    }

 
 

+    bookr = new wxHtmlBookRecord(bookfile.GetLocation(), fsys.GetPath(), title, deftopic);
+    

     if (m_ContentsCnt % wxHTML_REALLOC_STEP == 0)
         m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
     m_Contents[m_ContentsCnt].m_Level = 0;
     if (m_ContentsCnt % wxHTML_REALLOC_STEP == 0)
         m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
     m_Contents[m_ContentsCnt].m_Level = 0;


@@ -478,13 +509,17 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     fi = fsys.OpenFile(bookfile.GetLocation() + wxT(".cached"));
 
     if (fi == NULL ||
     fi = fsys.OpenFile(bookfile.GetLocation() + wxT(".cached"));
 
     if (fi == NULL ||

+#if wxUSE_DATETIME

           fi->GetModificationTime() < bookfile.GetModificationTime() ||
           fi->GetModificationTime() < bookfile.GetModificationTime() ||

+#endif // wxUSE_DATETIME

           !LoadCachedBook(bookr, fi->GetStream()))
     {
         if (fi != NULL) delete fi;
         fi = fsys.OpenFile(m_TempPath + wxFileNameFromPath(bookfile.GetLocation()) + wxT(".cached"));
         if (m_TempPath == wxEmptyString || fi == NULL ||
           !LoadCachedBook(bookr, fi->GetStream()))
     {
         if (fi != NULL) delete fi;
         fi = fsys.OpenFile(m_TempPath + wxFileNameFromPath(bookfile.GetLocation()) + wxT(".cached"));
         if (m_TempPath == wxEmptyString || fi == NULL ||

+#if wxUSE_DATETIME

             fi->GetModificationTime() < bookfile.GetModificationTime() ||
             fi->GetModificationTime() < bookfile.GetModificationTime() ||

+#endif // wxUSE_DATETIME

             !LoadCachedBook(bookr, fi->GetStream()))
         {
             LoadMSProject(bookr, fsys, indexfile, contfile);
             !LoadCachedBook(bookr, fi->GetStream()))
         {
             LoadMSProject(bookr, fsys, indexfile, contfile);


@@ -550,8 +585,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
     {
         wxFSFile *fi;
         wxFileSystem fsys;
     {
         wxFSFile *fi;
         wxFileSystem fsys;

-        wxInputStream *s;
-        wxString bookFull;

 
         wxString title = _("noname"),
                  safetitle,
 
         wxString title = _("noname"),
                  safetitle,


@@ -560,58 +593,43 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                  index = wxEmptyString,
                  charset = wxEmptyString;
 
                  index = wxEmptyString,
                  charset = wxEmptyString;
 

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-        if (wxIsAbsolutePath(book)) bookFull = book;
-        else bookFull = wxGetCwd() + book; // no slash or dot
-        wxFileName fn( bookFull );
-        bookFull = fn.GetFullPath( wxPATH_UNIX );
-#else
-        if (wxIsAbsolutePath(book)) bookFull = book;
-        else bookFull = wxGetCwd() + "/" + book;
-#endif
-
-        fi = fsys.OpenFile(bookFull);
+        fi = fsys.OpenFile(book);

         if (fi == NULL)
         {
         if (fi == NULL)
         {

-            wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
+            wxLogError(_("Cannot open HTML help book: %s"), book.c_str());

             return FALSE;
         }
             return FALSE;
         }

-        fsys.ChangePathTo(bookFull);
-        s = fi->GetStream();
-
-        int sz;
-        char *buff, *lineptr;
-        char linebuf[300];
+        fsys.ChangePathTo(book);

 
 

-        sz = s->GetSize();
-        buff = new char[sz + 1];
-        buff[sz] = 0;
-        s->Read(buff, sz);
-        lineptr = buff;
+        const wxChar *lineptr;
+        wxChar linebuf[300];
+        wxString tmp;
+        wxHtmlFilterPlainText filter;
+        tmp = filter.ReadFile(*fi);
+        lineptr = tmp.c_str();

 
         do 
         {
             lineptr = ReadLine(lineptr, linebuf, 300);
             
 
         do 
         {
             lineptr = ReadLine(lineptr, linebuf, 300);
             

-            for (char *ch = linebuf; *ch != '\0' && *ch != '='; ch++)
+            for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)

                *ch = tolower(*ch);
 
                *ch = tolower(*ch);
 

-            if (strstr(linebuf, "title=") == linebuf)
-                title = linebuf + strlen("title=");
-            if (strstr(linebuf, "default topic=") == linebuf)
-                start = linebuf + strlen("default topic=");
-            if (strstr(linebuf, "index file=") == linebuf)
-                index = linebuf + strlen("index file=");
-            if (strstr(linebuf, "contents file=") == linebuf)
-                contents = linebuf + strlen("contents file=");
-            if (strstr(linebuf, "charset=") == linebuf)
-                charset = linebuf + strlen("charset=");
+            if (wxStrstr(linebuf, _T("title=")) == linebuf)
+                title = linebuf + wxStrlen(_T("title="));
+            if (wxStrstr(linebuf, _T("default topic=")) == linebuf)
+                start = linebuf + wxStrlen(_T("default topic="));
+            if (wxStrstr(linebuf, _T("index file=")) == linebuf)
+                index = linebuf + wxStrlen(_T("index file="));
+            if (wxStrstr(linebuf, _T("contents file=")) == linebuf)
+                contents = linebuf + wxStrlen(_T("contents file="));
+            if (wxStrstr(linebuf, _T("charset=")) == linebuf)
+                charset = linebuf + wxStrlen(_T("charset="));

         } while (lineptr != NULL);
         } while (lineptr != NULL);

-        delete[] buff;

 
         wxFontEncoding enc;
         if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
 
         wxFontEncoding enc;
         if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;

-        else enc = wxTheFontMapper->CharsetToEncoding(charset);
+        else enc = wxFontMapper::Get()->CharsetToEncoding(charset);

         bool rtval = AddBookParam(*fi, enc,
                                   title, contents, index, start, fsys.GetPath());
         delete fi;
         bool rtval = AddBookParam(*fi, enc,
                                   title, contents, index, start, fsys.GetPath());
         delete fi;


@@ -772,7 +790,7 @@ bool wxHtmlSearchStatus::Search()
     file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetFullPath(thepage));
     if (file)
     {
     file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetFullPath(thepage));
     if (file)
     {

-        if (m_Engine.Scan(file->GetStream()))
+        if (m_Engine.Scan(*file))

         {
             m_Name = m_Data->m_Contents[i].m_Name;
             m_ContentsItem = m_Data->m_Contents + i;
         {
             m_Name = m_Data->m_Contents[i].m_Name;
             m_ContentsItem = m_Data->m_Contents + i;


@@ -791,10 +809,10 @@ bool wxHtmlSearchStatus::Search()
 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------

-// wxSearchEngine
+// wxHtmlSearchEngine

 //--------------------------------------------------------------------------------
 
 //--------------------------------------------------------------------------------
 

-void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only)
+void wxHtmlSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only)

 {
     m_CaseSensitive = case_sensitive;
     m_WholeWords = whole_words_only;
 {
     m_CaseSensitive = case_sensitive;
     m_WholeWords = whole_words_only;


@@ -813,24 +831,26 @@ void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool
 }
 
 
 }
 
 

+static inline bool WHITESPACE(wxChar c)
+{
+    return c == _T(' ') || c == _T('\n') || c == _T('\r') || c == _T('\t');
+}

 
 

-#define WHITESPACE(c)  (c == ' ' || c == '\n' || c == '\r' || c == '\t')
-
-bool wxSearchEngine::Scan(wxInputStream *stream)
+bool wxHtmlSearchEngine::Scan(const wxFSFile& file)

 {
 {

-    wxASSERT_MSG(m_Keyword != NULL, wxT("wxSearchEngine::LookFor must be called before scanning!"));
+    wxASSERT_MSG(m_Keyword != NULL, wxT("wxHtmlSearchEngine::LookFor must be called before scanning!"));

 
     int i, j;
 
     int i, j;

-    int lng = stream ->GetSize();

     int wrd = wxStrlen(m_Keyword);
     bool found = FALSE;
     int wrd = wxStrlen(m_Keyword);
     bool found = FALSE;

-    char *buf = new char[lng + 1];
-    stream->Read(buf, lng);
-    buf[lng] = 0;
+    wxHtmlFilterHTML filter;
+    wxString tmp = filter.ReadFile(file);
+    int lng = tmp.length();
+    const wxChar *buf = tmp.c_str();

 
     if (!m_CaseSensitive)
         for (i = 0; i < lng; i++)
 
     if (!m_CaseSensitive)
         for (i = 0; i < lng; i++)

-            if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A';
+            tmp[(size_t)i] = (wxChar)wxTolower(tmp[(size_t)i]);

 
     if (m_WholeWords)
     {
 
     if (m_WholeWords)
     {


@@ -853,7 +873,6 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
         }
     }
 
         }
     }
 

-    delete[] buf;

     return found;
 }
 
     return found;
 }