Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxHtmlParser::StopParsing and use it in ExtractCharsetInformation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-09 19:29:00 +00:00
parent a84d0043c6
commit fabe27dcb5
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/html/htmlpars.cpp
View File

@@ -92,11 +92,9 @@ wxHtmlParser::~wxHtmlParser()
wxObject* wxHtmlParser::Parse(const wxString& source) wxObject* wxHtmlParser::Parse(const wxString& source)
{ {
wxObject *result;
InitParser(source); InitParser(source);
DoParsing(); DoParsing();
result = GetProduct(); wxObject *result = GetProduct();
DoneParser(); DoneParser();
return result; return result;
} }
@@ -104,6 +102,7 @@ wxObject* wxHtmlParser::Parse(const wxString& source)
void wxHtmlParser::InitParser(const wxString& source) void wxHtmlParser::InitParser(const wxString& source)
{ {
SetSource(source); SetSource(source);
m_stopParsing = FALSE;
} }
void wxHtmlParser::DoneParser() void wxHtmlParser::DoneParser()
@@ -292,6 +291,8 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
wxHtmlTag *t = m_CurTag; wxHtmlTag *t = m_CurTag;
m_CurTag = m_CurTag->GetNextTag(); m_CurTag = m_CurTag->GetNextTag();
AddTag(*t); AddTag(*t);
if (m_stopParsing)
return;
} }
else break; else break;
} }
@@ -304,7 +305,11 @@ void wxHtmlParser::AddTag(const wxHtmlTag& tag)
h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName()); h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
if (h) if (h)
{
inner = h->HandleTag(tag); inner = h->HandleTag(tag);
if (m_stopParsing)
return;
}
if (!inner) if (!inner)
{ {
if (tag.HasEnding()) if (tag.HasEnding())
@@ -839,7 +844,7 @@ class wxMetaTagHandler : public wxHtmlTagHandler
{ {
public: public:
wxMetaTagHandler(wxString *retval) : wxHtmlTagHandler(), m_retval(retval) {} wxMetaTagHandler(wxString *retval) : wxHtmlTagHandler(), m_retval(retval) {}
wxString GetSupportedTags() { return wxT("META"); } wxString GetSupportedTags() { return wxT("META,BODY"); }
bool HandleTag(const wxHtmlTag& tag); bool HandleTag(const wxHtmlTag& tag);
private: private:
@@ -848,6 +853,12 @@ private:
bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag) bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
{ {
if (tag.GetName() == _T("BODY"))
{
// m_Parser->StopParsing();
return FALSE;
}
if (tag.HasParam(_T("HTTP-EQUIV")) && if (tag.HasParam(_T("HTTP-EQUIV")) &&
tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") && tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") &&
tag.HasParam(_T("CONTENT"))) tag.HasParam(_T("CONTENT")))
@@ -856,6 +867,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
if (content.Left(19) == _T("text/html; charset=")) if (content.Left(19) == _T("text/html; charset="))
{ {
*m_retval = content.Mid(19); *m_retval = content.Mid(19);
// m_Parser->StopParsing();
} }
} }
return FALSE; return FALSE;