simplyfications and rewrite with relational sql

diff --git a/etc/config.properties-dist b/etc/config.properties-dist
index 958d98f..f8ab50e 100755 (executable)
--- a/etc/config.properties-dist
+++ b/etc/config.properties-dist
@@ -108,7 +108,7 @@ Mir.Localizer.Admin.AllowDeleteArticle=1
 
 # Article Preview Link URL (Link to produced articles from within admin)
 Comment.PublicUrl=http://production.indy.code-foo.org/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
-Article.PublicUrl=http://production.indy.code-foo.org/en/${co_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
+Article.PublicUrl=http://production.indy.code-foo.org/en/${to_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
 
 
 # Which producers need to be called after an article (resp. a comment) is posted

diff --git a/etc/producer/producers.xml b/etc/producer/producers.xml
index 3a82a06..aeaa060 100755 (executable)
--- a/etc/producer/producers.xml
+++ b/etc/producer/producers.xml
@@ -54,7 +54,8 @@
                 generator="/article.template" 
                 destination="${config.storageRoot}/${pathprefix}/${article.date.formatted.yyyy}/${article.date.formatted.MM}/${article.id}.shtml"/>
 
-    <!--
+    <!-- commented out features
+    
               <PDFPreFormat 
                 key="article" 
                 numLinesBetweenImages="3" 
@@ -69,7 +70,10 @@
               <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['Producer.HTML2FOStyleSheet']}" /> -->
+                stylesheet="${config['Producer.HTML2FOStyleSheet']}" /> 
+                
+      -->
+                
              </Language>
              <IndexContent key="article" pathToIndex="${config['IndexPath']}"/>
           </then>

diff --git a/source/default.properties b/source/default.properties
index 6adfb3d..53a7aeb 100755 (executable)
--- a/source/default.properties
+++ b/source/default.properties
@@ -131,7 +131,7 @@ Mir.Localizer.Admin.AllowDeleteArticle=1
 
 # Article Preview Link URL (Link to produced articles from within admin)
 Comment.PublicUrl=/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
-Article.PublicUrl=/en/${co_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
+Article.PublicUrl=/en/${to_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
 
 # which 'quick' operations should be available in the top-left box?
 Mir.Localizer.Admin.AdministerOperations= \
@@ -519,10 +519,10 @@ ServletModule.CommentStatus.ListTemplate=commentstatuslist.template
 
 #
 # config for abuse
-ServletModule.Abuse.EditFilter.Template = abuse.filter.template\r
-ServletModule.Abuse.ListFilters.Template = abuse.filters.template\r
-ServletModule.Abuse.ViewLog.Template = abuse.log.template\r
-ServletModule.Abuse.Main.Template = abuse.template\r
+ServletModule.Abuse.EditFilter.Template = abuse.filter.template
+ServletModule.Abuse.ListFilters.Template = abuse.filters.template
+ServletModule.Abuse.ViewLog.Template = abuse.log.template
+ServletModule.Abuse.Main.Template = abuse.template
 
 #
 # producer-related configs below