--- ECHO_content/VLPExtension.py 2004/08/05 12:53:58 1.14
+++ ECHO_content/VLPExtension.py 2004/08/05 15:36:38 1.16
@@ -16,7 +16,9 @@ def makeXML(str):
dom=xml.dom.minidom.parseString(str)
return str
except:
- return ""+str+""
+ return """
+ %s
+ """%str
def getText(nodelist):
@@ -75,15 +77,18 @@ class VLP_essay(Folder):
"""gibt essay page mit num aus"""
def sortFind(x,y):
return cmp(x[0],y[0])
-
- pages=self.ZopeFind(self,obj_metatypes=['DTML Document','File'])
-
+ pages=[]
+ pagestmp=self.ZopeFind(self,obj_metatypes=['DTML Document','File'])
+ for page in pagestmp:
+ if not (page[1].getId()[0]=="."):
+ pages.append(page)
+
pages.sort(sortFind)
#print str(pages[int(pagenum)][1]())
if pages[int(pagenum)-1][1].meta_type=='File':
- return self.xml2html(makeXML(str(pages[int(pagenum)-1][1])))
+ return self.xml2html(makeXML(str(pages[int(pagenum)-1][1])),quote="no")
else:
- return str(self.xml2html(makeXML(pages[int(pagenum)-1][1]())))
+ return str(self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no"))
def nextPage(self,pagenum,url):
pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document','File'])) # teste ob performance ok, sonst in variable