Index: /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py	(revision 17762)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py	(revision 17763)
@@ -24,4 +24,5 @@
 import unicodecsv as csv  # XXX: csv ops should move to dedicated module.
 from time import time
+from ast import literal_eval
 from datetime import datetime
 from zope.i18n import translate
@@ -32,5 +33,5 @@
 from zope.catalog.interfaces import ICatalog
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowInfo
-from waeup.kofa.interfaces import (
+from waeup.kofa.interfaces import (IObjectHistory,
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
     IGNORE_MARKER)
@@ -63,5 +64,5 @@
 
     location_fields = ['document_id',]
-    additional_fields = ['class_name',]
+    additional_fields = ['class_name', 'state', 'history']
 
     factory_name = None
@@ -114,4 +115,23 @@
         items_changed = super(DocumentProcessorBase, self).updateEntry(
             obj, row, site, filename)
+        # Replace entire history
+        if 'history' in row:
+            new_history = row.get('history', IGNORE_MARKER)
+            if new_history not in (IGNORE_MARKER, ''):
+                history = IObjectHistory(obj)
+                history._annotations[
+                    history.history_key] = literal_eval(new_history)
+                items_changed += ('%s=%s, ' % ('history', new_history))
+            row.pop('history')
+        # Update state
+        if 'state' in row:
+            state = row.get('state', IGNORE_MARKER)
+            if state not in (IGNORE_MARKER, ''):
+                IWorkflowState(obj).setState(state)
+                msg = _("State '${a}' set", mapping = {'a':state})
+                history = IObjectHistory(obj)
+                history.addMessage(msg)
+                items_changed += ('%s=%s, ' % ('state', state))
+            row.pop('state')
         # Log actions...
         location_field = self.location_fields[0]
