ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.87 and 1.92

version 1.87, 2006/05/17 20:37:29	version 1.92, 2006/05/22 21:09:53
Line 25 import Queue	Line 25 import Queue
import cgi	import cgi
import sys	import sys
import zLOG	import zLOG
	import shutil

from AccessControl import ClassSecurityInfo, getSecurityManager	from AccessControl import ClassSecurityInfo, getSecurityManager

Line 286 class ImageDigilib(Folder,Persistent,Imp	Line 286 class ImageDigilib(Folder,Persistent,Imp

)	)



def getAccessRight(self):	def getAccessRight(self):
"""get the accessright, return is string "extern" or "intern" """	"""get the accessright, return is string "extern" or "intern" """
return self.getRights(self.filename.split('.')[0])	return self.getRights(self.filename.split('.')[0])
Line 388 class ImageDigilib(Folder,Persistent,Imp	Line 390 class ImageDigilib(Folder,Persistent,Imp
os.chmod(filename,0664)	os.chmod(filename,0664)
except:	except:
"""hack"""	"""hack"""
#scale thumb	#< thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()



Line 480 class ImageDigilib(Folder,Persistent,Imp	Line 482 class ImageDigilib(Folder,Persistent,Imp

#scale thumb	#scale thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()


	self.scaleToJpg()
if RESPONSE:	if RESPONSE:
RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)	RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)

	def scaleToJpg(self,RESPONSE=None):
	"""create a jpg"""

	#create backup of the original file

	imagePath=os.path.join(self.ImageStoragePath,self.filename)
	path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")

	if not os.path.exists(path):
	os.mkdir(path,0775)
	os.chmod(path,0775)

	newName=os.path.join(path,self.getId())

	if os.path.exists(newName):
	zLOG.LOG("ImageArchive:scaleToJpg", zLOG.INFO, "%s already exists"%newName)
	else:
	try:
	os.rename(imagePath,newName)
	except:
	zLOG.LOG("ImageArchive:scaleToJpg", zLOG.ERROR, "%s "%newName)
	return False

	ext= os.path.splitext(imagePath)[1].lower()
	if ext.rstrip()==".jpg":
	shutil.copy(newName,imagePath)
	print "copy",imagePath
	return True

	print "SCALED",imagePath
	dest="/Volumes/paviaExtern/docuserver/images/exhibitionImages/"
	dir=self.getId()
	src=path
	self.scale(dest=dest,dir=dir,src=path,scaleBy=1,RESPONSE=RESPONSE)
	return True

def updateImage(self,_fileupload,_rename=None,RESPONSE=None):	def updateImage(self,_fileupload,_rename=None,RESPONSE=None):
"""lade neues Version des Bildes"""	"""lade neues Version des Bildes"""
Line 522 class ImageDigilib(Folder,Persistent,Imp	Line 559 class ImageDigilib(Folder,Persistent,Imp
zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))	zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))

