X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..4304b42f1a1a586e96c645cb47d1cd3c98e3dec6:/src/html/helpdata.cpp diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index fb7f6cf871..d4bf792b8f 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -58,19 +58,19 @@ static char* ReadLine(char *line, char *buf) static wxString SafeFileName(const wxString& s) { wxString res = s; - res.Replace(":", "_", TRUE); - res.Replace(" ", "_", TRUE); - res.Replace("/", "_", TRUE); - res.Replace("\\", "_", TRUE); - res.Replace("#", "_", TRUE); - res.Replace(".", "_", TRUE); + res.Replace(wxT(":"), wxT("_"), TRUE); + res.Replace(wxT(" "), wxT("_"), TRUE); + res.Replace(wxT("/"), wxT("_"), TRUE); + res.Replace(wxT("\\"), wxT("_"), TRUE); + res.Replace(wxT("#"), wxT("_"), TRUE); + res.Replace(wxT("."), wxT("_"), TRUE); return res; } -static int IndexCompareFunc(const void *a, const void *b) +static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b) { - return strcmp(((wxHtmlContentsItem*)a) -> m_Name, ((wxHtmlContentsItem*)b) -> m_Name); + return wxStrcmp(((wxHtmlContentsItem*)a) -> m_Name, ((wxHtmlContentsItem*)b) -> m_Name); } @@ -95,15 +95,15 @@ class HP_TagHandler : public wxHtmlTagHandler private: wxString m_Name, m_Page; int m_Level; - int m_ID; + int m_ID; int m_Index; wxHtmlContentsItem *m_Items; int m_ItemsCnt; wxHtmlBookRecord *m_Book; public: - HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() {m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; m_Level = 0;} - wxString GetSupportedTags() {return "UL,OBJECT,PARAM";} + HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() {m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; m_Level = 0; } + wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); } bool HandleTag(const wxHtmlTag& tag); void WriteOut(wxHtmlContentsItem*& array, int& size); void ReadIn(wxHtmlContentsItem* array, int size); @@ -118,29 +118,27 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag) m_Level--; return TRUE; } - - else if (tag.GetName() == "OBJECT") { + else if (tag.GetName() == wxT("OBJECT")) { m_Name = m_Page = wxEmptyString; ParseInner(tag); if (m_Page != wxEmptyString) { - if (m_ItemsCnt % HTML_REALLOC_STEP == 0) - m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + HTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem)); + if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0) + m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem)); m_Items[m_ItemsCnt].m_Level = m_Level; m_Items[m_ItemsCnt].m_ID = m_ID; - m_Items[m_ItemsCnt].m_Page = new char[m_Page.Length() + 1]; - strcpy(m_Items[m_ItemsCnt].m_Page, m_Page.c_str()); - m_Items[m_ItemsCnt].m_Name = new char [m_Name.Length() + 1]; - strcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str()); + m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1]; + wxStrcpy(m_Items[m_ItemsCnt].m_Page, m_Page.c_str()); + m_Items[m_ItemsCnt].m_Name = new wxChar [m_Name.Length() + 1]; + wxStrcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str()); m_Items[m_ItemsCnt].m_Book = m_Book; m_ItemsCnt++; } return TRUE; } - else { // "PARAM" - if (m_Name == wxEmptyString && tag.GetParam("NAME") == "Name") m_Name = tag.GetParam("VALUE"); - if (tag.GetParam("NAME") == "Local") m_Page = tag.GetParam("VALUE"); - if (tag.GetParam("NAME") == "ID") tag.ScanParam("VALUE", "%i", &m_ID); + if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) m_Name = tag.GetParam(wxT("VALUE")); + if (tag.GetParam(wxT("NAME")) == wxT("Local")) m_Page = tag.GetParam(wxT("VALUE")); + if (tag.GetParam(wxT("NAME")) == wxT("ID")) tag.ScanParam(wxT("VALUE"), wxT("%i"), &m_ID); return FALSE; } } @@ -161,6 +159,9 @@ void HP_TagHandler::ReadIn(wxHtmlContentsItem* array, int size) m_ItemsCnt = size; } + + + //----------------------------------------------------------------------------- // wxHtmlHelpData //----------------------------------------------------------------------------- @@ -209,10 +210,10 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c HP_TagHandler *handler = new HP_TagHandler(book); parser.AddTagHandler(handler); - f = ( contentsfile.IsEmpty() ? NULL : fsys.OpenFile(contentsfile) ); + f = ( contentsfile.IsEmpty() ? 0 : fsys.OpenFile(contentsfile) ); if (f) { sz = f -> GetStream() -> GetSize(); - buf = new char[sz+1]; + buf = new char[sz + 1]; buf[sz] = 0; f -> GetStream() -> Read(buf, sz); delete f; @@ -222,10 +223,10 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c delete[] buf; } - f = ( indexfile.IsEmpty() ? NULL : fsys.OpenFile(indexfile) ); + f = ( indexfile.IsEmpty() ? 0 : fsys.OpenFile(indexfile) ); if (f) { sz = f -> GetStream() -> GetSize(); - buf = new char[sz+1]; + buf = new char[sz + 1]; buf[sz] = 0; f -> GetStream() -> Read(buf, sz); delete f; @@ -248,18 +249,18 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f) f -> Read(&x, sizeof(x)); st = m_ContentsCnt; m_ContentsCnt += x; - m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt / HTML_REALLOC_STEP + 1) * HTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); + m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt / wxHTML_REALLOC_STEP + 1) * wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); for (i = st; i < m_ContentsCnt; i++) { f -> Read(&x, sizeof(x)); m_Contents[i].m_Level = x; f -> Read(&x, sizeof(x)); m_Contents[i].m_ID = x; f -> Read(&x, sizeof(x)); - m_Contents[i].m_Name = new char[x]; - f -> Read(m_Contents[i].m_Name, x); + m_Contents[i].m_Name = new wxChar[x]; + f -> Read(m_Contents[i].m_Name, x*sizeof(wxChar)); f -> Read(&x, sizeof(x)); - m_Contents[i].m_Page = new char[x]; - f -> Read(m_Contents[i].m_Page, x); + m_Contents[i].m_Page = new wxChar[x]; + f -> Read(m_Contents[i].m_Page, x*sizeof(wxChar)); m_Contents[i].m_Book = book; } @@ -268,14 +269,14 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f) f -> Read(&x, sizeof(x)); st = m_IndexCnt; m_IndexCnt += x; - m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / HTML_REALLOC_STEP + 1) * HTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); + m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) * wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem)); for (i = st; i < m_IndexCnt; i++) { f -> Read(&x, sizeof(x)); - m_Index[i].m_Name = new char[x]; - f -> Read(m_Index[i].m_Name, x); + m_Index[i].m_Name = new wxChar[x]; + f -> Read(m_Index[i].m_Name, x*sizeof(wxChar)); f -> Read(&x, sizeof(x)); - m_Index[i].m_Page = new char[x]; - f -> Read(m_Index[i].m_Page, x); + m_Index[i].m_Page = new wxChar[x]; + f -> Read(m_Index[i].m_Page, x*sizeof(wxChar)); m_Index[i].m_Book = book; } return TRUE; @@ -298,12 +299,12 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f) f -> Write(&x, sizeof(x)); x = m_Contents[i].m_ID; f -> Write(&x, sizeof(x)); - x = strlen(m_Contents[i].m_Name) + 1; + x = wxStrlen(m_Contents[i].m_Name) + 1; f -> Write(&x, sizeof(x)); - f -> Write(m_Contents[i].m_Name, x); - x = strlen(m_Contents[i].m_Page) + 1; + f -> Write(m_Contents[i].m_Name, x*sizeof(wxChar)); + x = wxStrlen(m_Contents[i].m_Page) + 1; f -> Write(&x, sizeof(x)); - f -> Write(m_Contents[i].m_Page, x); + f -> Write(m_Contents[i].m_Page, x*sizeof(wxChar)); } /* save index : */ @@ -313,12 +314,12 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f) f -> Write(&x, sizeof(x)); for (i = 0; i < m_IndexCnt; i++) { if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue; - x = strlen(m_Index[i].m_Name) + 1; + x = wxStrlen(m_Index[i].m_Name) + 1; f -> Write(&x, sizeof(x)); - f -> Write(m_Index[i].m_Name, x); - x = strlen(m_Index[i].m_Page) + 1; + f -> Write(m_Index[i].m_Name, x*sizeof(wxChar)); + x = wxStrlen(m_Index[i].m_Page) + 1; f -> Write(&x, sizeof(x)); - f -> Write(m_Index[i].m_Page, x); + f -> Write(m_Index[i].m_Page, x*sizeof(wxChar)); } return TRUE; } @@ -328,18 +329,18 @@ void wxHtmlHelpData::SetTempDir(const wxString& path) { if (path == wxEmptyString) m_TempPath = path; else { - if (wxIsAbsolutePath(path)) m_TempPath = path; - else m_TempPath = wxGetCwd() + "/" + path; + if (wxIsAbsolutePath(path)) m_TempPath = path; + else m_TempPath = wxGetCwd() + "/" + path; - if (m_TempPath[m_TempPath.Length() - 1] != '/') + if (m_TempPath[m_TempPath.Length() - 1] != '/') m_TempPath << "/"; } } bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfile, - const wxString& indexfile, const wxString& deftopic, - const wxString& path) + const wxString& indexfile, const wxString& deftopic, + const wxString& path) { wxFileSystem fsys; wxFSFile *fi; @@ -347,19 +348,18 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil wxString safetitle; if (! path.IsEmpty()) - // workaround for bug in ChangePathTo(name, TRUE) - fsys.ChangePathTo(path+"/gaga"); + fsys.ChangePathTo(path, TRUE); - bookr = new wxHtmlBookRecord(path+'/', title, deftopic); + bookr = new wxHtmlBookRecord(fsys.GetPath(), title, deftopic); - if (m_ContentsCnt % HTML_REALLOC_STEP == 0) - m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + HTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem)); + 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; m_Contents[m_ContentsCnt].m_ID = 0; - m_Contents[m_ContentsCnt].m_Page = new char[deftopic.Length() + 1]; - strcpy(m_Contents[m_ContentsCnt].m_Page, deftopic.c_str()); - m_Contents[m_ContentsCnt].m_Name = new char [title.Length() + 1]; - strcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str()); + m_Contents[m_ContentsCnt].m_Page = new wxChar[deftopic.Length() + 1]; + wxStrcpy(m_Contents[m_ContentsCnt].m_Page, deftopic.c_str()); + m_Contents[m_ContentsCnt].m_Name = new wxChar [title.Length() + 1]; + wxStrcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str()); m_Contents[m_ContentsCnt].m_Book = bookr; // store the contents index for later @@ -367,17 +367,16 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil // Try to find cached binary versions: safetitle = SafeFileName(title); - fi = fsys.OpenFile(safetitle + ".cached"); - if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached"); + fi = fsys.OpenFile(safetitle + wxT(".cached")); + if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + wxT(".cached")); if ((fi == NULL) || (m_TempPath == wxEmptyString)) { LoadMSProject(bookr, fsys, indexfile, contfile); if (m_TempPath != wxEmptyString) { - wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached"); + wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + wxT(".cached")); SaveCachedBook(bookr, outs); delete outs; - } - } - else { + } + } else { LoadCachedBook(bookr, fi -> GetStream()); delete fi; } @@ -395,47 +394,71 @@ bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfil bool wxHtmlHelpData::AddBook(const wxString& book) { - wxFSFile *fi; - wxFileSystem fsys; - wxInputStream *s; - wxString bookFull; - - int sz; - char *buff, *lineptr; - char linebuf[300]; - - wxString title = _("noname"), - safetitle, - start = wxEmptyString, - contents = wxEmptyString, index = wxEmptyString; - - if (wxIsAbsolutePath(book)) bookFull = book; - else bookFull = wxGetCwd() + "/" + book; - - fi = fsys.OpenFile(bookFull); - if (fi == NULL) return FALSE; - fsys.ChangePathTo(bookFull); - s = fi -> GetStream(); - sz = s -> GetSize(); - buff = new char[sz+1]; - buff[sz] = 0; - s -> Read(buff, sz); - lineptr = buff; - delete fi; - - while ((lineptr = ReadLine(lineptr, linebuf)) != NULL) { - 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 (book.Right(4).Lower() == wxT(".zip") || + book.Right(4).Lower() == wxT(".htb") /*html book*/) + + { + wxFileSystem fsys; + wxString s; + bool rt = FALSE; + + s = fsys.FindFirst(book + wxT("#zip:") + wxT("*.hhp"), wxFILE); + while (!s.IsEmpty()) + { + if (AddBook(s)) rt = TRUE; + s = fsys.FindNext(); + } + + return rt; } - delete[] buff; - return AddBookParam(title, contents, index, start, fsys.GetPath()); + + else + { + wxFSFile *fi; + wxFileSystem fsys; + wxInputStream *s; + wxString bookFull; + + int sz; + char *buff, *lineptr; + char linebuf[300]; + + wxString title = _("noname"), + safetitle, + start = wxEmptyString, + contents = wxEmptyString, index = wxEmptyString; + + if (wxIsAbsolutePath(book)) bookFull = book; + else bookFull = wxGetCwd() + "/" + book; + + fi = fsys.OpenFile(bookFull); + if (fi == NULL) return FALSE; + fsys.ChangePathTo(bookFull); + s = fi -> GetStream(); + sz = s -> GetSize(); + buff = new char[sz + 1]; + buff[sz] = 0; + s -> Read(buff, sz); + lineptr = buff; + delete fi; + + do { + lineptr = ReadLine(lineptr, linebuf); + + 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="); + } while (lineptr != NULL); + delete[] buff; + + return AddBookParam(title, contents, index, start, fsys.GetPath()); + } } wxString wxHtmlHelpData::FindPageByName(const wxString& x) @@ -472,7 +495,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) cnt = m_ContentsCnt; for (i = 0; i < cnt; i++) { - if (strcmp(m_Contents[i].m_Name, x) == 0) { + if (wxStrcmp(m_Contents[i].m_Name, x) == 0) { url = m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page; return url; } @@ -483,7 +506,7 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x) cnt = m_IndexCnt; for (i = 0; i < cnt; i++) { - if (strcmp(m_Index[i].m_Name, x) == 0) { + if (wxStrcmp(m_Index[i].m_Name, x) == 0) { url = m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page; return url; } @@ -512,28 +535,28 @@ wxString wxHtmlHelpData::FindPageById(int id) //---------------------------------------------------------------------------------- wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& keyword, - const wxString& book) + const wxString& book) { m_Data = data; m_Keyword = keyword; wxHtmlBookRecord* bookr = NULL; if (book != wxEmptyString) { - // we have to search in a specific book. Find it first - int i,cnt = data->m_BookRecords.GetCount(); - for (i=0; im_BookRecords[i].GetTitle() == book) { - bookr = &(data->m_BookRecords[i]); - m_CurIndex = bookr->GetContentsStart(); - m_MaxIndex = bookr->GetContentsEnd(); - break; - } - // check; we won't crash if the book doesn't exist, but it's Bad Anyway. - wxASSERT(bookr); + // we have to search in a specific book. Find it first + int i, cnt = data->m_BookRecords.GetCount(); + for (i = 0; i < cnt; i++) + if (data->m_BookRecords[i].GetTitle() == book) { + bookr = &(data->m_BookRecords[i]); + m_CurIndex = bookr->GetContentsStart(); + m_MaxIndex = bookr->GetContentsEnd(); + break; + } + // check; we won't crash if the book doesn't exist, but it's Bad Anyway. + wxASSERT(bookr); } if (! bookr) { - // no book specified; search all books - m_CurIndex = 0; - m_MaxIndex = m_Data->m_ContentsCnt; + // no book specified; search all books + m_CurIndex = 0; + m_MaxIndex = m_Data->m_ContentsCnt; } m_Engine.LookFor(keyword); m_Active = (m_CurIndex < m_MaxIndex); @@ -544,12 +567,16 @@ bool wxHtmlSearchStatus::Search() { wxFileSystem fsys; wxFSFile *file; - int i = m_CurIndex; // shortcut + int i = m_CurIndex; // shortcut bool found = FALSE; if (! m_Active) { // sanity check. Illegal use, but we'll try to prevent a crash anyway - wxASSERT(0); +#if !defined(__VISAGECPP__) +wxASSERT(0); +#else +wxASSERT(m_Active); +#endif return FALSE; } @@ -557,20 +584,71 @@ bool wxHtmlSearchStatus::Search() m_Name = wxEmptyString; file = fsys.OpenFile(m_Data->m_Contents[i].m_Book -> GetBasePath() + - m_Data->m_Contents[i].m_Page); + m_Data->m_Contents[i].m_Page); if (file) { - if (m_LastPage != file->GetLocation()) { - m_LastPage = file->GetLocation(); - if (m_Engine.Scan(file -> GetStream())) { - m_Name = m_Data->m_Contents[i].m_Name; - m_ContentsItem = m_Data->m_Contents + i; - found = true; - } - } - delete file; + if (m_LastPage != file->GetLocation()) { + m_LastPage = file->GetLocation(); + if (m_Engine.Scan(file -> GetStream())) { + m_Name = m_Data->m_Contents[i].m_Name; + m_ContentsItem = m_Data->m_Contents + i; + found = TRUE; + } + } + delete file; } m_Active = (++m_CurIndex < m_MaxIndex); return found; } + + + + + + + +//-------------------------------------------------------------------------------- +// wxSearchEngine +//-------------------------------------------------------------------------------- + +void wxSearchEngine::LookFor(const wxString& keyword) +{ + if (m_Keyword) delete[] m_Keyword; + m_Keyword = new wxChar[keyword.Length() + 1]; + wxStrcpy(m_Keyword, keyword.c_str()); + for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--) + if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z'))) + m_Keyword[i] += wxT('a') - wxT('A'); +} + + + +bool wxSearchEngine::Scan(wxInputStream *stream) +{ + wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!")); + + int i, j; + int lng = stream ->GetSize(); + int wrd = wxStrlen(m_Keyword); + bool found = FALSE; + char *buf = new char[lng + 1]; + stream -> Read(buf, lng); + buf[lng] = 0; + + for (i = 0; i < lng; i++) + if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A'; + + for (i = 0; i < lng - wrd; i++) { + j = 0; + while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++; + if (j == wrd) {found = TRUE; break; } + } + + delete[] buf; + return found; +} + + + + #endif