ProducerList. Some bugfixes were done too.
private String whereClause;\r
private String orderByClause;\r
private int batchSize;\r
- private int position=0;\r
-\r
+ private int toFetch;\r
private EntityList currentBatch;\r
\r
- public EntityBrowser(StorageObject aStorage,\r
- String aWhereClause, String anOrderByClause,\r
- int aBatchSize) throws StorageObjectException {\r
+ private int skip;\r
+ private int limit;\r
+\r
+ private int batchPosition;\r
+ private int positionInBatch;\r
+\r
+ public EntityBrowser(StorageObject aStorage, String aWhereClause, String anOrderByClause,\r
+ int aBatchSize, int aLimit, int aSkip) throws StorageObjectException {\r
\r
storage=aStorage;\r
whereClause=aWhereClause;\r
orderByClause=anOrderByClause;\r
batchSize=aBatchSize;\r
+ skip=aSkip;\r
+ limit=aLimit;\r
\r
rewind();\r
}\r
\r
+ public EntityBrowser(StorageObject aStorage,\r
+ String aWhereClause, String anOrderByClause,\r
+ int aBatchSize) throws StorageObjectException {\r
+ this(aStorage, aWhereClause, anOrderByClause, aBatchSize, -1, 0);\r
+ }\r
+\r
+ public void readCurrentBatch(int aSkip) throws StorageObjectException {\r
+ currentBatch = storage.selectByWhereClause(whereClause, orderByClause, aSkip, batchSize);\r
+ batchPosition = aSkip;\r
+ positionInBatch = 0;\r
+ }\r
+\r
public void rewind() {\r
try {\r
- currentBatch = storage.selectByWhereClause(whereClause, orderByClause, 0, batchSize);\r
- position=0;\r
+ readCurrentBatch(skip);\r
}\r
catch (Throwable t) {\r
throw new RuntimeException(t.getMessage());\r
}\r
}\r
\r
- private void readNextBatch() throws StorageObjectException {\r
- if (currentBatch.hasNextBatch()) {\r
- currentBatch = storage.selectByWhereClause(whereClause, orderByClause,\r
- currentBatch.getNextBatch(), batchSize);\r
- position=0;\r
- }\r
- }\r
-\r
public boolean hasNext() {\r
try {\r
- if (position>=currentBatch.size() && currentBatch.hasNextBatch()) {\r
- readNextBatch();\r
+ if (limit>-1 && batchPosition+positionInBatch>=skip+limit)\r
+ return false;\r
+\r
+ if (positionInBatch>=currentBatch.size() && currentBatch.hasNextBatch()) {\r
+ readCurrentBatch(batchPosition+positionInBatch);\r
}\r
\r
- return (position<currentBatch.size());\r
+ return (positionInBatch<currentBatch.size());\r
}\r
catch (Throwable t) {\r
throw new RuntimeException(t.getMessage());\r
public Object next() {\r
try {\r
if (hasNext()) {\r
- Entity result = currentBatch.elementAt(position);\r
- position=position+1;\r
+ Entity result = currentBatch.elementAt(positionInBatch);\r
+ positionInBatch=positionInBatch+1;\r
\r
return result;\r
}\r
}
public boolean containsKey(Object aKey) {
- if (aKey instanceof String)
- return entity.hasValueForField((String) aKey)
- || definition.hasCalculatedField((String) aKey);
- else
- return false;
+ try {
+ if (aKey instanceof String)
+ return entity.hasValueForField((String) aKey)
+ || definition.hasCalculatedField((String) aKey)
+ || entity.getFields().contains(aKey);
+ }
+ catch (Throwable t) {
+ }
+
+ return false;
}
public boolean equals(Object anObject) {
calculatedFields.put(aFieldName, aField);
}
- public void addDateField(String aDestinationFieldName, String aSourceFieldName) {
- addCalculatedField(aDestinationFieldName, new DateField(aSourceFieldName));
+ public void addMirDateField(String aDestinationFieldName, String aSourceFieldName) {
+ addCalculatedField(aDestinationFieldName, new MirDateField(aSourceFieldName));
+ }
+
+ public void addDBDateField(String aDestinationFieldName, String aSourceFieldName) {
+ addCalculatedField(aDestinationFieldName, new DBDateField(aSourceFieldName));
}
public interface CalculatedField {
public Object getValue(EntityAdapter anEntityAdapter);
}
- private class DateField implements CalculatedField {
+ private class MirDateField implements CalculatedField {
private String fieldName;
- public DateField(String aFieldName) {
+ public MirDateField(String aFieldName) {
fieldName = aFieldName;
}
month = Integer.parseInt(textValue.substring(4,6));
day = Integer.parseInt(textValue.substring(6,8));
- calendar.set(year, month, day);
+ calendar.set(year, month-1, day);
date = calendar.getTime();
;
result.put("date", date);
result.put("formatted", new DateToMapAdapter(date));
-/* result.put("year", textValue.substring(0,4));
- result.put("month", textValue.substring(4,6));
- result.put("day", textValue.substring(6,8));
-*/ }
+ }
+ catch (Throwable t) {
+ result=null;
+ }
+ }
+
+ return result;
+
+ }
+
+ }
+
+ private class DBDateField implements CalculatedField {
+ private String fieldName;
+
+ public DBDateField(String aFieldName) {
+ fieldName = aFieldName;
+ }
+
+ public Object getValue(EntityAdapter anEntityAdapter) {
+
+ Map result = new HashMap();
+ String textValue = anEntityAdapter.getEntity().getValue(fieldName);
+ Calendar calendar = GregorianCalendar.getInstance();
+ int year;
+ int month;
+ int day;
+ int hours;
+ int minutes;
+
+ Date date;
+
+ if (textValue!=null) {
+ try {
+ year = Integer.parseInt(textValue.substring(0,4));
+ month = Integer.parseInt(textValue.substring(5,7));
+ day = Integer.parseInt(textValue.substring(8,10));
+ hours = Integer.parseInt(textValue.substring(11,13));
+ minutes = Integer.parseInt(textValue.substring(14,16));
+
+ calendar.set(year, month-1, day, hours, minutes);
+ date = calendar.getTime();
+
+ result.put("date", date);
+ result.put("formatted", new DateToMapAdapter(date));
+ result.put("raw", textValue);
+ }
catch (Throwable t) {
result=null;
-/* result.put("date", null);
- result.put("year", null);
- result.put("month", null);
- result.put("day", null);
-*/ }
+ }
}
return result;
this(new EntityBrowser(aStorage, aWhereClause, anOrderByClause, aBatchSize), aDefinition);
}
+ public EntityIteratorAdapter(StorageObject aStorage, String aWhereClause, String anOrderByClause, int aBatchSize, EntityAdapterDefinition aDefinition, int aLimit, int aSkip) throws StorageObjectException {
+ this(new EntityBrowser(aStorage, aWhereClause, anOrderByClause, aBatchSize, aLimit, aSkip), aDefinition);
+ }
+
public boolean hasNext() {
return iterator.hasNext();
}
return makeMapAdapter((Map) anObject);
else if (anObject instanceof Iterator)
return makeIteratorAdapter((Iterator) anObject);
+ else if (anObject instanceof List)
+ return makeIteratorAdapter(((List) anObject).iterator());
else
throw new TemplateModelException("Unadaptable class: " + anObject.getClass().getName());
}
if (!valuesCache.containsKey(aKey)) {
Object value = map.get(aKey);
- if (value == null)
- throw new TemplateModelException("MapAdapter: no key "+aKey+" available");
+// ML: this unfortunately doesn't work, because the entity doesn't seem to store
+// fields with null values
+// if (value == null && !map.containsKey(aKey))
+// throw new TemplateModelException("MapAdapter: no key "+aKey+" available");
valuesCache.put(aKey, makeAdapter(value));
}
-/*package mir.producer;
+package mir.producer;
import java.util.*;
import java.io.*;
// abstract public int getSize(String where) throws SQLException,StorageObjectException;
-
public class EntityBatchingProducerNode implements ProducerNode {
private Map verbs;
- private EntityBatchingProducerNodeVerb defaultVerb;
- private String key;
+ private String batchInfoKey;
+ private String batchDataKey;
private StorageObject storage;
private EntityAdapterDefinition definition;
private String whereClause;
private String orderByClause;
- private int nrArticlesPerBatch;
- private int minNrArticlesInFirstBatch;
+ private int nrEntitiesToSkip;
+ private int nrEntitiesPerBatch;
+ private int minNrEntitiesInFirstBatch;
private ProducerNode batchSubNode;
private ProducerNode batchListSubNode;
public EntityBatchingProducerNode(
- String aKey,
+ String aBatchDataKey,
+ String aBatchInfoKey,
+ StorageObject aStorage,
+ EntityAdapterDefinition aDefinition,
+ String aWhereClause,
+ String anOrderByClause,
+ int aNrEntitiesPerBatch,
+ int aMinNrEntitiesInFirstBatch,
+ int aNrEntitiesToSkip,
+ ProducerNode aBatchSubNode) {
+ this(aBatchDataKey, aBatchInfoKey, aStorage, aDefinition, aWhereClause,
+ anOrderByClause, aNrEntitiesPerBatch, aMinNrEntitiesInFirstBatch, aNrEntitiesToSkip,
+ aBatchSubNode, null);
+ }
+
+
+ public EntityBatchingProducerNode(
+ String aBatchDataKey,
+ String aBatchInfoKey,
StorageObject aStorage,
EntityAdapterDefinition aDefinition,
String aWhereClause,
String anOrderByClause,
- int aNrArticlesPerBatch,
- int aMinNrArticlesInFirstBatch,
+ int aNrEntitiesPerBatch,
+ int aMinNrEntitiesInFirstBatch,
+ int aNrEntitiesToSkip,
ProducerNode aBatchSubNode,
ProducerNode aBatchListSubNode) {
batchSubNode = aBatchSubNode;
batchListSubNode = aBatchListSubNode;
- defaultVerb = null;
verbs = new HashMap();
- key = aKey;
+ batchDataKey = aBatchDataKey;
+ batchInfoKey = aBatchInfoKey;
storage = aStorage;
definition = aDefinition;
whereClause = aWhereClause;
orderByClause = anOrderByClause;
- nrArticlesPerBatch = aNrArticlesPerBatch;
- minNrArticlesInFirstBatch = aMinNrArticlesInFirstBatch;
+ nrEntitiesToSkip = aNrEntitiesToSkip;
+ nrEntitiesPerBatch = aNrEntitiesPerBatch;
+ minNrEntitiesInFirstBatch = aMinNrEntitiesInFirstBatch;
}
public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
- EntityBatchingProducerNodeVerb verb = (EntityBatchingProducerNodeVerb) verbs.get(aVerb);
Iterator browser;
+ int nrEntities;
+ int nrBatchesAfterFirst;
+ int nrEntitiesInFirstBatch;
+ int nrBatchesToProcess;
+ List batchesData;
+ int i;
+ int position;
+ Map batchData;
+ String expandedWhereClause;
+ String expandedOrderByClause;
+ EntityBatchingProducerNodeVerb verb = (EntityBatchingProducerNodeVerb) verbs.get(aVerb);
+
+ List batchLocations;
+ BatchLocation location;
+
+// ML: The order by clause should lead to a result set in _reverse order_: the first row will be
+// the last entity presented on the last page
- if (verb==null)
- verb = defaultVerb;
if (verb==null)
throw new ProducerFailure("EntityBatchingProducerNode: unknown verb '"+aVerb+"'", null);
try {
- browser = new EntityIteratorAdapter(
- storage,
- ParameterExpander.expandExpression( aValueMap, verb.whereClause ),
- ParameterExpander.expandExpression( aValueMap, verb.orderByClause ),
- -1,
- definition );
-
- while (browser.hasNext()) {
- aLogger.println( verb.whereClause + ": next... ");
- aValueMap.put(key, browser.next());
- super.produce(aValueMap, aVerb, aLogger);
+ expandedWhereClause = ParameterExpander.expandExpression( aValueMap, whereClause );
+ expandedOrderByClause = ParameterExpander.expandExpression( aValueMap, orderByClause );
+
+ batchesData = new Vector();
+ batchLocations = new Vector();
+
+ nrEntities = storage.getSize(expandedWhereClause)-nrEntitiesToSkip;
+ nrEntitiesInFirstBatch = nrEntities % nrEntitiesPerBatch;
+ while (nrEntitiesInFirstBatch<minNrEntitiesInFirstBatch && nrEntities-nrEntitiesInFirstBatch>=nrEntitiesPerBatch)
+ nrEntitiesInFirstBatch = nrEntitiesInFirstBatch + nrEntitiesPerBatch;
+ nrBatchesAfterFirst = (nrEntities-nrEntitiesInFirstBatch)/nrEntitiesPerBatch;
+
+ batchLocations.add(new BatchLocation(nrBatchesAfterFirst*nrEntitiesPerBatch, nrEntitiesInFirstBatch));
+ batchData = new HashMap();
+ batchData.put("identifier", "");
+ batchData.put("index", Integer.toString(1));
+ batchData.put("size", Integer.toString(nrEntitiesInFirstBatch));
+ batchesData.add(batchData);
+
+ for (i=0; i<nrBatchesAfterFirst; i++) {
+ 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("size", Integer.toString(nrEntitiesPerBatch));
+ batchesData.add(1, batchData);
+ }
+
+ batchData = new HashMap();
+ aValueMap.put(batchInfoKey, batchData);
+ batchData.put("all", batchesData);
+ batchData.put("first", batchesData.get(0));
+ batchData.put("last", batchesData.get(batchesData.size()-1));
+
+ if (batchListSubNode!=null) {
+ batchListSubNode.produce(aValueMap, aVerb, aLogger);
+ }
+
+ nrBatchesToProcess = nrBatchesAfterFirst+1;
+ if (verb.nrBatchesToProcess>-1 && verb.nrBatchesToProcess<nrBatchesToProcess) {
+ nrBatchesToProcess=verb.nrBatchesToProcess;
+ }
+
+ if (batchSubNode!=null) {
+ for (i=0; i<nrBatchesToProcess; i++) {
+ location = (BatchLocation) batchLocations.get(i);
+
+ batchData.put("current", batchesData.get(i));
+ if (i>0)
+ batchData.put("previous", batchesData.get(i-1));
+ else
+ batchData.put("previous", null);
+
+ if (i<batchesData.size()-1)
+ batchData.put("next", batchesData.get(i+1));
+ else
+ batchData.put("next", null);
+
+ Iterator j = new EntityIteratorAdapter(storage, expandedWhereClause, expandedOrderByClause,
+ location.nrEntities, definition, location.nrEntities, location.firstEntity);
+ List entities = new Vector();
+
+ while (j.hasNext())
+ entities.add(0, j.next());
+
+ aValueMap.put( batchDataKey, entities );
+
+ batchSubNode.produce(aValueMap, aVerb, aLogger);
+ }
}
}
catch (Throwable t) {
}
};
- public Set buildVerbSet() {
- Set set;
+ private class BatchLocation {
+ int nrEntities;
+ int firstEntity;
- set = super.buildVerbSet();
- set.addAll(verbs.keySet());
+ public BatchLocation(int aFirstEntity, int aNrEntities) {
+ firstEntity = aFirstEntity;
+ nrEntities = aNrEntities;
+ }
+ }
- return set;
+ public Set buildVerbSet() {
+ return verbs.keySet();
};
- public void addVerb(String aVerb, String aWhereClause, String anOrderByClause) {
- verbs.put(aVerb, new EntityBatchingProducerNodeVerb(aWhereClause, anOrderByClause));
+ public void addVerb(String aVerb, int aNrPagesToGenerate) {
+ verbs.put(aVerb, new EntityBatchingProducerNodeVerb(aNrPagesToGenerate));
}
-
-// int nrPagesToGenerate
-//
-
private class EntityBatchingProducerNodeVerb {
- int nrPagesToGenerate;
+ int nrBatchesToProcess;
- EntityBatchingProducerNodeVerb(String aWhereClause, String anOrderByClause) {
- whereClause = aWhereClause;
- orderByClause = anOrderByClause;
+ EntityBatchingProducerNodeVerb(int aNrBatchesToProcess) {
+ nrBatchesToProcess = aNrBatchesToProcess;
}
}
}
-*/
\ No newline at end of file
definition );
while (browser.hasNext()) {
- aLogger.println( verb.whereClause + ": next... ");
aValueMap.put(key, browser.next());
super.produce(aValueMap, aVerb, aLogger);
}
private int batchSize;
private EntityAdapterDefinition definition;
private StorageObject storage;
+ private int limit;
+ private int skip;
public EntityListProducerNode(String aKey, StorageObject aStorage,
EntityAdapterDefinition aDefinition, String aWhereClause, String anOrderByClause,
- int aBatchSize, ProducerNode aSubNode) {
+ int aLimit, int aSkip, ProducerNode aSubNode) {
super(aSubNode);
storage = aStorage;
key = aKey;
whereClause = aWhereClause;
orderByClause = anOrderByClause;
- batchSize = aBatchSize;
+ limit = aLimit;
+ skip = aSkip;
}
public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
storage,
ParameterExpander.expandExpression( aValueMap, whereClause ),
ParameterExpander.expandExpression( aValueMap, orderByClause ),
- batchSize,
- definition )
+ 20,
+ definition,
+ limit,
+ skip )
);
super.produce(aValueMap, aVerb, aLogger);
}
public ContentAdapterDefinition() {
super();
- addDateField("date", "date");
+ addDBDateField("creationdate", "webdb_lastchange");
+ addDBDateField("changedate", "webdb_create");
+ addMirDateField("date", "date");
addCalculatedField("to_topics", new ContentToTopicsField());
addCalculatedField("to_comments", new ContentToCommentsField());
try {
return result;
}
}
-
-
-/*
- // @todo this needs to optimized. expensive SQL
- private SimpleHash getUploadedMediaForNewswire()
- throws StorageObjectException, TemplateModelException
- {
- // fetching/setting the images
- // return to_media_icons
- String tinyIcon = null, iconAlt = null;
- MirMedia mediaHandler = null;
- EntityUploadedMedia uploadedMedia;
- Entity mediaType;
- SimpleHash returnHash = new SimpleHash();
-
- EntityList upMediaEntityList =
- DatabaseContentToMedia.getInstance().getUploadedMedia(this);
- if (upMediaEntityList!=null && upMediaEntityList.getCount()>=1) {
-
- for (int n=0; n < upMediaEntityList.size();n++) {
- uploadedMedia = (EntityUploadedMedia)upMediaEntityList.elementAt(n);
- mediaType = uploadedMedia.getMediaType();
- try {
- mediaHandler = MediaHelper.getHandler( mediaType );
- } catch (MirMediaException ex) {
- throw new TemplateModelException(ex.toString());
- }
- //the "best" media type to show
- if (mediaHandler.isVideo()) {
- tinyIcon = MirConfig.getProp("Producer.Icon.TinyVideo");
- iconAlt = "Video";
- break;
- } else if (mediaHandler.isAudio()) {
- tinyIcon = MirConfig.getProp("Producer.Icon.TinyAudio");
- iconAlt = "Audio";
- } else if (tinyIcon == null && !mediaHandler.isImage()) {
- tinyIcon = mediaHandler.getTinyIcon();
- iconAlt = mediaHandler.getIconAlt();
- }
-
- }
- //it only has image(s)
- if (tinyIcon == null) {
- tinyIcon = MirConfig.getProp("Producer.Icon.TinyImage");
- iconAlt = "Image";
- }
- // uploadedMedia Entity list is empty.
- // we only have text
- } else {
- tinyIcon = MirConfig.getProp("Producer.Icon.TinyText");
- iconAlt = "Text";
- }
- returnHash.put("tiny_icon", mirconf_imageRoot+"/"+tinyIcon);
- returnHash.put("icon_alt", iconAlt);
- return returnHash;
- }
-*/
-
-
}
-// String mirconf_extLinkName = MirConfig.getProp("Producer.ExtLinkName");
-// String mirconf_intLinkName = MirConfig.getProp("Producer.IntLinkName");
-// String mirconf_mailLinkName = MirConfig.getProp("Producer.MailLinkName");
-// String mirconf_imageRoot = MirConfig.getProp("Producer.ImageRoot");
-
-
-// if (field.equals("date_formatted"))
-// {
-// if (hasValueForField("date"))
-// returnField = StringUtil.webdbDate2readableDate(getValue("date"));
-// }
-// else if (field.equals("description_parsed"))
-// returnField = getDescriptionParsed();
-// else if (field.equals("description_sentence"))
-// returnField = getDescriptionSentence();
-// else if (field.equals("content_data_parsed"))
-// returnField = getContentDataParsed();
-
-/*
- else if (key.equals("to_media_icon")) {
- try {
- _entCache.put(key, getUploadedMediaForNewswire());
- return (TemplateModel)_entCache.get(key);
- }
- catch (Exception ex) {
- theLog.printWarning("-- getUploadedMediaForNewswire: could not fetch data " + ex.toString());
- throw new TemplateModelException(ex.toString());
- }
- }
-*/
-
-/*
- private boolean hasMedia() throws StorageObjectException
- {
- if (_hasMedia == null) {
- _hasMedia =
- new Boolean(DatabaseContentToMedia.getInstance().hasMedia(this));
- }
- return _hasMedia.booleanValue();
- }
-
- //######## @todo all of the following getBlahForContent should have
- // and optimized version where LIMIT=1 sql for list view.
- private EntityList getImagesForContent()
- throws StorageObjectException, TemplateModelException
- {
- if (hasMedia())
- return DatabaseContentToMedia.getInstance().getImages(this);
- else
- return null;
- }
-
- private EntityList getAudioForContent()
- throws StorageObjectException, TemplateModelException
- {
- if (hasMedia())
- return DatabaseContentToMedia.getInstance().getAudio(this) ;
- else
- return null;
- }
-
- private EntityList getVideoForContent()
- throws StorageObjectException, TemplateModelException
- {
- if (hasMedia())
- return DatabaseContentToMedia.getInstance().getVideo(this) ;
- else
- return null;
- }
-
- private EntityList getOtherMediaForContent()
- throws StorageObjectException, TemplateModelException
- {
- if (hasMedia())
- return DatabaseContentToMedia.getInstance().getOther(this);
- else
- return null;
- }
-
-}
-*/
\ No newline at end of file
return getStatus() == STATUS_PROCESSED;
}
+ public boolean isPending() {
+ return getStatus() == STATUS_PENDING;
+ }
+
private boolean setStatus(int anOldStatus, int aNewStatus) {
synchronized(this) {
if (status == anOldStatus) {
}
public void addJob(String aProducerFactory, String aVerb) {
+// ML: TODO: should check if a similar job is already pending
producerJobQueue.appendJob(new ProducerJob(aProducerFactory, aVerb));
log.println(aProducerFactory+"."+aVerb+" added to queue");
log.flush();
public void afterContentPosting() {
MirGlobal.producerEngine().addJob("content", "new");
MirGlobal.producerEngine().addJob("openposting", "new");
- MirGlobal.producerEngine().addJob("startpage", "all");
+ MirGlobal.producerEngine().addJob("startpage", "(default)");
MirGlobal.producerEngine().addJob("synchronization", "run");
}
aValueSet.put("topics", topicList);
aValueSet.put("imclist", entityList);
aValueSet.put("parentlist", parentList);
+
+ Map articleTypeMap = new HashMap();
+ articleTypeMap.put("openposting", "0");
+ articleTypeMap.put("newswire", "1");
+ articleTypeMap.put("feature", "2");
+ articleTypeMap.put("topicspecial", "3");
+ articleTypeMap.put("startspecial", "4");
+ aValueSet.put("articletype", articleTypeMap);
};
public PrintWriter openWriter(String anIdentifier) throws MirLocalizerFailure {
--- /dev/null
+package mircoders.producer;
+
+import java.util.*;
+import java.io.*;
+import mir.util.*;
+import mir.producer.*;
+import mir.entity.*;
+import mir.entity.adapter.*;
+import mircoders.entity.*;
+
+
+public class ContentMarkingProducerNode implements ProducerNode {
+ private String contentKey;
+
+ public ContentMarkingProducerNode(String aContentKey) {
+ contentKey = aContentKey;
+ }
+
+ public void produce(Map aValueMap, String aVerb, PrintWriter aLogger) throws ProducerFailure {
+ Object data;
+ Entity entity;
+
+ try {
+ data = ParameterExpander.findValueForKey( aValueMap, contentKey );
+
+ if (! (data instanceof EntityAdapter)) {
+ throw new ProducerFailure("ContentMarkingProducerNode: value of '"+contentKey+"' is not an EntityAdapter, but an " + data.getClass().getName(), null);
+ }
+
+ entity = ((EntityAdapter) data).getEntity();
+ if (! (entity instanceof EntityContent)) {
+ throw new ProducerFailure("ContentMarkingProducerNode: value of '"+contentKey+"' is not a content EntityAdapter, but a " + entity.getClass().getName() + " adapter", null);
+ }
+
+ ((EntityContent) entity).setProduced(true);
+ }
+ catch (Throwable t) {
+ aLogger.println("Error while marking content: " + t.getMessage());
+ t.printStackTrace(aLogger);
+
+ throw new ProducerFailure(t.getMessage(), t);
+ }
+ }
+
+ public Set buildVerbSet() {
+ return new HashSet();
+ }
+}
\ No newline at end of file
}
protected void setupStartPageFactory(CompositeProducerFactory aStartPageFactory) {
- ProducerNode startPageNode = null;
+/* ProducerNode topicNode = null;
try {
- startPageNode =
- new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
- new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 10,
- new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
- "", "webdb_create desc", 5,
- new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
- new CompositeProducerNode( new ProducerNode[] {
- new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
- new ResourceBundleProducerNode("lang", "producer_${language.code}",
- new GeneratingProducerNode(
- "/producer/bolivia.indymedia.org/startpage.template",
- "${config.storageRoot}/${language.code}/index.shtml"
- )
- )
- )
- } )
+ topicNode =
+ new EntityBatchingProducerNode( "articles", "batch", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance()
+ "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 20, 10, 0,
+ new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+ "", "code", 10, 0,
+ new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+ new ResourceBundleProducerNode("lang", "producer_${language.code}",
+ new GeneratingProducerNode(
+ "/producer/bolivia.indymedia.org/startpage.template",
+ "${config.storageRoot}/${language.code}/index.shtml"
)
)
)
- );
+ )
+ );
+ topicNode.addVerb("all", -1);
+ topicNode.addVerb("new", 3);
}
catch (Throwable t) {
}
)
} )
)
- )
+ ),
+ new ContentMarkingProducerNode( "content")
} )
);
}
}
contentNode.addVerb( "all", "is_published='1'", "" );
- contentNode.addVerb( "all", "is_published='1' and is_produced='f'", "" );
+ contentNode.addVerb( "new", "is_published='1' and is_produced='f'", "" );
aContentFactory.addFactory( new NodedProducerFactory( contentNode ) );
try {
startPageNode =
new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40,
+ "is_published='1' and to_article_type = ${articletype.newswire}", "date desc, webdb_create desc", 40, 0,
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
new EntityListProducerNode("startspecial", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 4", "date desc, webdb_create desc", 1,
+ "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 = 2", "date desc, webdb_create desc", 10,
+ "is_published='1' and to_article_type = ${articletype.feature}", "date desc, webdb_create desc", 10, 0,
new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
- "", "webdb_create desc", 5,
+ "", "webdb_create desc", 5, 0,
new GeneratingProducerNode(
"/producer/euskalherria.indymedia.org/startpage.template",
"${config.storageRoot}/${language.code}/index.shtml"
try {
staticNode =
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
new GeneratingProducerNode(
}
protected void setupFactories(Map aFactoriesMap ) {
+ EntityBatchingProducerNode topicPageNode = null;
+
super.setupFactories(aFactoriesMap);
+
+ 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,
+ new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+ "", "code", 10, 0,
+ new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+ new ResourceBundleProducerNode("lang", "producer_${language.code}",
+ new GeneratingProducerNode(
+ "/producer/euskalherria.indymedia.org/topic.template",
+ "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}${batch.current.identifier}.shtml"
+ )
+ )
+ )
+ ),
+ new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
+ "", "code", 10, 0,
+ new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
+ new ResourceBundleProducerNode("lang", "producer_${language.code}",
+ new GeneratingProducerNode(
+ "/producer/euskalherria.indymedia.org/topicnavigation.template",
+ "${config.storageRoot}/${language.code}/${topic.filename}/${topic.filename}navigation.inc"
+ )
+ )
+ )
+ )
+ );
+ topicPageNode.addVerb("all", -1);
+ topicPageNode.addVerb("new", 3);
+
+ aFactoriesMap.put("topics",
+ new NodedProducerFactory(
+ new EntityEnumeratingProducerNode( "topic", DatabaseTopics.getInstance(), TopicsAdapterDefinition.getInstance(), "", "",
+ 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,
+ new EntityListProducerNode("topicfeatures", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
+ "is_published='1' and to_article_type = ${articletype.feature} and id in (select content_id from content_x_topic where topic_id = ${topic.id})", "date, webdb_create", 10, 0,
+ topicPageNode
+ )
+ )
+ )
+ )
+ );
+ }
+ catch (Throwable t) {
+ }
+
}
}
try {
startPageNode =
new EntityListProducerNode("newswire", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40,
+ "is_published='1' and to_article_type = 1", "date desc, webdb_create desc", 40, 0,
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new CompositeProducerNode( new ProducerNode[] {
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
)
),
new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
+ "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
- "", "webdb_create desc", 5,
+ "", "webdb_create desc", 5, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "code='nl'", "",
new AssignmentProducerNode( "staticinclude", "1",
new EvaluatedAssignmentProducerNode( "topinclude", "/producer/indymedia.nl/top.template",
try {
staticNode =
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
new CompositeProducerNode( new ProducerNode[] {
try {
node =
new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
+ "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
- "", "webdb_create desc", 5,
+ "", "webdb_create desc", 5, 0,
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
new GeneratingProducerNode(
try {
node =
new EntityListProducerNode("features", DatabaseContent.getInstance(), ContentAdapterDefinition.getInstance(),
- "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10,
+ "is_published='1' and to_article_type = 2", "date desc, webdb_create desc", 10, 0,
new EntityListProducerNode("breaking", DatabaseBreaking.getInstance(), BreakingAdapterDefinition.getInstance(),
- "", "webdb_create desc", 5,
+ "", "webdb_create desc", 5, 0,
new EntityListProducerNode("languages", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(),
- "", "code", 10,
+ "", "code", 10, 0,
new EntityEnumeratingProducerNode( "language", DatabaseLanguage.getInstance(), LanguageAdapterDefinition.getInstance(), "", "",
new ResourceBundleProducerNode("lang", "bundles.producer_${language.code}",
new GeneratingProducerNode(
projects / mir.git / commitdiff