--- ECHO_content/VLPExtension.py 2004/08/17 15:22:14 1.20 +++ ECHO_content/VLPExtension.py 2004/08/18 15:59:04 1.22 @@ -386,7 +386,7 @@ class VLP_resource(ECHO_resource): def file2page(self,p): """converts filename to pagenumber""" - dom=xml.dom.minidom.parse(urllib.urlopen(getattr(self,'index.xml').absolute_url())) + dom=xml.dom.minidom.parse(ECHO_helpers.urlopen(getattr(self,'index.xml').absolute_url())) for page in dom.getElementsByTagName('page'): if page.getAttribute('file')==p: @@ -447,11 +447,11 @@ class VLP_resource(ECHO_resource): nn = int(self.REQUEST.get('pn','1'))-1 if nn < 1: #letzte seite dann kein a tag - return """prev
prev""" + return """prev
prev""" else: return """ - prev
prev + prev
prev
"""%(self.REQUEST['URL']+"?pn="+str(nn)) @@ -463,11 +463,11 @@ class VLP_resource(ECHO_resource): nn = int(self.REQUEST.get('pn','1'))+1 if nn>int(ln): #letzte seite dann kein a tag - return """next
next""" + return """next
next""" else: return """ - next
next + next
next
"""%(self.REQUEST['URL']+"?pn="+str(nn)) @@ -478,17 +478,24 @@ class VLP_resource(ECHO_resource): if not url: url=self.absolute_url()+"/index.xml" - fh=urllib.urlopen(url) + fh=ECHO_helpers.urlopen(url) dom=xml.dom.minidom.parse(fh) for page in dom.getElementsByTagName('page'): text=getText(page.childNodes) pageNum=page.getAttribute('nr') - pagelist.append((pageNum,text)) + fileName=page.getAttribute('file') + pagelist.append((pageNum,text,fileName)) return pagelist - + + def getFileName(self): + """getNameOfCurrentFile""" + pn=int(self.REQUEST.get('pn','1')) + pageinfo=self.readIndexFile()[pn-1] + return pageinfo[2] + def createIndexFile(self,RESPONSE=None): """create index file"""