--- ECHO_content/VLPExtension.py	2004/11/03 15:02:53	1.31
+++ ECHO_content/VLPExtension.py	2005/01/25 20:06:38	1.37
@@ -1,7 +1,7 @@
 """
 This module contains extensions which where originally made for the VLP.
 """
-
+from OFS.Cache import Cacheable
 from Products.ECHO_content.ECHO_collection import *
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
@@ -368,11 +368,13 @@ class VLP_collection(ECHO_collection):
             if fileName[0:3]=="lit":
                 
                 metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta"
-                newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')
-                self._setObject(fileName,newObj)
+		if not hasattr(self,fileName):
+			newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')
+			self._setObject(fileName,newObj)
                 
                 genObj=getattr(self,fileName)
                 genObj.createIndexFile()
+
                 
                 
         if RESPONSE is not None:
@@ -428,7 +430,7 @@ def manage_addVLP_collection(self,id,tit
 
 
 
-class VLP_resource(ECHO_resource):
+class VLP_resource(ECHO_resource,Cacheable):
     """VLP spezifische Erweiterung"""
 
     meta_type="VLP_resource"
@@ -438,14 +440,25 @@ class VLP_resource(ECHO_resource):
     
     referencetypes=[]
 
-    manage_options=ECHO_resource.manage_options+(
+    manage_options=ECHO_resource.manage_options+Cacheable.manage_options+(
         {'label':'Update Index','action':'createIndexFile'},
         {'label':'Reset MetaLink','action':'resetMetaLink'},
         {'label':'Generate Title','action':'generate_title'},
 	{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'},
         )
 
+
+    def getImagePath(self):
+	    """Pfad zu den Images"""
+	    if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')):
+		    return os.path.join(self.vlp_basis,self.resourceID,'pageimg')
+	    elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')):
+		    return os.path.join(self.vlp_basis,self.resourceID,'pagesHi')
+	    else:
+		    return "<error>no images </error>"
     
+
+	    
     def transcription(self):
 	    """show the rendered transcriptiofile"""
 	    
@@ -516,8 +529,14 @@ class VLP_resource(ECHO_resource):
         pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_template.zpt')).__of__(self)
         pt.content_type="text/html"
         return pt()
-    
-    index_html=show
+
+    def index_html(self):
+	    """index_html"""
+	    #return self.REQUEST
+	    if not self.REQUEST.has_key("ws"):
+		    self.REQUEST.form["ws"]="1.5"
+
+	    return self.show()
 
     def generateLibraryTemplateHTML(self,RESPONSE=None):
         """lege standard index.html an"""
@@ -641,10 +660,18 @@ class VLP_resource(ECHO_resource):
     
     def readIndexFile(self,url=None):
         """reads the indexfile. presently url not None isn't implemented. In the future url can be defined."""
-        pagelist=[]
-        if not url:
+	if not url:
             url=self.absolute_url()+"/index.xml"
 
+	if self.ZCacheable_isCachingEnabled():
+            
+            result = self.ZCacheable_get(view_name=url)
+            if result is not None:
+                # Got a cached value.
+                return result
+
+        pagelist=[]
+   
         fh=ECHO_helpers.urlopen(url)
         dom=xml.dom.minidom.parse(fh)
         
@@ -655,7 +682,8 @@ class VLP_resource(ECHO_resource):
 	    fileName=page.getAttribute('file')
             pagelist.append((pageNum,text,fileName))
 
-        return pagelist
+	self.ZCacheable_set(pagelist,view_name=url)
+        return pagelist 
 
     def getFileName(self):
 	   """getNameOfCurrentFile"""