#lesen des upload files und schreiben	#lesen des upload files und schreiben
filedata=file.read()	filedata=_fileupload.read()
f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!	f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!
f.write(filedata)	f.write(filedata)
f.close()	f.close()
Line 532 class ImageDigilib(Folder,Persistent,Imp	Line 569 class ImageDigilib(Folder,Persistent,Imp
pass	pass
#scale thumb	#scale thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()
	self.scaleToJpg()
if _rename:	if _rename:
self.renameImage(file.filename)	self.renameImage(_fileupload.filename)


args=self.REQUEST.form	args=self.REQUEST.form
Line 657 class ImageCollection(OrderedFolder, Per	Line 694 class ImageCollection(OrderedFolder, Per

leiden_meta_fields=['image_id','date','country','place','people','description','photographer']	leiden_meta_fields=['image_id','date','country','place','people','description','photographer']

	scaledBasis="/mpiwg/temp/online/scaled"

defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP	defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP

Line 665 class ImageCollection(OrderedFolder, Per	Line 703 class ImageCollection(OrderedFolder, Per
imgcoll_thumb = PageTemplateFile('zpt/thumb', globals())	imgcoll_thumb = PageTemplateFile('zpt/thumb', globals())
imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals())	imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals())

	destBasis="/docuserver/scaled/"
	srcBasis="/docuserver/images"
	def scale(self,dest=None,dir=None,src=None,scaleTo=None,scaleBy=None,RESPONSE=None):
	"""scaler"""
	#scaleomatStr="ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ %s"
	scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl"

	destBasis=self.destBasis
	srcBasis=self.srcBasis
	if src:
	srcStr=" -src=%s"%src
	else:
	srcStr=" -src=%s"%srcBasis

	scaleStr=scaleomatStr+srcStr
	if dir:
	dirTmp=dir.replace(srcBasis,'')
	dirStr=" -dir=%s"%dirTmp
	scaleStr=scaleStr+dirStr
	elif filename:
	fileTmp=filename.replace(srcBasis,'')
	fileStr=" -dir=%s"%fileTmp
	scaleStr=scaleStr+fileStr
	else:
	zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no directory or filename given")
	return False

	if dest is not None:
	destStr=" -dest=%s"%os.path.join(destBasis,dest)
	scaleStr=scaleStr+destStr
	else:
	zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given")
	return False

	if scaleTo:
	scaleToStr=" -scaleto=%s"%scaleTo
	scaleStr=scaleStr+scaleToStr
	elif scaleBy:
	scaleByStr=" -scaleby=%s"%scaleBy
	scaleStr=scaleStr+scaleByStr
	else:
	zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given")
	return False


	#ret=scaleStr
	ret=os.popen2(scaleStr,1)[1].read()

	if RESPONSE:
	RESPONSE.write(ret)
	return True

def getImageObject(self,name):	def getImageObject(self,name):
"""gibt objeckt name zurueck"""	"""gibt objeckt name zurueck"""
if hasattr(self,name):	if hasattr(self,name):
Line 784 class ImageCollection(OrderedFolder, Per	Line 874 class ImageCollection(OrderedFolder, Per
self.REQUEST.RESPONSE.close()	self.REQUEST.RESPONSE.close()


	def scaleToJpgs(self,RESPONSE=None):
	"""scale all tifs to jps"""

	for x in self._objects:

	if (not hasattr(getattr(self,x['id']),'scaleToJpg')) or (not getattr(self,x['id']).scaleToJpg()):
	if RESPONSE:
	RESPONSE.write('error:%s'%x)



def scaleThumbs(self,RESPONSE=None):	def scaleThumbs(self,RESPONSE=None):
"""scale thumbs"""	"""scale thumbs"""

#scale thumbs	#scale thumbs
ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)	dest=os.path.join(self.scaledBasis,'thumb')
	self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=100,RESPONSE=RESPONSE)
	#ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
if RESPONSE:	if RESPONSE:
RESPONSE.write(ret.read())	RESPONSE.write(ret.read())
RESPONSE.write("\n")	RESPONSE.write("\n")
Line 801 class ImageCollection(OrderedFolder, Per	Line 903 class ImageCollection(OrderedFolder, Per

#scale standard	#scale standard

ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)	dest=os.path.join(self.scaledBasis,'small')
	self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=1000,RESPONSE=RESPONSE)

	dest=os.path.join(self.scaledBasis,'medium')
	self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=2000,RESPONSE=RESPONSE)

	#ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)
if RESPONSE:	if RESPONSE:
RESPONSE.write(ret.read())	RESPONSE.write(ret.read())
RESPONSE.write("\n")	RESPONSE.write("\n")
return "rescaling started"	return "rescaling started"



def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath):	def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath):
self.id=id	self.id=id
self.title=title	self.title=title
Line 1058 class ImageCollection(OrderedFolder, Per	Line 1165 class ImageCollection(OrderedFolder, Per
ret=""	ret=""
#print self.__dict__	#print self.__dict__
for file in files:	for file in files:
if not file[0]==".":	fn=os.path.splitext(file)[0]
if self.__dict__.has_key(file):	if not (file[0]=="."):
	if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :

ret=ret+"<br>"+file+" already exists!"	ret=ret+"<br>"+file+" already exists!"
else:	else:
Line 1075 class ImageCollection(OrderedFolder, Per	Line 1183 class ImageCollection(OrderedFolder, Per

#scale thumb	#scale thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()


RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1129 class ImageCollection(OrderedFolder, Per	Line 1237 class ImageCollection(OrderedFolder, Per

#scale thumb	#scale thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()

if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1144 class ImageCollection(OrderedFolder, Per	Line 1252 class ImageCollection(OrderedFolder, Per
ret=""	ret=""
#print self.__dict__	#print self.__dict__
for file in files:	for file in files:
if not file[0]==".":	fn=os.path.splitext(file)[0]
if self.__dict__.has_key(file):	if not (file[0]=="."):
	if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :

ret=ret+"<br>"+file+" already exists!"	ret=ret+"<br>"+file+" already exists!"

else:	else:
ret=ret+"<br>"+file+" created!"	ret=ret+"<br>"+file+" created!"
newObj=ImageDigilib(file,file)	newObj=ImageDigilib(file,file)
Line 1163 class ImageCollection(OrderedFolder, Per	Line 1273 class ImageCollection(OrderedFolder, Per

#scale thumb	#scale thumb

#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

Line 1761 class ImageCollectionMD(ImageCollection,	Line 1871 class ImageCollectionMD(ImageCollection,
ret=""	ret=""
#print self.__dict__	#print self.__dict__
for file in files:	for file in files:
if not file[0]==".":
if self.__dict__.has_key(file):	if not (file[0]=="."):
	fn=os.path.splitext(file)[0]
	if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :

ret=ret+"<br>"+file+" already exists!"	ret=ret+"<br>"+file+" already exists!"

else:	else:
ret=ret+"<br>"+file+" created!"	ret=ret+"<br>"+file+" created!"
newObj=ImageDigilib(file,file)	newObj=ImageDigilib(file,file)
Line 1789 class ImageCollectionMD(ImageCollection,	Line 1902 class ImageCollectionMD(ImageCollection,
#scale thumb	#scale thumb


#self.scaleThumbs()	self.scaleThumbs()

#scale standard	#scale standard

#self.scaleWorkingVersions()	self.scaleWorkingVersions()

	self.scaleToJpgs()

if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1827 class ImageCollectionMD(ImageCollection,	Line 1942 class ImageCollectionMD(ImageCollection,

self.ZSQLAdd(args=args)	self.ZSQLAdd(args=args)

	self.scaleThumbs()
	self.scaleWorkingVersions()

	getattr(self,fn).scaleToJpg()
if RESPONSE:	if RESPONSE:
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)	return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
#return self.REQUEST['URL1']+'/'+fileupload.filename	#return self.REQUEST['URL1']+'/'+fileupload.filename
Line 1870 class ImageCollectionMD(ImageCollection,	Line 1989 class ImageCollectionMD(ImageCollection,

def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):	def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
"""search"""	"""search"""
#context.ZSQLFind(_table='vision_main')
urlTmp=REQUEST['URL1']

url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']	rc=[]
	fnIds={}
	for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
	key=getattr(found,self.imageCollectionConfig.getKey())
	key=self.getImageByName(key,onlyName="yes")
	rc.append((key,'',0))
	fnIds[key]=('',0)

	rc.sort()
	self.REQUEST.SESSION['filenames']=rc
	self.REQUEST.SESSION['filenamesIds']=fnIds

if xml is None:	overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
	if overview:
	return overview[0][1]()
else:	else:
RESPONSE.redirect(url)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
	return pt()

	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
	return pt()

	#urlTmp=REQUEST['URL1']

	#url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']

	#if xml is None:
	# RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
	#else:
	# RESPONSE.redirect(url)

def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):	def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
"""main template collection"""	"""main template collection"""
Line 2061 class ImageCollectionMD(ImageCollection,	Line 2203 class ImageCollectionMD(ImageCollection,
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)	return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)


images=dom.xpath("//image")	imagenames=dom.xpath("//imagename")
rc=[]	rc=[]
fnIds={}	fnIds={}
for image in images:	for imagename in imagenames:

imagename=image.xpath('./imagename')[0]	#imagename=image.xpath('./imagename')[0]
	#print "im",imagename



	idnr=imagename.xpath('../idnr')[0]
idnr=image.xpath('./idnr')[0]
id=getText(idnr.childNodes)	id=getText(idnr.childNodes)
try:	try:
numberOfPages=image.xpath('./numberOfPages')[0]	numberOfPages=imagename.xpath('../numberOfPages')[0]
except:	except:
numberOfPages=None	numberOfPages=None

Line 2090 class ImageCollectionMD(ImageCollection,	Line 2232 class ImageCollectionMD(ImageCollection,
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste	texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
for text in texts:	for text in texts:
if not text=="":	if not text=="":
	#print "a"
text=self.getImageByName(text,onlyName="yes")	text=self.getImageByName(text,onlyName="yes")
	#print "b"
try:	try:
rc.append((str(text),id,nop))	rc.append((str(text),id,nop))
fnIds[str(text)]=(id,nop)	fnIds[str(text)]=(id,nop)
Line 2098 class ImageCollectionMD(ImageCollection,	Line 2242 class ImageCollectionMD(ImageCollection,
rc.append((repr(text),id,nop))	rc.append((repr(text),id,nop))
fnIds[repr(text)]=(id,nop)	fnIds[repr(text)]=(id,nop)

	#print "done"
rc.sort()	rc.sort()
self.REQUEST.SESSION['filenames']=rc	self.REQUEST.SESSION['filenames']=rc
self.REQUEST.SESSION['filenamesIds']=fnIds	self.REQUEST.SESSION['filenamesIds']=fnIds

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

Removed from v.1.87
changed lines
	Added in v.1.92