X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=etc%2Fproducer%2Fproducers.xml;h=e7a08fbf5317d6feed3f717c2e6725efa81bfbc6;hb=e9ecf2315b20660d52460ef3247b2c349a468638;hp=fd799b16768ae01e709c4324125b81ffad8529b5;hpb=7c5b102aff4a97d2cbcf74eacb0384b50f6f8d5a;p=nyc.indymedia.org.git

diff --git a/etc/producer/producers.xml b/etc/producer/producers.xml
index fd799b1..e7a08fb 100755
--- 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
@@ -134,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==''">
@@ -161,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"
@@ -183,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"
@@ -222,7 +221,10 @@
         <Set key="limit" value="2500"/>
       </verb>
 
-
+      <verb name="regen">
+      	<Define key="verbcondition" value="(not is_produced) and to_article_type != ${articletype.static}"/>
+	<Set key="limit" value="5000"/>
+      </verb>
     </verbs>
     <body>
       <Enumerate key="article" table="content" selection="${verbcondition}"
@@ -268,14 +270,15 @@
 
 	      <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="utility.listSize(topics) > 0">
+		   <!--<If condition="utility.listSize(topics) > 0">
 		   <then>
 		  	<Log message="I have a topic list with ${utility.listSize(topics)}" />
 		    </then>
-		   </If>
+		   </If>-->
         <If condition="article.is_published == '1'">
           <then>
             <Language>
+	      <Log message="I am generating: ${article.id}"/>
               <Generate 
                 generator="/article.template" 
                 destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.html"/>
@@ -338,14 +341,14 @@
             
            <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>
             <Language>
               <Generate 
-                generator="/article.template" 
+                generator="/staticpage.template" 
                 destination="${config.storageRoot}/${pathprefix}/static/${article.edittitle}.html"/>
              </Language>
 
@@ -385,6 +388,16 @@
     </body>
   </producer>
   
+  
+   <producer name="staticfiles">
+    <verbs>
+      <verb name="generate" default="1" description="copies all the static image files into place"/>
+    </verbs>
+    <body>
+      <CopyDir destination="js" source="etc/producer/js"/>
+    </body>
+  </producer>
+  
   <producer name="newswirearchive">
     <verbs>
       <verb name="new">
@@ -536,7 +549,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>
@@ -575,12 +588,19 @@
       <verb name="generate" default="1" description="Generates the startpage"/>
     </verbs>
 
+
     <body>
       <List key="startspecial" table="content" limit="1"
         selection="is_published=true and to_article_type=${articletype.startspecial}"
         order="webdb_create desc"/>
+
+      <Enumerate key="ssimage" table="image" selection="to_media_folder=9 and is_published=true" >       
+      	<Define key="ssimagepath" value="${ssimage.publish_server}/${ssimage.publish_path}" />
+      	<Define key="sstitle" value="${ssimage.title}" />
+      </Enumerate>
+                                        
                                         
-      <List key="features" table="content" limit="4" 
+      <List key="features" table="content" limit="5" 
         selection="is_published=true and to_article_type in (${articletype.feature},${articletype.promotedcommunityarticle},${articletype.promotednewswire})"
         order="webdb_create desc"/>
 
@@ -595,11 +615,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"
 		    />    
 	        
@@ -694,8 +714,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>
       
@@ -802,7 +822,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