--- 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 "<error>no images </error>"
     
@@ -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 """<img src="../../images/first.gif" alt="first" width="14" height="14" border="0"><br>first"""
+            return """<img src="/images/first.gif" alt="first" width="14" height="14" border="0"><br>first"""
 
         else:
                 ws=self.REQUEST.get('ws','1')
                 return """<a href=%s>
-                         <img src="../../images/first.gif" alt="first" width="14" height="14" border="0"><br>first
+                         <img src="/images/first.gif" alt="first" width="14" height="14" border="0"><br>first
                          </a>
                          """%(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 """<img src="../../images/last.gif" alt="last" width="14" height="14" border="0"><br>last"""
+            return """<img src="/images/last.gif" alt="last" width="14" height="14" border="0"><br>last"""
 
         else:
                 ws=self.REQUEST.get('ws','1')
                 return """<a href=%s>
-                         <img src="../../images/last.gif" alt="last" width="14" height="14" border="0"><br>last
+                         <img src="/images/last.gif" alt="last" width="14" height="14" border="0"><br>last
                          </a>
                          """%(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 """<img src="../../images/lisePrev.gif" alt="prev" width="14" height="14" border="0"><br>prev"""
+            return """<img src="/images/lisePrev.gif" alt="prev" width="14" height="14" border="0"><br>prev"""
 
         else:
                 ws=self.REQUEST.get('ws','1')
                 return """<a href=%s>
-                         <img src="../../images/lisePrev.gif" alt="prev" width="14" height="14" border="0"><br>prev
+                         <img src="/images/lisePrev.gif" alt="prev" width="14" height="14" border="0"><br>prev
                          </a>
                          """%(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 """<img src="../../images/liseNext.gif" alt="next" width="14" height="14" border="0"><br>next"""
+            return """<img src="/images/liseNext.gif" alt="next" width="14" height="14" border="0"><br>next"""
 
         else:
                 ws=self.REQUEST.get('ws','1')
                 return """<a href=%s>
-                         <img src="../../images/liseNext.gif" alt="next" width="14" height="14" border="0"><br>next
+                         <img src="/images/liseNext.gif" alt="next" width="14" height="14" border="0"><br>next
                          </a>
                          """%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)