Take hard coded path out of makefile

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index d4bf792b8f2b17f27711dd12510e8f5d7b6da32d..0f1a51bf34b5346e6a970543368974cecf9b15b8 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -112,7 +112,7 @@ class HP_TagHandler : public wxHtmlTagHandler
 
 bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 {
-    if (tag.GetName() == "UL") {
+    if (tag.GetName() == wxT("UL")) {
         m_Level++;
         ParseInner(tag);
         m_Level--;
@@ -121,7 +121,27 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
     else if (tag.GetName() == wxT("OBJECT")) {
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
-        if (m_Page != wxEmptyString) {
+
+        if (!m_Page.IsEmpty())
+        /* should be 'if (tag.GetParam("TYPE") == "text/sitemap")'
+           but this works fine. Valid HHW's file may contain only two
+           object tags:
+           
+           <OBJECT type="text/site properties">
+               <param name="ImageType" value="Folder">
+           </OBJECT>
+           
+           or
+           
+              <OBJECT type="text/sitemap">
+                      <param name="Name" value="main page">
+                      <param name="Local" value="another.htm">
+                  </OBJECT>
+           
+           We're interested in the latter. !m_Page.IsEmpty() is valid
+           condition because text/site properties does not contain Local param
+        */
+        {
             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;
@@ -133,6 +153,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
             m_Items[m_ItemsCnt].m_Book = m_Book;
             m_ItemsCnt++;
         }
+
         return TRUE;
     }
     else { // "PARAM"
@@ -535,6 +556,7 @@ wxString wxHtmlHelpData::FindPageById(int id)
 //----------------------------------------------------------------------------------
 
 wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& keyword,
+                                       bool case_sensitive, bool whole_words_only,
                                        const wxString& book)
 {
     m_Data = data;
@@ -558,7 +580,7 @@ wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& key
         m_CurIndex = 0;
         m_MaxIndex = m_Data->m_ContentsCnt;
     }
-    m_Engine.LookFor(keyword);
+    m_Engine.LookFor(keyword, case_sensitive, whole_words_only);
     m_Active = (m_CurIndex < m_MaxIndex);
     m_LastPage = wxEmptyString;
 }
@@ -570,21 +592,20 @@ bool wxHtmlSearchStatus::Search()
     int i = m_CurIndex;  // shortcut
     bool found = FALSE;
 
-    if (! m_Active) {
-       // sanity check. Illegal use, but we'll try to prevent a crash anyway
+    if (!m_Active) {
+    // sanity check. Illegal use, but we'll try to prevent a crash anyway
 #if !defined(__VISAGECPP__)
-wxASSERT(0);
+        wxASSERT(0);
 #else
-wxASSERT(m_Active);
+        wxASSERT(m_Active);
 #endif
-       return FALSE;
+        return FALSE;
     }
 
     m_ContentsItem = NULL;
     m_Name = wxEmptyString;
 
-    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book -> GetBasePath() +
-                         m_Data->m_Contents[i].m_Page);
+    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book -> GetBasePath() + m_Data->m_Contents[i].m_Page);
     if (file) {
         if (m_LastPage != file->GetLocation()) {
             m_LastPage = file->GetLocation();
@@ -611,21 +632,27 @@ wxASSERT(m_Active);
 // wxSearchEngine
 //--------------------------------------------------------------------------------
 
-void wxSearchEngine::LookFor(const wxString& keyword)
+void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only)
 {
+    m_CaseSensitive = case_sensitive;
+    m_WholeWords = whole_words_only;
     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');
+    
+    if (!m_CaseSensitive)
+        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');
 }
 
 
 
+#define WHITESPACE(c)  (c == ' ' || c == '\n' || c == '\r' || c == '\t')
+
 bool wxSearchEngine::Scan(wxInputStream *stream)
 {
-    wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!"));
+    wxASSERT_MSG(m_Keyword != NULL, wxT("wxSearchEngine::LookFor must be called before scanning!"));
 
     int i, j;
     int lng = stream ->GetSize();
@@ -635,13 +662,27 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
     stream -> Read(buf, lng);
     buf[lng] = 0;
 
-    for (i = 0; i < lng; i++)
-        if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A';
+    if (!m_CaseSensitive)
+        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; }
+    if (m_WholeWords)
+    {
+        for (i = 0; i < lng - wrd; i++) {
+            if (WHITESPACE(buf[i])) continue;
+            j = 0;
+            while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
+            if (j == wrd && WHITESPACE(buf[i + j])) {found = TRUE; break; }
+        }
+    }
+    
+    else
+    {
+        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;