From: gdm <gdm>
Date: Sun, 14 Aug 2005 16:21:16 +0000 (+0000)
Subject: john duda changes from traven to make rss feeds work
X-Git-Url: http://erislabs.net/gitweb/?p=nyc.indymedia.org.git;a=commitdiff_plain;h=c5cbc6378e95a0df25cb1c4b7d5d776f671d69c8

john duda changes from traven to make rss feeds work
---

diff --git a/etc/producer/producers.xml b/etc/producer/producers.xml
index fdba7a7..cec5ab2 100755
--- a/etc/producer/producers.xml
+++ b/etc/producer/producers.xml
@@ -133,10 +133,10 @@
     <definition>
       <If condition="extratables == 'none' ">
         <then>
-          <List key="articles" table="content c" selection="${articleSelection}" order = "c.webdb_create desc, c.date desc" limit="limit" />
+          <List key="articles" table="content" selection="${articleSelection}" order = "webdb_create desc, date desc" limit="limit" />
         </then>
         <else>
-          <List key="articles" table="content c" selection="${articleSelection}" order = "c.webdb_create desc, c.date desc" limit="limit" extratables="${extratables}" />
+          <List key="articles" table="content" selection="${articleSelection}" order = "webdb_create desc, date desc" limit="limit" extratables="${extratables}" />
         </else>
       </If>
       <If condition="channeldescription==''">
@@ -160,20 +160,20 @@
   <nodedefinition name="RSSChannelBundle">
     <parameters>
       <string name="extratables" defaultvalue="none" />
-      <string name="selection" defaultvalue="c.is_published='1'" />  
+      <string name="selection" defaultvalue="is_published='1'" />  
       <string name="basefilename" defaultvalue="main" />
     </parameters>
     <definition>
       <!-- newswire -->
       <RSSChannel
-        articleSelection="(c.to_article_type in (${articletype.newswire}) or (c.to_article_type=${articletype.translation} and c.to_original.to_articletype in (${articletype.newswire}))) and ${selection}"
+        articleSelection="(to_article_type in (${articletype.newswire}) or (to_article_type=${articletype.translation} and to_original.to_articletype in (${articletype.newswire}))) and ${selection}"
         channelfilename="${basefilename}-newswire.rss"
         channeltitle="${config['Mir.Name']} ${basefilename} newswire"
         limit="20"
 	extratables="${extratables}"
       />
       <RSSChannel
-        articleSelection="(c.to_article_type in (${articletype.newswire}) or (c.to_article_type=${articletype.translation} and c.to_original.to_articletype in (${articletype.newsire}))) and ${selection}"
+        articleSelection="(to_article_type in (${articletype.newswire}) or (to_article_type=${articletype.translation} and to_original.to_articletype in (${articletype.newsire}))) and ${selection}"
         channelfilename="${basefilename}-newswire-content.rss"
         channeltitle="${config['Mir.Name']} ${basefilename} newswire"
         limit="20"
@@ -182,14 +182,14 @@
       />    
       <!-- features -->
       <RSSChannel
-        articleSelection="(c.to_article_type in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial}) or (c.to_article_type=${articletype.translation} and c.to_original.to_articletype in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial}))) and ${selection}"
+        articleSelection="(to_article_type in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial})) and ${selection}"
         channelfilename="${basefilename}-features.rss"
         channeltitle="${config['Mir.Name']} ${basefilename} features"
         limit="20"
 	extratables="${extratables}"
       />
       <RSSChannel
-        articleSelection="(c.to_article_type in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial}) or (c.to_article_type=${articletype.translation} and c.to_original.to_articletype in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial}))) and ${selection}"
+        articleSelection="(to_article_type in (${articletype.feature},${articletype.startspecial},${articletype.topicspecial})) and ${selection}"
         channelfilename="${basefilename}-features-content.rss"
         channeltitle="${config['Mir.Name']} ${basefilename} features"
         limit="20"
@@ -693,8 +693,8 @@
       <Enumerate key="topic" table="topic">
         <RSSChannelBundle
           basefilename="${topic.filename}"
-	  selection="c.id=cxt.content_id and cxt.topic_id = ${topic.id}"
-          extratables="content_x_topic cxt"
+	  selection="id=cxt.content_id and cxt.topic_id = ${topic.id}"
+          extratables="content_x_topic as cxt"
         />
       </Enumerate>