ECHO_content/VLPExtension.py - diff

Return to VLPExtension.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/VLPExtension.py between versions 1.52 and 1.77

version 1.52, 2005/10/26 11:18:19	version 1.77, 2008/09/08 18:41:34
Line 2	Line 2
This module contains extensions which where originally made for the VLP.	This module contains extensions which where originally made for the VLP.
"""	"""
from OFS.Cache import Cacheable	from OFS.Cache import Cacheable
from Products.ECHO_content.ECHO_collection import *
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate	from Products.PageTemplates.PageTemplate import PageTemplate
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate	from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from OFS.Image import File	from OFS.Image import File
try:
from Products.zogiLib import zogiLib
except:
print "Zogilib not installed, VLP_resource will not work"

import xml.dom.minidom	import xml.dom.minidom
import urllib	import urllib
import xmlrpclib	import xmlrpclib
Line 21 import os	Line 15 import os
from stat import *	from stat import *
from types import *	from types import *
from Globals import package_home	from Globals import package_home
	import transaction

	from Products.ECHO_content.ECHO_collection import *
	from vlp_xmlhelpers import *
	try:
	from Products.zogiLib import zogiLib
	except:
	print "Zogilib not installed, VLP_resource will not work"


def lemmatize(str):	def lemmatize(str):
Line 47 def makeXML(str):	Line 48 def makeXML(str):
</page>"""%str	</page>"""%str


	def checkXMLfrag(str):
	"""checks and returns str as XML fragment"""

	xmltempl = """<?xml version="1.0" encoding="utf-8" ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
	<txt>%s</txt>"""

	try:
	dom=xml.dom.minidom.parseString(xmltempl%utf8ify(str))
	return str
	except:
	str=str.replace("& ","& ")

	dom=xml.dom.minidom.parseString(xmltempl%utf8ify(str))
	return str



def getText(nodelist):	def getText(nodelist):

