Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-29 16:53:53 +01:00
Code Issues Projects Releases Wiki Activity

2018-07-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Auxiliary Fields from the podcasting system.
	* Fixed a regression in the RDFeed system that caused segfaults
	when accessing channel XML.
This commit is contained in:
Fred Gleason
2018-07-20 13:04:44 -04:00
parent c2f11d76be
commit 0dc7a4e698
36 changed files with 222 additions and 2761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
web/rdfeed/rdfeed_script.cpp
View File

@@ -213,12 +213,7 @@ void MainObject::ServeRss(const char *keyname,bool count)
q1=new RDSqlQuery(sql);
while(q1->next()) {
printf("<item>\n");
printf("%s\n",(const char *)
ResolveAuxWildcards(ResolveItemWildcards(keyname,q1,q),
getenv("QUERY_STRING"),
q->value(13).toUInt(),
q1->value(7).toUInt()));
//printf("%s\n",(const char *)ResolveItemWildcards(q1,q));
printf("%s\n",(const char *)ResolveItemWildcards(keyname,q1,q));
printf("</item>\n");
}
delete q1;
@@ -316,43 +311,6 @@ QString MainObject::ResolveItemWildcards(const QString &keyname,
}
QString MainObject::ResolveAuxWildcards(QString xml,QString keyname,
unsigned feed_id,unsigned cast_id)
{
QString sql;
RDSqlQuery *q;
RDSqlQuery *q1;
keyname.replace(" ","_");
sql=QString("select VAR_NAME from AUX_METADATA where ")+
QString().sprintf("FEED_ID=%u",feed_id);
q=new RDSqlQuery(sql);
if(q->size()==0) {
delete q;
return xml;
}
sql="select ";
while(q->next()) {
sql+=q->value(0).toString().mid(1,q->value(0).toString().length()-2);
sql+=",";
}
sql=sql.left(sql.length()-1);
sql+=QString().sprintf(" from %s_FIELDS where CAST_ID=%u",
(const char *)keyname,cast_id);
q->seek(-1);
q1=new RDSqlQuery(sql);
while(q1->next()) {
q->next();
xml.replace(q->value(0).toString(),
RDXmlEscape(q1->value(0).toString()));
}
delete q1;
delete q;
return xml;
}
bool MainObject::ShouldCount(const QString &hdr)
{
bool ret=false;