From e20e35c4fd3f935d2f749d26222f6514f5f18fe8 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 9 Sep 2010 13:33:20 +0000
Subject: [PATCH] accept empty 'lastUpdated', set storageParameters on update

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3988 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 integrator/collection.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/integrator/collection.py b/integrator/collection.py
index 3d608d3..054751f 100644
--- a/integrator/collection.py
+++ b/integrator/collection.py
@@ -95,10 +95,13 @@ class ExternalCollectionAdapter(AdapterBase):
                 # may be it would be better to return a file's hash
                 # for checking for changes...
                 oldFound.append(addr)
-                if mdate and mdate > self.lastUpdated:
+                if self.lastUpdated is None or (mdate and mdate > self.lastUpdated):
                     obj = old[addr]
-                    # regenerate scale variant for media asset
-                    adapted(obj).externalAddress = addr
+                    # update settings and regenerate scale variant for media asset
+                    adobj = adapted(obj)
+                    directory = provider.getDirectory(self)
+                    adobj.storageParams=dict(subdirectory=directory)
+                    adobj.externalAddress = addr
                     # force reindexing
                     notify(ObjectModifiedEvent(obj))
             else: