From: zapata <zapata>
Date: Sun, 23 Feb 2003 05:02:49 +0000 (+0000)
Subject: various fixes/cleanup
X-Git-Tag: BEFORE_MERGE_1_1~259
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1f83c1f747c058bc199f96ba3d6fa8376744a2ff;p=mir.git

various fixes/cleanup
---

diff --git a/etc/default.properties b/etc/default.properties
index 51faebea..27563b39 100755
--- a/etc/default.properties
+++ b/etc/default.properties
@@ -57,7 +57,6 @@ Log.log4j.ConfigurationFile = etc/log4j.properties
 Log.Home = log
 
 Mir.Localizer=mircoders.localizer.basic.MirBasicLocalizer
-Mir.Localizer.Logfile=log/localizer.log
 
 # The location of the producer specifiations
 Mir.Localizer.ProducerConfigFile=etc/producer/producers.xml
@@ -230,7 +229,6 @@ Database.Name=Mir
 # this sets the adaptor to be used
 
 Database.Adaptor=mir.storage.DatabaseAdaptorPostgresql
-Database.Logfile=log/dbentity.log
 
 #
 # configuration for adaptor postgres
@@ -243,14 +241,8 @@ Adaptor.PostgreSQL.Driver=org.postgresql.Driver
 # should be explained .)
 #
 
-# how many articles should be shown on a list-page
-Lists.Max.Items=10
-
-HTMLTemplateProcessor.Logfile=log/htmlprocess.log
 HTMLTemplateProcessor.Dir=
 
-Entity.Logfile=log/dbentity.log
-
 #
 # Servlet / Module configurations
 #
@@ -261,11 +253,9 @@ Entity.Logfile=log/dbentity.log
 # also used for the HTML charset meta tag.
 Mir.DefaultEncoding=UTF8
 
-Mir.Logfile=log/mir.log
 Mir.ErrorTemplate=templates/error.template
 Mir.UserErrorTemplate=templates/usererror.template
 Mir.LoginTemplate=templates/admin/login.template
-OpenMir.Logfile=log/OpenMir.log
 
 ServletModule.Schwerpunkt.ConfirmTemplate=templates/admin/confirm.template
 ServletModule.Schwerpunkt.ObjektTemplate=templates/admin/feature.template
@@ -291,8 +281,6 @@ ServletModule.Images.ConfirmTemplate=templates/admin/confirm.template
 ServletModule.Images.ObjektTemplate=templates/admin/image.template
 ServletModule.Images.ListTemplate=templates/admin/imagelist.template
 
-Module.UploadedMedia.Logfile=log/mir.log
-
 ServletModule.Audio.ConfirmTemplate=templates/admin/confirm.template
 ServletModule.Audio.ObjektTemplate=templates/admin/audio.template
 ServletModule.Audio.ListTemplate=templates/admin/audiolist.template
@@ -380,7 +368,4 @@ ServletModule.CommentStatus.ListTemplate=templates/admin/commentstatuslist.templ
 Producer.ExtLinkName=extlink.gif
 Producer.IntLinkName=intlink.gif
 Producer.MailLinkName=maillink.gif
-Producer.Logfile=log/producer.log
 
-Producer.Content.Template=etc/producer/content.template
-Producer.Content.Batchsize=10
diff --git a/etc/log4j.properties b/etc/log4j.properties
index 32d6afb1..d1e8d4b0 100755
--- a/etc/log4j.properties
+++ b/etc/log4j.properties
@@ -7,6 +7,7 @@ log4j.logger.Producer= INFO, ProducerA
 log4j.logger.ServletModule= INFO, ServletModuleA
 log4j.logger.Module= INFO, ModuleA
 log4j.logger.Localizer= INFO, LocalizerA 
+log4j.logger.TemplateEngine= INFO, TemplateEngineA
 
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
@@ -52,3 +53,7 @@ log4j.appender.LocalizerA.File=${log.home}/localizer.log
 log4j.appender.LocalizerA.layout=org.apache.log4j.PatternLayout
 log4j.appender.LocalizerA.layout.ConversionPattern=%d [%p] %c %x %m%n
 
+log4j.appender.TemplateEngineA=org.apache.log4j.RollingFileAppender
+log4j.appender.TemplateEngineA.File=${log.home}/localizer.log
+log4j.appender.TemplateEngineA.layout=org.apache.log4j.PatternLayout
+log4j.appender.TemplateEngineA.layout.ConversionPattern=%d [%p] %c %x %m%n
diff --git a/etc/producer/producers.xml b/etc/producer/producers.xml
index c1229b80..3782ca16 100755
--- a/etc/producer/producers.xml
+++ b/etc/producer/producers.xml
@@ -7,6 +7,7 @@
     - a newswire archive
     - a feature archive
     - articles
+    - media
 -->  
 
 <producers>
@@ -30,7 +31,7 @@
   <producer name="articles">
     <verbs>
       <verb name="changed" default="1">
