--- ECHO_content/VLPExtension.py 2007/10/04 18:45:33 1.65
+++ ECHO_content/VLPExtension.py 2008/07/31 16:57:45 1.69
@@ -628,8 +628,8 @@ class VLP_resource(ECHO_resource,Cacheab
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')
+ elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')):
+ return os.path.join(self.vlp_basis,self.resourceID,'pages')
else:
return "no images "
@@ -703,8 +703,11 @@ class VLP_resource(ECHO_resource,Cacheab
if self.REQUEST.get('p',None):
#self.REQUEST.set('pn',self.file2page(self.REQUEST.get('p',None)))
- self.REQUEST.RESPONSE.redirect(self.REQUEST['URL']+"?pn="+self.file2page(self.REQUEST.get('p',None)))
-
+ params = "pn=%s"%self.file2page(self.REQUEST.get('p',None))
+ mk = self.REQUEST.get('mk',None)
+ if mk:
+ params += "&mk=%s"%mk
+ self.REQUEST.RESPONSE.redirect(self.REQUEST['URL']+'?'+params)
if hasattr(self,'libraryTemplate.html'):
return getattr(self,'libraryTemplate.html')()
@@ -763,7 +766,7 @@ class VLP_resource(ECHO_resource,Cacheab
#size of hi resolution
files=[]
try:
- pathHi=os.path.join(self.vlp_basis,self.resourceID,'pagesHi')
+ pathHi=os.path.join(self.vlp_basis,self.resourceID,'pages')
files=os.listdir(pathHi)
hi=0
for f in files:
@@ -810,8 +813,8 @@ class VLP_resource(ECHO_resource,Cacheab
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg'))
self.imagePath='pageimg'
except:
- ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi'))
- self.imagePath='pagesHi'
+ ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pages'))
+ self.imagePath='pages'
temp=[]
ret.sort()
for x in ret:
@@ -823,12 +826,12 @@ class VLP_resource(ECHO_resource,Cacheab
def firstPage(self,url=None):
"""showlink to the first image"""
if self.REQUEST.get('pn','1')=="1": #erste seinte dann kein a tag
- return """
first"""
+ return """
first"""
else:
ws=self.REQUEST.get('ws','1')
return """
-
first
+
first
"""%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws)
@@ -839,12 +842,12 @@ class VLP_resource(ECHO_resource,Cacheab
ln=len(pages)
if (self.REQUEST.get('pn')==str(ln)) or (ln==1): #letzte seite dann kein a tag oder nur eine Seite
- return """
last"""
+ return """
last"""
else:
ws=self.REQUEST.get('ws','1')
return """
-
last
+
last
"""%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws)
@@ -854,12 +857,12 @@ class VLP_resource(ECHO_resource,Cacheab
nn = int(self.REQUEST.get('pn','1'))-1
if nn < 1: #letzte seite dann kein a tag
- return """
prev"""
+ return """
prev"""
else:
ws=self.REQUEST.get('ws','1')
return """
-
prev
+
prev
"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)
@@ -871,12 +874,12 @@ class VLP_resource(ECHO_resource,Cacheab
nn = int(self.REQUEST.get('pn','1'))+1
if (nn>int(ln)) or (ln==1): #letzte seite dann kein a tag
- return """
next"""
+ return """
next"""
else:
ws=self.REQUEST.get('ws','1')
return """
-
next
+
next
"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)