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.84 and 1.86

version 1.84, 2008/11/20 10:45:14	version 1.86, 2008/12/17 12:02:53
Line 488 from zope.interface import implements	Line 488 from zope.interface import implements
from zope.publisher.interfaces import NotFound	from zope.publisher.interfaces import NotFound
from zope.app import zapi	from zope.app import zapi
from zope.component import queryMultiAdapter	from zope.component import queryMultiAdapter
	try:
from ZPublisher.BaseRequest import DefaultPublishTraverse	from ZPublisher.BaseRequest import DefaultPublishTraverse
	except:
	pass

class VLP_collection(ECHO_collection,Acquisition.Explicit):	class VLP_collection(ECHO_collection,Acquisition.Explicit):
"""VLP spezifische Erweiterung der Collection"""	"""VLP spezifische Erweiterung der Collection"""
Line 524 class VLP_collection(ECHO_collection,Acq	Line 527 class VLP_collection(ECHO_collection,Acq

if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk	if name.startswith("lit"): #umleitung wenn lit aufgerufen wirk
# umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird	# umleitung auf den eigentlichen folder nur wenn direkt der Folder litXXX oder dessen index_html methode aufgerufen wird
if lastActual.startswith("lit") or (lastActual=="index_html") or (lastActual=="index_meta"):	if lastActual.startswith("lit") or (lastActual=="index_html") or (lastActual=="index_meta") or (lastActual=="getTitle") or (lastActual=="getMetaDataLink"):
#obj=self. ZopeFind(self,obj_ids=[name],search_sub=1)	#obj=self. ZopeFind(self,obj_ids=[name],search_sub=1)
ob=self.findObjFromLitName(name)	ob=self.findObjFromLitName(name)
if not ob:	if not ob:
Line 807 class VLP_resource(ECHO_resource,Cacheab	Line 810 class VLP_resource(ECHO_resource,Cacheab
#vlp_basis="/mpiwg/online/permanent/vlp"	#vlp_basis="/mpiwg/online/permanent/vlp"



referencetypes=[]	referencetypes=[]

manage_options=ECHO_resource.manage_options+Cacheable.manage_options+(	manage_options=ECHO_resource.manage_options+Cacheable.manage_options+(
Line 816 class VLP_resource(ECHO_resource,Cacheab	Line 820 class VLP_resource(ECHO_resource,Cacheab
{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'},	{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'},
)	)

	def getMetaDataLink(self):
	"""link auf die metatdaten"""
	return self.absolute_url()+"/index_meta"


	def getTitle(self):
	"""Title der Ressource"""
	title= self.ZSQLSimpleSearch("""select title from vl_literature where reference= \'%s\' """ %self.getId())[0].title
	logging.debug(title)
	return title

def getImagePath(self):	def getImagePath(self):
"""Pfad zu den Images"""	"""Pfad zu den Images"""
	path=None

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')	path= os.path.join(self.vlp_basis,self.resourceID,'pageimg')
elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')):	elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pages')):
return os.path.join(self.vlp_basis,self.resourceID,'pages')	path = os.path.join(self.vlp_basis,self.resourceID,'pages')
else:	# workaround in some cases there seem to be no pictures in pages
return "<error>no images </error>"

	if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')):
	if len (os.listdir(self.vlp_basis,self.resourceID,'pagesHi')) > len(os.listdir(path)):
	path=os.path.join(self.vlp_basis,self.resourceID,'pagesHi')
	logging.error("pages < pagesHi: %s"%self.resourceID)
	else:
	logging.error("no images: %s"%self.resourceID)
	return None


def transcription(self):	def transcription(self):
Line 1053 class VLP_resource(ECHO_resource,Cacheab	Line 1074 class VLP_resource(ECHO_resource,Cacheab
ret="%s: %s"%(str[0],name)	ret="%s: %s"%(str[0],name)
return ret	return ret

try:	self.imagePath=self.getImagePath();
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg'))	if (selfImagePath is None):
self.imagePath='pageimg'	return None
except:
ret=os.listdir(os.path.join(self.vlp_basis,self.resourceID,'pages'))
self.imagePath='pages'
temp=[]	temp=[]
	ret = os.listdir(self.imagePathj);

ret.sort()	ret.sort()
for x in ret:	for x in ret:
if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames):	if (not (x[0] in ('.',':'))) and (not x[0:4] in excludeNames):
Line 1178 class VLP_resource(ECHO_resource,Cacheab	Line 1199 class VLP_resource(ECHO_resource,Cacheab
zt=getattr(self,'index.xml')	zt=getattr(self,'index.xml')
if not forceUpdate:	if not forceUpdate:
# check if directory is newer (self.imagePath sould be set by now)	# check if directory is newer (self.imagePath sould be set by now)
imgdir = os.path.join(self.vlp_basis, self.resourceID, self.imagePath)	path = self.getImagePath()
	if (path is None):
	return "CREATE INDEX FILE NOT POSSIBLE"
	imgdir = os.path.join(path)
dirtime = os.path.getmtime(imgdir)	dirtime = os.path.getmtime(imgdir)
zttime = zt.bobobase_modification_time()	zttime = zt.bobobase_modification_time()
logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime))	logging.debug("createindexfile: dir %s of %s index of %s"%(imgdir,dirtime,zttime))

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

Removed from v.1.84
changed lines
	Added in v.1.86