-        <Define key="verbcondition" value=" and (not is_produced)"/>
+        <Define key="verbcondition" value="(not is_produced)"/>
         <Set key="limit" value="10"/>
       </verb>
       <verb name="all">
@@ -44,69 +45,44 @@
       </verb>
     </verbs>
     <body>
-      <Enumerate key="article" table="content" selection="1=1 ${verbcondition}"
+      <Enumerate key="article" table="content" selection="${verbcondition}"
                   limit="limit" order="webdb_create desc, date desc">
         <If condition="article.is_published == '1'">
-	  <then>
-	    <Language>
+          <then>
+            <Language>
               <Generate 
                 generator="/article.template" 
                 destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.shtml"/>
-	      <Generate 
+              <Generate 
                 generator="/emailThisArticle.template" 
                 destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.txt"/>
-	      <PDFPreFormat 
-	        key="article" 
-	        numLinesBetweenImages="3" 
-	        charWidthCM="0.19" 
-	        pixelWidthCM="0.035"
-	        contentAreaWidthCM="16" 
-	        lineHeightCM="0.5" />
-	      <Generate 
+              <PDFPreFormat 
+                key="article" 
+                numLinesBetweenImages="3" 
+                charWidthCM="0.19" 
+                pixelWidthCM="0.035"
+                contentAreaWidthCM="16" 
+                lineHeightCM="0.5" />
+              <Generate 
                 generator="/printablecontent.template" 
                 destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.fo"
-	        parameters="UTF-8" />
-	      <PDFGenerate
+                parameters="UTF-8" />
+              <PDFGenerate
                 generator="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.fo"
-	        destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.pdf"
-	        stylesheet="${config[&quot;Producer.HTML2FOStyleSheet&quot;]}" />
-            </Language>
-            <MarkContent key="article"/>            
-	    <IndexContent key="article" pathToIndex="${config[&quot;IndexPath&quot;]}"/>
-	  </then>
-	  <else>
-	    <UnIndexContent key="article" pathToIndex="${config[&quot;IndexPath&quot;]}"/>
-	  </else>
-	</If>
+                destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.pdf"
+                stylesheet="${config['Producer.HTML2FOStyleSheet']}" />
+             </Language>
+             <IndexContent key="article" pathToIndex="${config['IndexPath']}"/>
+          </then>
+          <else>
+            <UnIndexContent key="article" pathToIndex="${config['IndexPath']}"/>
+          </else>
+        </If>
+        <MarkContent key="article"/>            
       </Enumerate>
     </body>
   </producer>  
 
-<!--  <producer name="index-articles">
-    <verbs>
-      <verb name="changed" default="1">
-        <Define key="verbcondition" value=" and (not is_produced)"/>
-        <Set key="limit" value="10"/>
-      </verb>
-      <verb name="all">
-        <Define key="verbcondition" value=""/>
-        <Set key="limit" value="-1"/>
-      </verb>
-
-      <verb name="sample">
-        <Define key="verbcondition" value=""/>
-        <Set key="limit" value="10"/>
-      </verb>
-    </verbs>
-    <body>
-      <Enumerate key="article" table="content" selection="is_published='t' ${verbcondition}"
-                  limit="limit" order="webdb_create desc, date desc">
-	<IndexContent key="article" pathToIndex="/tmp/index"/>
-      </Enumerate>
-    </body>
-  </producer>  -->
-
-
   <producer name="navigation">
     <verbs>
       <verb name="generate" default="1" description="generates the left column"/>
@@ -313,6 +289,59 @@
     </body>
   </producer>  
   
+  
+  <producer name="media">
+    <verbs>
+      <verb name="new" default="1">
+        <Define key="verbcondition" value="(not is_produced)"/>
+        <Set key="limit" value="10"/>
+      </verb>
+      <verb name="all">
+        <Define key="verbcondition" value=""/>
+        <Set key="limit" value="-1"/>
+      </verb>
+
+      <verb name="sample">
+        <Define key="verbcondition" value=""/>
+        <Set key="limit" value="10"/>
+      </verb>
+    </verbs>
+    <body>
+      <Enumerate 
+          key="media" table="image" 
+          selection="${verbcondition}"
+          limit="limit" 
+          order="webdb_create desc, date desc">
+          
+         <GenerateMedia key="media" />
+      </Enumerate>
+      <Enumerate 
+          key="media" table="video" 
+          selection="${verbcondition}"
+          limit="limit" 
+          order="webdb_create desc, date desc">
+          
+         <GenerateMedia key="media" />
+      </Enumerate>
+      <Enumerate 
+          key="media" table="audio" 
+          selection="${verbcondition}"
+          limit="limit" 
+          order="webdb_create desc, date desc">
+          
+         <GenerateMedia key="media" />
+      </Enumerate>
+      <Enumerate 
+          key="media" table="otherMedia" 
+          selection="${verbcondition}"
+          limit="limit" 
+          order="webdb_create desc, date desc">
+          
+         <GenerateMedia key="media" />
+      </Enumerate>
+    </body>
+  </producer>  
+  
 </producers>