--- ECHO_content/VLPExtension.py	2008/09/04 12:09:33	1.74
+++ ECHO_content/VLPExtension.py	2008/10/08 08:35:20	1.78
@@ -16,6 +16,7 @@ from stat import *
 from types import *
 from Globals import package_home
 import transaction
+import Acquisition
 
 from Products.ECHO_content.ECHO_collection import *
 from vlp_xmlhelpers import *
@@ -161,6 +162,10 @@ def manage_addSendMailForm(self, id, toA
     return ''
 
         
+class VLP_collectionFolder(Folder):
+    """klasse fŸr folder innheralb der collection"""
+    meta_type="VLP_collectionFolder"
+    
 class VLP_essay(Folder):
     """classe fr VLP essays"""
 
@@ -478,10 +483,69 @@ def manage_addVLP_subCollection(self,id,
         if RESPONSE is not None:
                 RESPONSE.redirect('manage_main')
 
+from zope.publisher.interfaces import IPublishTraverse
+from zope.interface import implements
+from zope.publisher.interfaces import NotFound 
+from zope.app import zapi 
+from zope.component import queryMultiAdapter
+from ZPublisher.BaseRequest import DefaultPublishTraverse
 
-class VLP_collection(ECHO_collection):
+class VLP_collection(ECHO_collection,Acquisition.Explicit):
     """VLP spezifische Erweiterung der Collection"""
 
+
+    
+    implements(IPublishTraverse)
+    def findObjFromLitName(self,fileName):
+        if not fileName[0:3]=="lit":
+            logging.error("getOrCreateFolder wrong filename: %s"%fileName)
+            return None
+        
+        
+        restName="%08d"%int(fileName[3:])
+        
+        fs=(restName[0:2],restName[0:4],restName[0:6])
+        
+        current =self
+        for f in fs:
+            obj = getattr(current,f,None)
+            if not obj: #subfolder existiert nicht
+                return None
+            current=obj
+            
+        return getattr(current,fileName,None)
+        
+    def publishTraverse(self,request,name):
+        """change the traversal if literature object"""
+        
+        actual_url=request['ACTUAL_URL']
+        lastActual=actual_url.split("/")[-1]
+        
+   
+        if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk
+            # umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird
+            if lastActual.startswith("lit") or (lastActual=="index_html"):
+                #obj=self. ZopeFind(self,obj_ids=[name],search_sub=1)
+                ob=self.findObjFromLitName(name)
+                if not ob:
+                    return "LIt not found"
+                else:
+          
+                    logging.error("request:"+repr(ob))
+                    request.response.setStatus(200)
+                    return ob
+            else: ## andern falls transversiere zum parent.
+                obj = self.aq_parent
+                return obj
+        else: # mache gar nichts falls nicht lit aufgerufen wird
+ 
+           
+            tr=DefaultPublishTraverse(self, request)
+            ob= tr.publishTraverse(request, name)
+       
+            return ob
+         #raise NotFound(self.context, name, request) 
+            #return repr(request)
     
     meta_type="VLP_collection"
     manage_options=ECHO_collection.manage_options+(
@@ -490,8 +554,6 @@ class VLP_collection(ECHO_collection):
         {'label':'Update Metadata','action':'updateCollectionMD'},
         )
 
-
-
     def generateSubCollections(self,errorsTXT="",forceUpdate=False,RESPONSE=None):
         """erzeuge subcollectionen"""
         logging.debug("generateSubCollections")
@@ -530,6 +592,7 @@ class VLP_collection(ECHO_collection):
 
                 if RESPONSE is not None:
                     self.REQUEST.RESPONSE.write("<p>%s</p>\n"%litid)
+		logging.debug("<p>%s</p>\n"%litid)
 
             except:
                 error=sys.exc_info()[0:2]
@@ -554,6 +617,29 @@ class VLP_collection(ECHO_collection):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
+    
+    def getOrCreateFolderForFile(self,fileName):
+        
+        if not fileName[0:3]=="lit":
+            logging.error("getOrCreateFolder wrong filename: %s"%fileName)
+            return None
+        
+        
+        restName="%08d"%int(fileName[3:])
+        
+        fs=(restName[0:2],restName[0:4],restName[0:6])
+        
+        current =self
+        for f in fs:
+            obj = getattr(current,f,None)
+            if not obj:
+                 newObj=VLP_collectionFolder(f)
+                 current._setObject(f,newObj)
+                 obj = getattr(current,f)
+            current=obj
+            
+        return current
+        
     def updateCollection(self,forceUpdate=False,RESPONSE=None):
         """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
         errorsTXT="<h2>Errors</h2>"
@@ -562,21 +648,45 @@ class VLP_collection(ECHO_collection):
             RESPONSE.write("<html><body>")
 
         files=os.listdir(self.vlp_basis)
+        i=0
         for fileName in files:
+            if i<100:
+                i+=1
+            else:
+                i=0
+                j=0
+                while j<5:
+                    try:
+                        transaction.get().commit()  
+                        j=6
+                    except:
+                        logging.error("Commit: %s"%j)
+                        j+=1
+                        
+                RESPONSE.write("<p>committed</p>")
             if fileName[0:3]=="lit":
                 metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta"
+                
+                folder=self.getOrCreateFolderForFile(fileName) #get the folder where fileName lives or should live
+                if not folder: #folder gave an error
+                    continue
                 try:
-                    if not hasattr(self,fileName):
+                    if not hasattr(folder,fileName):
                         # create new resource
                         logging.debug("updateCollection: new %s"%fileName)
                         if RESPONSE is not None:
                             RESPONSE.write("<p>new: %s</p>\n"%fileName)
+                        logging.debug("new: %s \n"%fileName)
                         newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')
-                        self._setObject(fileName,newObj)
+                        
+                        folder._setObject(fileName,newObj)
                 
                     if RESPONSE is not None:
                         RESPONSE.write("<p>got: %s "%fileName)
-                    genObj=getattr(self,fileName)
+
+                    genObj=getattr(folder,fileName)
+                    logging.debug("got: %s "%fileName)
+
                     logging.debug("updateCollection: inspecting %s"%fileName)
                     # create index
                     if hasattr(genObj,'createIndexFile'):