Ticket #1891: newsengine_replacehtml.diff

mythflix/mythflix/newsengine.cpp

@@ -243 +243 @@
         title    = itemNode.namedItem(QString::fromLatin1("title")).toElement().text().simplifyWhiteSpace();
         QDomNode descNode = itemNode.namedItem(QString::fromLatin1("description"));
         if (!descNode.isNull())
+        {
             description = descNode.toElement().text().simplifyWhiteSpace();
+            ReplaceHtmlChar(description);
+        }            
         else
             description = QString::null;
         QDomNode linkNode = itemNode.namedItem(QString::fromLatin1("link"));
@@ -274 +277 @@
     }
 }
 
+void NewsSite::ReplaceHtmlChar(QString &s)
+{
+    s.replace("&", "&");
+    s.replace("&lt;", "<");
+    s.replace("&gt;", ">");
+    s.replace("&quot;", "\"");
+    s.replace("&apos;", "\'");
+    s.replace("&#8230;",QChar(8230));
+    s.replace("&#233;",QChar(233));
+}
+

mythflix/mythflix/newsengine.h

@@ -108 +108 @@
     NewsArticle::List m_articleList;
     QUrlOperator*     m_urlOp;
 
+    void ReplaceHtmlChar( QString &s);
+
 signals:
 
     void finished(NewsSite* item);

mythnews/mythnews/newsengine.cpp

@@ -243 +243 @@
         title    = itemNode.namedItem(QString::fromLatin1("title")).toElement().text().simplifyWhiteSpace();
         QDomNode descNode = itemNode.namedItem(QString::fromLatin1("description"));
         if (!descNode.isNull())
+        {
             description = descNode.toElement().text().simplifyWhiteSpace();
+            ReplaceHtmlChar(description);
+        }            
         else
             description = QString::null;
         QDomNode linkNode = itemNode.namedItem(QString::fromLatin1("link"));
@@ -274 +277 @@
     }
 }
 
+void NewsSite::ReplaceHtmlChar(QString &s)
+{
+    s.replace("&", "&");
+    s.replace("&lt;", "<");
+    s.replace("&gt;", ">");
+    s.replace("&quot;", "\"");
+    s.replace("&apos;", "\'");
+    s.replace("&#8230;",QChar(8230));
+    s.replace("&#233;",QChar(233));
+}
+

mythnews/mythnews/newsengine.h

@@ -108 +108 @@
     NewsArticle::List m_articleList;
     QUrlOperator*     m_urlOp;
 
+    void ReplaceHtmlChar( QString &s);
+
 signals:
 
     void finished(NewsSite* item);