--- ECHO_content/VLPExtension.py 2005/10/11 20:10:34 1.49 +++ ECHO_content/VLPExtension.py 2005/10/26 11:18:19 1.52 @@ -230,6 +230,7 @@ class VLP_essay(Folder): pages.sort(sortFind) #print str(pages[int(pagenum)][1]()) + if pages[int(pagenum)-1][1].meta_type=='File': #return makeXML(str(pages[int(pagenum)-1][1])) @@ -810,19 +811,24 @@ class VLP_resource(ECHO_resource,Cacheab def readIndexFile(self,url=None): """reads the indexfile. presently url not None isn't implemented. In the future url can be defined.""" if not url: - url=self.absolute_url()+"/index.xml" + urlTmp=self.absolute_url()+"/index.xml" if self.ZCacheable_isCachingEnabled(): - - result = self.ZCacheable_get(view_name=url) + + result = self.ZCacheable_get(view_name=urlTmp) if result is not None: # Got a cached value. return result pagelist=[] - - fh=ECHO_helpers.urlopen(url) - dom=xml.dom.minidom.parse(fh) + + if not url: + + xmlTxt=getattr(self,'index.xml')() + dom=xml.dom.minidom.parseString(xmlTxt) + else: + fh=ECHO_helpers.urlopen(urlTmp) + dom=xml.dom.minidom.parse(fh) for page in dom.getElementsByTagName('page'): @@ -831,7 +837,7 @@ class VLP_resource(ECHO_resource,Cacheab fileName=page.getAttribute('file') pagelist.append((pageNum,text,fileName)) - self.ZCacheable_set(pagelist,view_name=url) + self.ZCacheable_set(pagelist,view_name=urlTmp) return pagelist def getFileName(self):