Line 145 def manage_addSendMailForm(self, id, toA	Line 162 def manage_addSendMailForm(self, id, toA


class VLP_essay(Folder):	class VLP_essay(Folder):
"""classe für VLP essays"""	"""classe fr VLP essays"""

meta_type="VLP_essay"	meta_type="VLP_essay"

Line 217 class VLP_essay(Folder):	Line 234 class VLP_essay(Folder):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

	def getPageList(self):
	"""returns sorted list of (id,object) of page objects"""

	def sortFind(x,y):
	return cmp(x[0],y[0])

	# pages=[]
	# pagestmp=self.ZopeFind(self,obj_metatypes=['DTML Document','File'])
	# for page in pagestmp:
	# if not (page[1].getId()[0]=="."):
	# pages.append(page)

	pages = self.objectItems(['DTML Document','File'])
	pages.sort(sortFind)
	#logging.debug("pageList=%s"%repr(pages))
	return pages


	def getPageXMLfrag(self, pageNum=None, pageId=None, pageObj=None):
	"""returns XML fragment of page with id"""
	xml = None

	if pageNum is not None:
	pl = self.getPageList()
	pageObj = pl[int(pageNum)-1][1]

	if pageId is not None:
	pageObj = getattr(self, pageId, None)

	if pageObj is not None:
	txt = ""
	if pageObj.meta_type == 'File':
	data = pageObj.data
	#logging.debug("data=%s txt=%s"%(repr(data),txt))
	while data is not None:
	if isinstance(data, str):
	txt += data
	data = None
	else:
	txt += data.data
	data = data.next

	else:
	# not a File object... perhaps its executable
	txt += pageObj()

	xml = checkXMLfrag(txt)

	return unicodify(xml)


def getPage(self,pagenum):	def getPage(self,pagenum):
"""gibt essay page mit num aus"""	"""gibt essay page mit num aus"""
Line 232 class VLP_essay(Folder):	Line 299 class VLP_essay(Folder):
#print str(pages[int(pagenum)][1]())	#print str(pages[int(pagenum)][1]())

if pages[int(pagenum)-1][1].meta_type=='File':	if pages[int(pagenum)-1][1].meta_type=='File':

#return makeXML(str(pages[int(pagenum)-1][1]))	#return makeXML(str(pages[int(pagenum)-1][1]))
#txt=pages[int(pagenum)-1][1].data.decode('utf-8')	#txt=pages[int(pagenum)-1][1].data.decode('utf-8')
txt=pages[int(pagenum)-1][1].data	txt=pages[int(pagenum)-1][1].data
#print txt.encode('utf-8')	#print txt.encode('utf-8')

return self.xml2html(makeXML(txt),quote="no")	return self.xml2html(makeXML(txt),quote="no")
else:	else:



return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no")	return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no")

def nextPage(self,pagenum,url):	def nextPage(self,pagenum,url):
Line 263 class VLP_essay(Folder):	Line 325 class VLP_essay(Folder):
retstr=url+"?p="+str(int(pagenum)+1)	retstr=url+"?p="+str(int(pagenum)+1)
return retstr	return retstr

	def lastURL(self,pagenum,url):
	# teste ob performance ok, sonst in variable
	pages=len(self.ZopeFind(self,obj_metatypes=['DTML Document','File']))

	return url+"?p="+str(pages)

def previousURL(self,pagenum,url):	def previousURL(self,pagenum,url):

if int(pagenum)-1 > 0:	if int(pagenum)-1 > 0:
Line 347 class VLP_subcollection(ECHO_collection)	Line 415 class VLP_subcollection(ECHO_collection)

meta_type="VLP_subcollection"	meta_type="VLP_subcollection"

	def getVLPSubcollectionToc(self,type):

	#different ordering depending on the type
	if(type == "(Collection)"):
	sort= "shortreference"
	else:
	sort = "startpages"

	#content of journals also displayed if not online

	if (type == "(JournalVolume)"):
	online =""
	else:
	online ="AND online = 1"
	sort=self.collectionSort(type)

	item = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature
	WHERE volumeid ~ '%s\\\\M' """%self.getId()
	+ """ %s AND not referenceType='%s' """%(online,type)
	+ """ORDER BY """ + sort)]

	tocItem = [x for x in self.ZSQLSimpleSearch("""SELECT * FROM vl_literature
	WHERE reference = '%s' """%self.getId()
	+ """AND online = 1 AND referenceType='%s' """%type
	+ """ORDER BY """ + sort)]



	return tocItem+item

def checkForFrontMatter(self,item):	def checkForFrontMatter(self,item):
"""Teste ob Frontmatter exists"""	"""Teste ob Frontmatter exists"""
if not item==self.getId():	if not item==self.getId():
Line 394 class VLP_collection(ECHO_collection):	Line 492 class VLP_collection(ECHO_collection):



def generateSubCollections(self,errorsTXT=""):	def generateSubCollections(self,errorsTXT="",forceUpdate=False,RESPONSE=None):
"""erzeuge subcollectionen"""	"""erzeuge subcollectionen"""
founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Book)','(Collection)','(Journal)')")	logging.debug("generateSubCollections")
	founds=self.ZSQLSimpleSearch("select * from vl_literature where referencetype in ('(Edited Book)','(Book)','(Collection)','(JournalVolume)','(Generic Container)')")

	if RESPONSE is not None:
	RESPONSE.setHeader('Content-Type','text/html')
self.REQUEST.RESPONSE.write("<h2>Create Subcollections</h2>\n")	self.REQUEST.RESPONSE.write("<h2>Create Subcollections</h2>\n")
for found in founds:	for found in founds:
try:	try:
foundCol=self.ZopeFind(self,obj_ids=[found.reference])	litid = str(found.reference)
	foundCol=self.ZopeFind(self,obj_ids=[litid])
if foundCol:	if foundCol:
	col = foundCol[0][1]
	logging.debug("generateSubCollections: subcollection %s exists (%s)"%(col.getId(),found.reference))
	if (col.title != found.titlerefdisplay) or (col.label != found.titlerefdisplay):
	# subcollection seems to have changed
	logging.debug("generateSubCollections: subcollection has changed, recreating!")
self.manage_delObjects([foundCol[0][0]])	self.manage_delObjects([foundCol[0][0]])
	manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay)
	else:
	logging.debug("generateSubCollections: creating new subcollection %s"%found.reference)
	manage_addVLP_subCollection(self,litid,found.titlerefdisplay,found.titlerefdisplay)

manage_addVLP_subCollection(self,found.reference,found.titlerefdisplay,found.titlerefdisplay)
#getattr(self,found.reference).generateSubCollectionFromDB()
#teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter)	#teste ob es Images auf dem Server gibt mit gleichem Namen (frontmatter)
if os.path.exists(os.path.join(self.vlp_basis,found.reference)):	if os.path.exists(os.path.join(self.vlp_basis,litid)):
	logging.debug("generateSubCollections: found frontmatter in %s"%litid)
	obj=getattr(self,litid)
	if not self.ZopeFind(obj,obj_ids=[litid]):
	metalink=self.REQUEST['URL1']+"/"+litid+"/"+litid+"/index_meta"
	newObj=VLP_resource(litid,'',metalink,litid,litid,litid,'generated','book','','','','','','')
	obj._setObject(litid,newObj)

obj=getattr(self,found.reference)	genObj=getattr(obj,litid)
if not self.ZopeFind(obj,obj_ids=[found.reference]):	genObj.createIndexFile(forceUpdate=forceUpdate)
metalink=self.REQUEST['URL1']+"/"+found.reference+"/"+found.reference+"/index_meta"
newObj=VLP_resource(found.reference,'',metalink,found.reference,found.reference,found.reference,'generated','book','','','','','','')	if RESPONSE is not None:
obj._setObject(found.reference,newObj)	self.REQUEST.RESPONSE.write("<p>%s</p>\n"%litid)
genObj=getattr(obj,found.reference)	logging.debug("<p>%s</p>\n"%litid)
genObj.createIndexFile()

self.REQUEST.RESPONSE.write("<p>%s</p>\n"%found.reference)
except:	except:
error=sys.exc_info()[0:2]	error=sys.exc_info()[0:2]
RESPONSE.write("(ERROR (%s): %s %s)\n"%(found.reference,error[0],error[1]))	logging.error("generateSubCollections: ERROR in %s"%litid)
errorsTXT+="<p>No subcollection of %s "+"(ERROR: %s %s)</p>"%error	if RESPONSE is not None:
	RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(litid,error[0],error[1]))
	#logging.error("generateSubCollections: %s %s"%error)
	#self.REQUEST.RESPONSE.write("(ERROR (%s): %s %s)\n"%(litid,repr(error[0]),repr(error[1])))
	errorsTXT+="<p>ERROR: No subcollection of %s (ERROR: %s %s)</p>\n"%(litid,error[0],error[1])
	#errorsTXT+="<p>No subcollection of %s "%litid+"(ERROR: %s %s)</p>"%error

return errorsTXT	return errorsTXT

Line 438 class VLP_collection(ECHO_collection):	Line 555 class VLP_collection(ECHO_collection):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def updateCollection(self,RESPONSE=None):	def updateCollection(self,forceUpdate=False,RESPONSE=None):
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""	"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
errorsTXT="<h2>Errors</h2>"	errorsTXT="<h2>Errors</h2>"
	if RESPONSE is not None:
	RESPONSE.setHeader('Content-Type','text/html')
RESPONSE.write("<html><body>")	RESPONSE.write("<html><body>")
files=os.listdir(self.vlp_basis)

errorsTXT+="<h3>New Ressources</h3>"	files=os.listdir(self.vlp_basis)
	i=0
for fileName in files:	for fileName in files:
	if i<100:
	i+=1
	else:
	i=0
	j=0
	while j<5:
	try:
	transaction.get().commit()
	j=6
	except:
	logging.error("Commit: %s"%j)
	j+=1

	RESPONSE.write("<p>committed</p>")
if fileName[0:3]=="lit":	if fileName[0:3]=="lit":

metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta"	metalink=self.REQUEST['URL1']+"/"+fileName+"/index_meta"
try:	try:
if not hasattr(self,fileName):	if not hasattr(self,fileName):
	# create new resource
	logging.debug("updateCollection: new %s"%fileName)
	if RESPONSE is not None:
	RESPONSE.write("<p>new: %s</p>\n"%fileName)
	logging.debug("new: %s \n"%fileName)
newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')	newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')
self._setObject(fileName,newObj)	self._setObject(fileName,newObj)

RESPONSE.write("<p>got: %s\n</p>"%fileName)	if RESPONSE is not None:
	RESPONSE.write("<p>got: %s "%fileName)

	logging.debug("got: %s "%fileName)
genObj=getattr(self,fileName)	genObj=getattr(self,fileName)
	logging.debug("updateCollection: inspecting %s"%fileName)
	# create index
if hasattr(genObj,'createIndexFile'):	if hasattr(genObj,'createIndexFile'):
try:	try:
genObj.createIndexFile()	logging.debug("updateCollection: creating index for %s"%fileName)
	msg = genObj.createIndexFile(forceUpdate=forceUpdate)
	if msg and RESPONSE is not None:
	RESPONSE.write(msg)
except:	except:
error=sys.exc_info()[0:2]	error=sys.exc_info()[0:2]
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1]))	if RESPONSE is not None:
errorsTXT+="<p>No indexfile of %s "+"(ERROR: %s %s)</p>"%error	RESPONSE.write("(ERROR (%s): %s %s) "%(fileName,error[0],error[1]))
	errorsTXT+="<p>ERROR creating index for %s "%fileName+"(ERROR: %s %s)</p>\n"%error

	# update pageSizeSum for subcollections
if genObj.meta_type=="VLP_subcollection":	if genObj.meta_type=="VLP_subcollection":
	if RESPONSE is not None:
	RESPONSE.write(" is subcollection")
	logging.debug("updateCollection: %s is subcollection"%fileName)
genObj.pageSizeSum=getattr(genObj,fileName).getPageSizeSum()	genObj.pageSizeSum=getattr(genObj,fileName).getPageSizeSum()
else:	else:
genObj.pageSizeSum=genObj.getPageSizeSum()	genObj.pageSizeSum=genObj.getPageSizeSum()

	if RESPONSE is not None:
	RESPONSE.write("</p>\n")

except:	except:
error=sys.exc_info()[0:2]	error=sys.exc_info()[0:2]
	logging.error("updateCollection: ERROR in %s (%s %s)"%(fileName,error[0],error[1]))
	if RESPONSE is not None:
RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1]))	RESPONSE.write("<p>(ERROR (%s): %s %s)</p>\n"%(fileName,error[0],error[1]))
errorsTXT+="<p>File not created:%s "+"(ERROR: %s %s)</p>"%error	errorsTXT+="<p>File not created:%s (ERROR: %s %s)</p>\n"%(fileName,error[0],error[1])

errorsTXT+=self.generateSubCollections()	# update subcollections
errorsTXT+="/n"	errorsTXT+=self.generateSubCollections(forceUpdate=forceUpdate,RESPONSE=RESPONSE)
RESPONSE.write(errorsTXT)	errorsTXT+="\n"
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.write(errorsTXT)
	RESPONSE.write("</body></html>")

def updateCollectionMD(self,RESPONSE=None):	def updateCollectionMD(self,RESPONSE=None):
"""updateMD"""	"""updateMD"""
Line 554 class VLP_resource(ECHO_resource,Cacheab	Line 709 class VLP_resource(ECHO_resource,Cacheab

if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')):	if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')):
return 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')):	elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')):
return os.path.join(self.vlp_basis,self.resourceID,'pagesHi')	return os.path.join(self.vlp_basis,self.resourceID,'pages')
else:	else:
return "<error>no images </error>"	return "<error>no images </error>"

Line 573 class VLP_resource(ECHO_resource,Cacheab	Line 728 class VLP_resource(ECHO_resource,Cacheab



	def identifyMediaType(self):
	"""identifiziert den Medientype aus der VLP Datenbank"""
	founds=self.ZSQLSimpleSearch('select * from vl_literature where reference=\''+self.resourceID+'\' order by id')
	if (not founds) or (len(founds)==0):
	self.mediaType="generic" # steht nicht in der Datenbank, dann nimm generisch an
	return self.mediaType


	if founds[0].referencetype =="Audio":
	self.mediaType ="audio"
	elif founds[0].referencetype =="Film":
	self.mediaType ="video"
	else:
	self.mediaType ="image" # nimm an, dass alle anderen Eintrage in der Datenbank auf images verweisen (Buecher oder Fotografien).

	return self.mediaType

	def getMediaType(self,cached=False):
	"""give the Media-type back, if chached False, then get it from the database"""

	if (not hasattr(self,'mediaType')) or (self.mediaType=="") or (not cached):
	self.identifyMediaType()

	return self.mediaType




def copyTranscriptionFromDB(self):	def copyTranscriptionFromDB(self):
"""checks if transcription exits in DB"""	"""checks if transcription exits in DB"""
founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id')	founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id')
Line 627 class VLP_resource(ECHO_resource,Cacheab	Line 810 class VLP_resource(ECHO_resource,Cacheab
def show(self):	def show(self):
"""show the rendered file"""	"""show the rendered file"""

if self.REQUEST.get('p',None):	mt = self.getMediaType()

	if (mt in ['video','audio']):
	pt = self.getVLPTemplate('libraryMovieTemplate')
	else: #zur zeit werden alle anderen type auf das libraryTemplate abgebildet.

	if self.REQUEST.get('p',None): #make sure that parameter p exists
#self.REQUEST.set('pn',self.file2page(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)

	pt = self.getVLPTemplate('libraryTemplate')

if hasattr(self,'libraryTemplate.html'):	return pt()
return getattr(self,'libraryTemplate.html')()

pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_template.zpt')).__of__(self)	def getVLPTemplate(self,name):
	html=name+".html"
	if hasattr(self,html):
	return getattr(self,html)

	pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp',name+'.zpt')).__of__(self)
pt.content_type="text/html"	pt.content_type="text/html"
return pt()	return pt

def index_html(self):	def index_html(self):
"""index_html"""	"""index_html"""
Line 689 class VLP_resource(ECHO_resource,Cacheab	Line 887 class VLP_resource(ECHO_resource,Cacheab
#size of hi resolution	#size of hi resolution
files=[]	files=[]
try:	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)	files=os.listdir(pathHi)
hi=0	hi=0
for f in files:	for f in files:
Line 736 class VLP_resource(ECHO_resource,Cacheab	Line 934 class VLP_resource(ECHO_resource,Cacheab
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg'))	ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg'))
self.imagePath='pageimg'	self.imagePath='pageimg'
except:	except:
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi'))	ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pages'))
self.imagePath='pagesHi'	self.imagePath='pages'
temp=[]	temp=[]
ret.sort()	ret.sort()
for x in ret:	for x in ret:
if (not (x[0]==".")) and (not x[0:4] in excludeNames):	if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames):

temp.append((calculateName(x),os.path.splitext(x)[0]))	temp.append((calculateName(x),os.path.splitext(x)[0]))
return temp	return temp

Line 750 class VLP_resource(ECHO_resource,Cacheab	Line 947 class VLP_resource(ECHO_resource,Cacheab
def firstPage(self,url=None):	def firstPage(self,url=None):
"""showlink to the first image"""	"""showlink to the first image"""
if self.REQUEST.get('pn','1')=="1": #erste seinte dann kein a tag	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:	else:
ws=self.REQUEST.get('ws','1')	ws=self.REQUEST.get('ws','1')
return """<a href=%s>	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>	</a>
"""%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws)	"""%(self.REQUEST['URL']+"?pn=1&ws=%s"%ws)

Line 766 class VLP_resource(ECHO_resource,Cacheab	Line 963 class VLP_resource(ECHO_resource,Cacheab
ln=len(pages)	ln=len(pages)

if (self.REQUEST.get('pn')==str(ln)) or (ln==1): #letzte seite dann kein a tag oder nur eine Seite	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:	else:
ws=self.REQUEST.get('ws','1')	ws=self.REQUEST.get('ws','1')
return """<a href=%s>	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>	</a>
"""%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws)	"""%(self.REQUEST['URL']+"?pn="+str(ln)+"&ws="+ws)

Line 781 class VLP_resource(ECHO_resource,Cacheab	Line 978 class VLP_resource(ECHO_resource,Cacheab

nn = int(self.REQUEST.get('pn','1'))-1	nn = int(self.REQUEST.get('pn','1'))-1
if nn < 1: #letzte seite dann kein a tag	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:	else:
ws=self.REQUEST.get('ws','1')	ws=self.REQUEST.get('ws','1')
return """<a href=%s>	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>	</a>
"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)	"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)

Line 798 class VLP_resource(ECHO_resource,Cacheab	Line 995 class VLP_resource(ECHO_resource,Cacheab

nn = int(self.REQUEST.get('pn','1'))+1	nn = int(self.REQUEST.get('pn','1'))+1
if (nn>int(ln)) or (ln==1): #letzte seite dann kein a tag	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:	else:
ws=self.REQUEST.get('ws','1')	ws=self.REQUEST.get('ws','1')
return """<a href=%s>	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>	</a>
"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)	"""%(self.REQUEST['URL']+"?pn="+str(nn)+"&ws="+ws)

Line 849 class VLP_resource(ECHO_resource,Cacheab	Line 1046 class VLP_resource(ECHO_resource,Cacheab
pageinfo=self.readIndexFile()[pn-1]	pageinfo=self.readIndexFile()[pn-1]
return pageinfo[2]	return pageinfo[2]

def createIndexFile(self,RESPONSE=None):	def createIndexFile(self,forceUpdate=False,RESPONSE=None):
"""create index file"""	"""create index file"""
	logging.debug("createindexfile of %s"%self.id)

	if hasattr(self,'index.xml'):
	# index exists
	zt=getattr(self,'index.xml')
	if not forceUpdate:
	# check if directory is newer (self.imagePath sould be set by now)
	imgdir = os.path.join(self.vlp_basis, self.resourceID, self.imagePath)
	dirtime = os.path.getmtime(imgdir)
	zttime = zt.bobobase_modification_time()
	logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime))
	if dirtime < zttime:
	# nothing to do
	logging.debug("createindexfile: dir %s older than index"%(imgdir))
	return "index is up to date"

pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_template.zpt')).__of__(self)()	else:
	# create new index template


if not hasattr(self,'index.xml'):
zt=ZopePageTemplate('index.xml')	zt=ZopePageTemplate('index.xml')
self._setObject('index.xml',zt)	self._setObject('index.xml',zt)
else:
zt=getattr(self,'index.xml')


	# fill index template
	pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','index_template.zpt')).__of__(self)()
	#logging.debug("createindexfile uses %s"%pt)
zt.pt_edit(pt, 'text/xml')	zt.pt_edit(pt, 'text/xml')
	transaction.get().commit()

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.52
changed lines
	Added in v.1.77