--- ECHO_content/VLPExtension.py	2004/06/08 15:25:11	1.6
+++ ECHO_content/VLPExtension.py	2004/06/08 17:04:39	1.7
@@ -34,18 +34,18 @@ class VLP_essay(Folder):
         pages.sort(sortFind)
         #print str(pages[int(pagenum)][1]())
         if pages[int(pagenum)-1][1].meta_type=='File':
-            return str(pages[int(pagenum)-1][1])
+            return self.xml2html(str(pages[int(pagenum)-1][1]))
         else:
-            return str(pages[int(pagenum)-1][1]())
+            return str(self.xml2html(pages[int(pagenum)-1][1]()))
         
     def nextPage(self,pagenum,url):
-        pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document'])) # teste ob performance ok, sonst in variable
+        pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document','File'])) # teste ob performance ok, sonst in variable
         if int(pagenum)+1 <= pages:
             retstr=url+"?p="+str(int(pagenum)+1)
             return """<td align="right" <a href="%s">next</a></td>"""%retstr
         
     def previousPage(self,pagenum,url):
-        pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document'])) # teste ob performance ok, sonst in variable
+        
         if int(pagenum)-1 > 0:
             retstr=url+"?p="+str(int(pagenum)-1)
             return """<td align="left" <a href="%s">previous</a></td>"""%retstr