From c30c2dc558525ad8cf675443447cf7f711cd566b Mon Sep 17 00:00:00 2001 From: zapata Date: Tue, 11 Jun 2002 00:42:05 +0000 Subject: [PATCH] reversed the page numbers for batching producer nodes --- .../mir/producer/EntityBatchingProducerNode.java | 4 +-- .../BoliviaProducerLocalizer.java | 38 ---------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/source/mir/producer/EntityBatchingProducerNode.java b/source/mir/producer/EntityBatchingProducerNode.java index e0d74c64..a57a7512 100755 --- a/source/mir/producer/EntityBatchingProducerNode.java +++ b/source/mir/producer/EntityBatchingProducerNode.java @@ -108,7 +108,7 @@ public class EntityBatchingProducerNode implements ProducerNode { batchLocations.add(new BatchLocation(nrBatchesAfterFirst*nrEntitiesPerBatch, nrEntitiesInFirstBatch)); batchData = new HashMap(); batchData.put("identifier", ""); - batchData.put("index", Integer.toString(1)); + batchData.put("index", Integer.toString(nrBatchesAfterFirst+1)); batchData.put("size", Integer.toString(nrEntitiesInFirstBatch)); batchesData.add(batchData); @@ -116,7 +116,7 @@ public class EntityBatchingProducerNode implements ProducerNode { batchLocations.add(1, new BatchLocation(i*nrEntitiesPerBatch, nrEntitiesPerBatch)); batchData = new HashMap(); batchData.put("identifier", Integer.toString(i)); - batchData.put("index", Integer.toString(nrBatchesAfterFirst-i+1)); + batchData.put("index", Integer.toString(i+1)); batchData.put("size", Integer.toString(nrEntitiesPerBatch)); batchesData.add(1, batchData); } diff --git a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java index 2d03d2e4..7e478ec7 100755 --- a/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java +++ b/source/mirlocal/bolivia.indymedia.org/BoliviaProducerLocalizer.java @@ -244,43 +244,5 @@ public class BoliviaProducerLocalizer extends MirBasicProducerLocalizer { protected void setupFactories(Map aFactoriesMap ) { super.setupFactories(aFactoriesMap); - try { - - ProducerNode node = null; - EntityBatchingProducerNode batchingNode = - new EntityBatchingProducerNode( "comments", "batch", DatabaseComment.getInstance(), CommentAdapterDefinition.getInstance(), - "", "id desc", 25, 15, 0, - new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), - "", "code", 10, 0, - new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "", - new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", - new GeneratingProducerNode( - "/producer/indymedia.nl/commentsindex.template", - "${config.storageRoot}/${language.code}/comments/comments${batch.current.identifier}.shtml" - ) - ) - ) - ), - new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), - "", "code", 10, 0, - new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "", - new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}", - new GeneratingProducerNode( - "/producer/indymedia.nl/commentsindexnavigation.template", - "${config.storageRoot}/${language.code}/comments/commentsnavigation.inc" - ) - ) - ) - ) - ); - batchingNode.addVerb("new", 3); - batchingNode.addVerb("all", -1); - - aFactoriesMap.put("commentsindex", new NodedProducerFactory( batchingNode )); - } - catch (Throwable t) { - logger.printError("BoliviaProducerLocalizer.setupFactories: Exception "+t.getMessage()); - } - } } -- 2.11.0