--- ECHO_content/VLPExtension.py 2004/08/17 15:58:56 1.21
+++ ECHO_content/VLPExtension.py 2004/08/19 20:28:18 1.23
@@ -389,8 +389,9 @@ class VLP_resource(ECHO_resource):
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:
- return page.getAttribute('nr')
+ # pageummer mit lo oder hi sind aequivalent
+ if (page.getAttribute('file')==p) or ("%slo"%page.getAttribute('file')==p) or ("%shi"%page.getAttribute('file')==p):
+ return page.getAttribute('nr')
return 0
@@ -447,11 +448,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"""
+ return """
prev"""
else:
return """
-
prev
+
prev
"""%(self.REQUEST['URL']+"?pn="+str(nn))
@@ -463,11 +464,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"""
+ return """
next"""
else:
return """
-
next
+
next
"""%(self.REQUEST['URL']+"?pn="+str(nn))
@@ -485,10 +486,17 @@ class VLP_resource(ECHO_resource):
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"""