made newswire longer, took out hidden posts from random categories,

[nyc.indymedia.org.git] / etc / producer / producers.xml
diff --git a/etc/producer/producers.xml b/etc/producer/producers.xml

index 63e7867..fdba7a7 100755 (executable)
--- a/etc/producer/producers.xml
+++ b/etc/producer/producers.xml
@@ -1,6 +1,5 @@
  <!--
-  This XML file defines a set of producers intended for a typical indymedia 
-  site:
+    This XML file defines a set of producers intended for a typical indymedia site:
      - a start page
      - a navigational bar
      - topic pages
@@ -338,8 +337,8 @@
              
             <GenerateMedia key="media" />
          </Enumerate>
-        <List key="topics" table="topic t" extratables="content_x_topic ctx"
-               selection="ctx.content_id = ${article.id} AND ctx.topic_id = t.id"  />
+       <List key="topics" table="topic t" extratables="content_x_topic ctx"
+               selection="ctx.content_id = ${article.id} AND ctx.topic_id = t.id"  />
  
          <If condition="article.is_published == '1'">
            <then>
@@ -536,7 +535,7 @@
      </verbs>
  <body>
  <Set key="whichnewswire" value="Open Publishing News" />
-      <List key="newswire" table="content" limit="20"
+      <List key="newswire" table="content" limit="50"
          selection="is_published=true and to_article_type=${articletype.newswire}"
          order="webdb_create desc"/>
        <Language>
@@ -595,11 +594,11 @@
        <List key="mostcomments"
                   table="content c"
                   extratables="comment cm"
-                 selection="c.webdb_create > NOW()-'2 years'::interval and c.is_published=true and c.id=cm.to_media group by c.id,c.title,
+                 selection="c.webdb_create > NOW()-'1 week'::interval and c.is_published=true and cm.is_published=true and c.id=cm.to_media group by c.id,c.title,
                                          c.subtitle,c.edittitle,c.date,c.creator,c.creator_main_url,c.creator_email,c.creator_address,c.creator_phone,c.description,
                                          c.comment,c.source,c.is_published,c.is_produced,c.to_publisher,c.to_language,c.to_rights,c.webdb_create,c.webdb_lastchange,
                                          c.content_data,c.is_html,c.to_article_type,c.to_content,c.keywords,c.to_locking_user"
-                         order="count(cm.id) desc"
+                         order="count(cm.id) desc, c.webdb_create desc "
                           limit="3"
                     />    
                 
@@ -802,7 +801,7 @@
          <Define key="topicfile" value="${category.filename}" /> 
          
          <List key="randomarticles" table="content"
-               selection ="id in (select content_id from content_x_topic where topic_id = ${category.id})" order="date DESC"
+               selection ="id in (select content_id from content_x_topic where topic_id = ${category.id}) AND is_published=true" order="date DESC"
                 limit="3" />
          <Language>     
                 <Generate