From: zapata Date: Mon, 10 Jun 2002 00:38:22 +0000 (+0000) Subject: bolivian setup seems to work now... X-Git-Tag: prexmlproducerconfig~59 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=3428fc5d21150b9b11596dedfef83fda4c353814 bolivian setup seems to work now... --- diff --git a/source/mircoders/entity/adapter/CommentAdapterDefinition.java b/source/mircoders/entity/adapter/CommentAdapterDefinition.java index e7eac3c9..c61301a8 100755 --- a/source/mircoders/entity/adapter/CommentAdapterDefinition.java +++ b/source/mircoders/entity/adapter/CommentAdapterDefinition.java @@ -18,6 +18,9 @@ public class CommentAdapterDefinition extends EntityAdapterDefinition { public CommentAdapterDefinition() { super(); + + addDBDateField("creationdate", "webdb_create"); + addDBDateField("changedate", "webdb_lastchange"); } } diff --git a/source/mircoders/entity/adapter/ContentAdapterDefinition.java b/source/mircoders/entity/adapter/ContentAdapterDefinition.java index 1d943984..ee299293 100755 --- a/source/mircoders/entity/adapter/ContentAdapterDefinition.java +++ b/source/mircoders/entity/adapter/ContentAdapterDefinition.java @@ -26,8 +26,8 @@ public class ContentAdapterDefinition extends EntityAdapterDefinition { public ContentAdapterDefinition() { super(); - addDBDateField("creationdate", "webdb_lastchange"); - addDBDateField("changedate", "webdb_create"); + addDBDateField("creationdate", "webdb_create"); + addDBDateField("changedate", "webdb_lastchange"); addMirDateField("date", "date"); addCalculatedField("to_topics", new ContentToTopicsField()); addCalculatedField("to_comments", new ContentToCommentsField()); diff --git a/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java index f08d21a5..9d99449c 100755 --- a/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java @@ -17,8 +17,9 @@ public class MirBasicProducerToolLocalizer implements MirProducerToolLocalizer { // ML: these config settings will be included more beautifully as soon as the new config system is in place Map configMap = new HashMap(); + Map utilityMap = new HashMap(); - configMap.put("producerDocRoot", "");//MirGlobal.getConfigProperty("Producer.DocRoot")); + configMap.put("producerDocRoot", MirGlobal.getConfigProperty("Producer.DocRoot")); configMap.put("storageRoot", MirGlobal.getConfigProperty("Producer.StorageRoot")); configMap.put("productionHost", MirGlobal.getConfigProperty("Producer.ProductionHost")); configMap.put("openAction", MirGlobal.getConfigProperty("Producer.OpenAction")); @@ -29,10 +30,12 @@ public class MirBasicProducerToolLocalizer implements MirProducerToolLocalizer { configMap.put("imageHost", MirGlobal.getConfigProperty("Producer.Image.Host")); configMap.put("imagePath", MirGlobal.getConfigProperty("Producer.Image.Path")); configMap.put("mirVersion", MirGlobal.getConfigProperty("Mir.Version")); - configMap.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() ); configMap.put("defEncoding", MirGlobal.getConfigProperty("Mir.DefaultEncoding")); + utilityMap.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() ); + aValueSet.put("config", configMap); + aValueSet.put("utility", utilityMap); EntityList topicList=null; EntityList entityList=null; diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index 98021e97..73decca8 100755 --- a/source/mircoders/servlet/ServletModuleOpenIndy.java +++ b/source/mircoders/servlet/ServletModuleOpenIndy.java @@ -203,12 +203,22 @@ public class ServletModuleOpenIndy extends ServletModule SimpleList popUpData = DatabaseLanguage.getInstance().getPopupData(); extraInfo.put("languagePopUpData", popUpData ); extraInfo.put("themenPopupData", themenModule.getTopicsAsSimpleList()); + +// ML: Bolivia specific, will move it towards localization + extraInfo.put("topics", themenModule.getTopicsList()); + String defaultCity = req.getParameter("city"); + if(defaultCity!=null && !defaultCity.equals("")){ + extraInfo.put("city", defaultCity); + } + } catch (Exception e) { theLog.printError("languagePopUpData or getTopicslist failed " +e.toString()); throw new ServletModuleException("OpenIndy -- failed getting language or topics: "+e.toString()); } + + deliver(req, res, mergeData, extraInfo, postingFormTemplate); } diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java index 3031c9d1..e9b391c2 100755 --- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java +++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java @@ -19,18 +19,15 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { contentNode = new EntityEnumeratingProducerNode( "content", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), new CompositeProducerNode( new ProducerNode[] { - new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c' and exists(select * from content_x_topic where content_id=${content.id} and topic_id=id", "", + new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c' and exists(select * from content_x_topic where content_id=${content.id} and topic_id=id)", "", new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new CompositeProducerNode( new ProducerNode[] { new GeneratingProducerNode( - "/producer/bolivia.indymedia.org/article.template", + "/producer/bolivia.indymedia.org/${city.filename}/article.template", "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml" ), - new FileDateSettingProducerNode( - "${config.storageRoot}/${language.code}/${content.date.formatted.yyyy}/${content.date.formatted.MM}/${content.id}.shtml", - "content.webdb_create.raw" - ) + new ContentMarkingProducerNode( "content" ) } ) ) ) @@ -40,10 +37,11 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { ); } catch (Throwable t) { + logger.printError("BoliviaProducerLocalizer.setupContentFactory: Exception "+t.getMessage()); } - contentNode.addVerb( "all", "is_published='1'", "" ); contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" ); + contentNode.addVerb( "all", "is_published='1'", "" ); aProducerNode.addSubNode( contentNode ); } @@ -59,7 +57,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityListProducerNode("startspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), "is_published='1' and to_article_type = ${articletype.startspecial}", "date desc, webdb_create desc", 1, 0, new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), - "is_published='1' and to_article_type = ${articletype.feature}", "date desc, webdb_create desc", 10, 0, + "is_published='1' and to_article_type = ${articletype.feature} and id in (select max(content_id) from content_x_topic, topic t where topic_id=t.id and t.archiv_url='c' group by t.id)", "date desc, webdb_create desc", 10, 0, new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(), "", "webdb_create desc", 5, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", @@ -93,7 +91,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new GeneratingProducerNode( - "/producer/bolivia.indymedia.org/startpage.template", + "/producer/bolivia.indymedia.org/${city.filename}/startpage.template", "${config.storageRoot}/${city.filename}/${language.code}/index.shtml" ) ) @@ -107,6 +105,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { ); } catch (Throwable t) { + logger.printError("BoliviaProducerLocalizer.setupStartPageFactory: Exception "+t.getMessage()); } } @@ -127,8 +126,24 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { ) ) ); + aProducerNode.addSubNode( + new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c'", "", + new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), + "", "code", 10, 0, + new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", + new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", + new GeneratingProducerNode( + "/producer/bolivia.indymedia.org/${city.filename}/navigation.template", + "${config.storageRoot}/${city.filename}/${language.code}/navigation.inc" + ) + ) + ) + ) + ) + ); } catch (Throwable t) { + logger.printError("BoliviaProducerLocalizer.setupStaticFactory: Exception "+t.getMessage()); } } @@ -145,7 +160,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "code", 10, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", - new ResourceBundleProducerNode("lang", "producer_${language.code}", + new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new GeneratingProducerNode( "/producer/bolivia.indymedia.org/topic.template", "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml" @@ -156,7 +171,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "code", 10, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", - new ResourceBundleProducerNode("lang", "producer_${language.code}", + new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new GeneratingProducerNode( "/producer/bolivia.indymedia.org/topicnavigation.template", "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}navigation.inc" @@ -165,11 +180,11 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { ) ) ); - topicPageNode.addVerb("all", -1); topicPageNode.addVerb("new", 3); + topicPageNode.addVerb("all", -1); aProducerNode.addSubNode( - new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "", + new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "((main_url is null) or main_url<>'c')", "", new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), "is_published='1' and to_article_type = ${articletype.topicspecial} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 1, 0, topicPageNode @@ -186,10 +201,10 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "code", 10, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", - new ResourceBundleProducerNode("lang", "producer_${language.code}", + new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new GeneratingProducerNode( - "/producer/bolivia.indymedia.org/topic.template", - "${config.storageRoot}/${language.code}/${city.filename}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml" + "/producer/bolivia.indymedia.org/${city.filename}/topic.template", + "${config.storageRoot}/${city.filename}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml" ) ) ) @@ -197,24 +212,24 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "code", 10, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "", - new ResourceBundleProducerNode("lang", "producer_${language.code}", + new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", new GeneratingProducerNode( - "/producer/bolivia.indymedia.org/topicnavigation.template", - "${config.storageRoot}/${language.code}/${city.filename}/${topic.filename}/${topic.filename}navigation.inc" + "/producer/bolivia.indymedia.org/${city.filename}/topicnavigation.template", + "${config.storageRoot}/${city.filename}/${language.code}/${topic.filename}/${topic.filename}navigation.inc" ) ) ) ) ); - topicPageNode.addVerb("all", -1); topicPageNode.addVerb("new", 3); + topicPageNode.addVerb("all", -1); aProducerNode.addSubNode( new EntityEnumeratingProducerNode( "city", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "main_url='c'", "", new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "((main_url is null) or main_url<>'c')", "", new EntityListProducerNode("topicspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), "is_published='1' and to_article_type = ${articletype.topicspecial} and "+ - "id in (select content_id from content_x_topic where topic_id = ${topic.id}) and"+ + "id in (select content_id from content_x_topic where topic_id = ${topic.id}) and "+ "id in (select content_id from content_x_topic where topic_id = ${city.id})", "date, webdb_create", 1, 0, topicPageNode ) @@ -223,6 +238,7 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { ); } catch (Throwable t) { + logger.printError("BoliviaProducerLocalizer.setupTopicsFactory: Exception "+t.getMessage()); } } diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java index 569825b3..554e3dfe 100755 --- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java +++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerToolLocalizer.java @@ -23,7 +23,7 @@ public class BoliviaProducerToolLocalizer extends MirBasicProducerToolLocalizer try { ModuleTopics topicsModule = new ModuleTopics(DatabaseTopics.getInstance()); - cityList = topicsModule.getByWhereClause("main_url<>'c'", "title", -1); + cityList = topicsModule.getByWhereClause("main_url='c'", "title", -1); topicList = topicsModule.getByWhereClause("main_url<>'c'", "title", -1); } catch (Throwable t) { @@ -31,6 +31,6 @@ public class BoliviaProducerToolLocalizer extends MirBasicProducerToolLocalizer } aValueSet.put("topics", topicList); - aValueSet.put("cities", topicList); + aValueSet.put("cities", cityList); } } diff --git a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java index 7bf726ab..c5380560 100755 --- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java +++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java @@ -114,7 +114,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer { try { topicPageNode = new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(), - "is_published='1' and to_article_type = ${articletype.newswire} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 6, 5, 0, + "is_published='1' and to_article_type = ${articletype.newswire} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date asc, webdb_create asc", 20, 5, 0, new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "code", 10, 0, new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",