ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.82 and 1.103

version 1.82, 2006/05/16 15:56:18	version 1.103, 2007/01/31 14:24:17
Line 1	Line 1
genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config	genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config


	from Ft.Xml.Domlette import NonvalidatingReader
from OFS.Folder import Folder	from OFS.Folder import Folder
from OFS.OrderedFolder import OrderedFolder	from OFS.OrderedFolder import OrderedFolder
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
Line 24 from threading import Thread	Line 24 from threading import Thread
import Queue	import Queue
import cgi	import cgi
import sys	import sys
import zLOG
	import shutil

	import logging

	#ersetzt logging
	def logger(txt,method,txt2):
	"""logging"""
	logging.info(txt+ txt2)



from AccessControl import ClassSecurityInfo, getSecurityManager	from AccessControl import ClassSecurityInfo, getSecurityManager
Line 49 except:	Line 58 except:

manage_options=()	manage_options=()

	tdir="tmp"
tdir = "/mpiwg/temp/tmp/archivesImageServer/"	#tdir = "/mpiwg/temp/tmp/archivesImageServer/"
#tdir="/tmp/archivesImageServer/"	#tdir="/tmp/archivesImageServer/"

imageExtensions=['jpg','jpeg','tif','tiff','png']	imageExtensions=['.jpg','.jpeg','.tif','.tiff','.png','.gif']

def splitPath(str):	def splitPath(str):
str2=str.replace("\\","/")	str2=str.replace("\\","/")
Line 80 class generateSet:	Line 89 class generateSet:
"""generateSetThread"""	"""generateSetThread"""


def __init__(self,filenames,filenamesIds,ImageViewerPath,ids,url,local=None,version="working"):	def __init__(self,filenames,filenamesIds,ImageViewerPath,ImageStoragePath,destBasis,ids,url,local=None,version="working"):
"""init generateSet"""	"""init generateSet"""
self.filenames=filenames	self.filenames=filenames
self.filenamesIds=filenamesIds	self.filenamesIds=filenamesIds
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
	self.ImageStoragePath=ImageStoragePath
	self.destBasis=destBasis
self.ids=ids	self.ids=ids
self.local=local	self.local=local
self.url=url	self.url=url
self.version=version	self.version=version
self.done=None	self.done=None
	self.response=""


def __call__(self):	def __call__(self):
Line 115 class generateSet:	Line 127 class generateSet:

for id in self.filenames:	for id in self.filenames:

if self.filenamesIds.has_key(id[0]):	if self.filenamesIds.has_key(id[0]) and self.filenamesIds[id[0]][0]:
filename=self.filenamesIds[id[0]][0]+"_"+id[0]	filename=self.filenamesIds[id[0]][0]+"_"+id[0]
else:	else:
filename=id[0]	filename=id[0]

self.response+=str("<p>Get File: %s<br>\n"%filename)	self.response+=str("<p>Get File: %s<br>\n"%filename)

	toggle=False

if self.local:	if self.local:

if self.version=="working":	if self.version=="working":

sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"	sourcePath=self.destBasis+"/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
else:	if not os.path.exists(sourcePath):
sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]	self.response+=str("<p>%s doesn't exist I'll try the non scaled image</p>"%sourcePath)
	toggle=True
	if (self.version!="working") or toggle:
	toggle=False
	sourcePath=self.ImageStoragePath+"/"+id[0]
	if not os.path.exists(sourcePath):
	sourcePath=self.ImageStoragePath+"/"+os.path.splitext(id[0])[0]+".jpg"

targetPath=tmpPath+"/"+filename	targetPath=tmpPath+"/"+filename
try:	try:
shutil.copyfile(sourcePath,targetPath)	shutil.copyfile(sourcePath,targetPath)
except:	except:
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename))	self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%sourcePath))
else:	else:
if self.version=="working":	if self.version=="working":
requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"	requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
Line 286 class ImageDigilib(Folder,Persistent,Imp	Line 306 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 410 class ImageDigilib(Folder,Persistent,Imp
os.chmod(filename,0664)	os.chmod(filename,0664)
except:	except:
"""hack"""	"""hack"""
#scale thumb	#< thumb

self.scaleThumbs()	self.scaleThumbs()

Line 448 class ImageDigilib(Folder,Persistent,Imp	Line 470 class ImageDigilib(Folder,Persistent,Imp
self.title=newname[0:]	self.title=newname[0:]
self.filename=newname[0:]	self.filename=newname[0:]
#umbennen des files auf dem server	#umbennen des files auf dem server
oldpath=os.path.join(self.ImageStoragePath,oldname)	oldpath=os.path.join(self.getImageStoragePath(),oldname)
newpath=os.path.join(self.ImageStoragePath,newname)	newpath=os.path.join(self.getImageStoragePath(),newname)
os.rename(oldpath,newpath)	os.rename(oldpath,newpath)

#umbenennen des versionsfolders	#umbenennen des versionsfolders
oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")	oldfolder=os.path.join(self.getImageStoragePath(),"."+oldname+".dir")
newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")	newfolder=os.path.join(self.getImageStoragePath(),"."+newname+".dir")
if os.path.exists(oldfolder):	if os.path.exists(oldfolder):
os.rename(oldfolder,newfolder)	os.rename(oldfolder,newfolder)
else:	else:
Line 486 class ImageDigilib(Folder,Persistent,Imp	Line 508 class ImageDigilib(Folder,Persistent,Imp

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.getImageStoragePath(),self.filename)
	path=os.path.join(self.getImageStoragePath(),"."+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):
	logger("ImageArchive:scaleToJpg", logging.INFO, "%s already exists"%newName)
	else:
	try:
	os.rename(imagePath,newName)
	except:
	logger("ImageArchive:scaleToJpg", logging.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



	dir=self.getId()
	src=path
	self.scale(dest=self.getImageStoragePath(),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"""
#teste ob Dokumenten ordner schon vorhanden	#teste ob Dokumenten ordner schon vorhanden
#imagePath=os.path.join(self.ImageStoragePath,self.getId())	#imagePath=os.path.join(self.getImageStoragePath(),self.getId())

identifyField="filename"	identifyField="filename"

if _fileupload and _fileupload.filename!="":	if _fileupload and _fileupload.filename!="":
imagePath=os.path.join(self.ImageStoragePath,self.filename)	imagePath=os.path.join(self.getImageStoragePath(),self.filename)
path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")	path=os.path.join(self.getImageStoragePath(),"."+self.getId()+".dir")

if not os.path.exists(path):	if not os.path.exists(path):
os.mkdir(path,0775)	os.mkdir(path,0775)
Line 516 class ImageDigilib(Folder,Persistent,Imp	Line 573 class ImageDigilib(Folder,Persistent,Imp
#kopieren der bestehenden Version in den Versions ordner.	#kopieren der bestehenden Version in den Versions ordner.
imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))	imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
try:	try:
#zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))	#logger("ImageArchive:updateImage", logging.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
os.rename(imagePath,imageNewPath)	os.rename(imagePath,imageNewPath)
except:	except:
zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))	logger("ImageArchive:updateImage", logging.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 537 class ImageDigilib(Folder,Persistent,Imp	Line 594 class ImageDigilib(Folder,Persistent,Imp
#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 633 def manage_AddImageDigilib(self,id,fileu	Line 690 def manage_AddImageDigilib(self,id,fileu
newObj=ImageDigilib(id,fn,meta)	newObj=ImageDigilib(id,fn,meta)

self._setObject(id,newObj)	self._setObject(id,newObj)
getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)	getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 665 class ImageCollection(OrderedFolder, Per	Line 722 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/"
	scaledBasis=destBasis
	srcBasis="/docuserver/images"
	scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl"

	#dest="/Volumes/paviaExtern/docuserver/images/exhibitionImages/"

	def configScaleForm(self):
	"""configure the scaler form"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','configScale.zpt')).__of__(self)
	return pt()

	def configScale(self,scaleomatStr,RESPONSE=None):
	"""config the scaler"""
	self.scaleomatStr=scaleomatStr


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

	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=self.scaleomatStr

	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:
	logger("ImageCollection:scale",logging.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:
	logger("ImageCollection:scale",logging.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:
	logger("ImageCollection:scale",logging.ERROR,"no destionation given")
	return False


	#ret=scaleStr
	#logger("ImageCollection:scale",logging.INFO,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 672 class ImageCollection(OrderedFolder, Per	Line 802 class ImageCollection(OrderedFolder, Per

name=os.path.splitext(name)[0]	name=os.path.splitext(name)[0]
for extension in imageExtensions:	for extension in imageExtensions:
nameExt=name+"."+extension	nameExt=name+extension

if hasattr(self,nameExt):	if hasattr(self,nameExt):
return getattr(self,nameExt)	return getattr(self,nameExt)

nameExt=name+"_."+extension	nameExt=name+"_"+extension
if hasattr(self,nameExt):	if hasattr(self,nameExt):
return getattr(self,nameExt)	return getattr(self,nameExt)

Line 697 class ImageCollection(OrderedFolder, Per	Line 827 class ImageCollection(OrderedFolder, Per

def getImageStoragePath(self):	def getImageStoragePath(self):
"""get ImageStoragePath"""	"""get ImageStoragePath"""
return self.ImageStoragePath	if self.ImageViewerPath[0]=="/":
	if len(self.ImageViewerPath)>1:
	iv=self.ImageViewerPath[1:]
	else:
	iv=""
	else:
	iv=self.ImageViewerPath

	return os.path.join(self.srcBasis,iv)

def refreshTxt(self):	def refreshTxt(self):
"""txt fuer refresh"""	"""txt fuer refresh"""
Line 711 class ImageCollection(OrderedFolder, Per	Line 849 class ImageCollection(OrderedFolder, Per


if not threadName or threadName=="":	if not threadName or threadName=="":
threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.show_thumbs(),self.absolute_url(),local=local,version=version)	threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.ImageStoragePath,self.destBasis,self.show_thumbs(),self.absolute_url(),local=local,version=version)
thread=Thread(target=threadStart)	thread=Thread(target=threadStart)

thread.start()	thread.start()
Line 784 class ImageCollection(OrderedFolder, Per	Line 922 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')
if RESPONSE:	self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE)
RESPONSE.write(ret.read())	#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)
RESPONSE.write("\n")	#if RESPONSE:
	# RESPONSE.write(ret.read())
	# RESPONSE.write("\n")

return "RESCALING STARTED"	return "RESCALING STARTED"

Line 801 class ImageCollection(OrderedFolder, Per	Line 951 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.getImageStoragePath(),dest=dest,scaleTo=1000,RESPONSE=RESPONSE)

	dest=os.path.join(self.scaledBasis,'medium')
	self.scale(dir=self.getImageStoragePath(),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,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath):
def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath):
self.id=id	self.id=id
self.title=title	self.title=title
self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString	self.defaultMetaString=defaultMetaString
self.serverPath=serverPath	self.serverPath=serverPath
	self.destBasis=destBasis
	self.srcBasis=srcBasis
self.defaultrows = 6	self.defaultrows = 6
self.defaultcols = 2	self.defaultcols = 2

Line 823 class ImageCollection(OrderedFolder, Per	Line 979 class ImageCollection(OrderedFolder, Per

manage_options = optTMP+(	manage_options = optTMP+(
{'label':'Main Config','action':'ImageCollection_config'},	{'label':'Main Config','action':'ImageCollection_config'},
	{'label':'Config Scaler','action':'configScaleForm'},
{'label':'Import','action':'ImportFiles'},	{'label':'Import','action':'ImportFiles'},
{'label':'Recalculate MetadataLink','action':'recalculateMetaLink'},	{'label':'Recalculate MetadataLink','action':'recalculateMetaLink'},
{'label':'Import Metadata File','action':'importMetaFileForm'},	{'label':'Import Metadata File','action':'importMetaFileForm'},
Line 1054 class ImageCollection(OrderedFolder, Per	Line 1211 class ImageCollection(OrderedFolder, Per

def ImportFiles2(self,RESPONSE=None):	def ImportFiles2(self,RESPONSE=None):
"""Import the existing files of a folder"""	"""Import the existing files of a folder"""
files=os.listdir(self.ImageStoragePath)	files=os.listdir(self.getImageStoragePath())
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 1071 class ImageCollection(OrderedFolder, Per	Line 1229 class ImageCollection(OrderedFolder, Per
self._setObject(file,newObj)	self._setObject(file,newObj)
#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.getImageStoragePath()

#scale thumb	#scale thumb

Line 1095 class ImageCollection(OrderedFolder, Per	Line 1253 class ImageCollection(OrderedFolder, Per

def ImportStructure(self,RESPONSE=None):	def ImportStructure(self,RESPONSE=None):
"""Import the existing files of a folder"""	"""Import the existing files of a folder"""
files=os.listdir(self.ImageStoragePath)	files=os.listdir(self.getImageStoragePath())
ret=""	ret=""
#print self.__dict__	#print self.__dict__


for file in files:	for file in files:

if os.path.isdir(os.path.join(self.ImageStoragePath,file)):	if os.path.isdir(os.path.join(self.getImageStoragePath(),file)):
imageStoragePath=os.path.join(self.ImageStoragePath,file)	ImageStoragePath=os.path.join(self.getImageStoragePath(),file)
imageViewerPath=os.path.join(self.ImageViewerPath,file)	imageViewerPath=os.path.join(self.ImageViewerPath,file)
manage_AddImageCollection(self,file,file,imageStoragePath,imageViewerPath,self.defaultMetaString)	manage_AddImageCollection(self,file,file,self.getImageStoragePath(),imageViewerPath,self.defaultMetaString)

obj=getattr(self,file)	obj=getattr(self,file)
obj.ImportStructure()	obj.ImportStructure()
Line 1125 class ImageCollection(OrderedFolder, Per	Line 1283 class ImageCollection(OrderedFolder, Per
"""nothing yet"""	"""nothing yet"""
#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.getImageStoragePath()

#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')

def ImportFiles(self,RESPONSE=None):	def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""	"""Import the existing files of a folder"""
files=os.listdir(self.ImageStoragePath)	files=os.listdir(self.getImageStoragePath())
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 1159 class ImageCollection(OrderedFolder, Per	Line 1319 class ImageCollection(OrderedFolder, Per
"""nothing yet"""	"""nothing yet"""
#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.getImageStoragePath()

#scale thumb	#scale thumb

Line 1180 class ImageCollection(OrderedFolder, Per	Line 1340 class ImageCollection(OrderedFolder, Per
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self)
return pt()	return pt()

def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath,RESPONSE=None):	def ChangeImageCollection(self,title,ImageViewerPath,defaultMetaString,serverPath,destBasis,srcBasis,RESPONSE=None):
"""Change"""	"""Change"""
self.title=title	self.title=title
self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString	self.defaultMetaString=defaultMetaString
self.serverPath=serverPath	self.serverPath=serverPath
	self.destBasis=destBasis
	self.srcBasis=srcBasis

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1453 class ImageCollection(OrderedFolder, Per	Line 1614 class ImageCollection(OrderedFolder, Per
return ret	return ret


def show_thumbs_selected_rows(self,numberOfColumns):	def show_thumbs_selected_rows(self,numberOfColumns,start=0,max=10000):
"""Ausgabe anzahl"""	"""Ausgabe anzahl"""
ids=self.show_selected_thumbs()	ids=self.show_selected_thumbs()

if not ids:	if not ids:
return None	return None
self.REQUEST.SESSION['ids']=ids	self.REQUEST.SESSION['ids']=ids
number=int(len(ids)/numberOfColumns)+1	number=min(start+int(len(ids)/numberOfColumns)+1,max)
self.REQUEST.SESSION['number']=range(number)
return range(number+1)	self.REQUEST.SESSION['number']=range(start,number)
	return range(start,number+1)

def setColTimesRowForm(self):	def setColTimesRowForm(self):
"""form for matrix setting"""	"""form for matrix setting"""
Line 1578 class ImageCollection(OrderedFolder, Per	Line 1740 class ImageCollection(OrderedFolder, Per
else:	else:
return ids[(row-1)*numberOfColumns:]	return ids[(row-1)*numberOfColumns:]

def thumblistSelected_old(self):
"""main template collection"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self)
return pt()

def thumblistSelected(self):	def thumblistSelected(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self)
return pt()	return pt()

def thumblist_old(self):
"""main template collection"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self)
return pt()

def thumblist(self):	def thumblist(self):
"""main template collection"""	"""main template collection"""
Line 1631 class ImageCollection(OrderedFolder, Per	Line 1785 class ImageCollection(OrderedFolder, Per

def getImageByName(self,filename,onlyName=None):	def getImageByName(self,filename,onlyName=None):
"""get filename"""	"""get filename"""
print repr(filename)	#print repr(filename)
#FIXME: umlaute in filename	#FIXME: umlaute in filename
fn=getattr(self,repr(filename),None)	fn=getattr(self,repr(filename),None)
if not fn:	if not fn:
filenameM=filename.split(".")[0]
	if os.path.splitext(filename)[1].lower() in imageExtensions:
	filenameM=os.path.splitext(filename)[0]
	else:
	filenameM=filename



founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])	founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])


for found in founds:	for found in founds:
foundM=found[0].split(".")[0]	if os.path.splitext(found[0])[1].lower() in imageExtensions:
	foundM=os.path.splitext(found[0])[0]
	else:
	foundM=found[0]

if filenameM.lower()==foundM.lower():	if filenameM.lower()==foundM.lower():
if onlyName:	if onlyName:
Line 1726 def manage_AddImageCollectionForm(self):	Line 1889 def manage_AddImageCollectionForm(self):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self)
return pt()	return pt()

def manage_AddImageCollection(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):	def manage_AddImageCollection(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):

"""Add ImageCollection"""	"""Add ImageCollection"""
newObj=ImageCollection(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)	newObj=ImageCollection(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath)
self._setObject(id,newObj)	self._setObject(id,newObj)

if RESPONSE is not None:	if RESPONSE is not None:
Line 1757 class ImageCollectionMD(ImageCollection,	Line 1921 class ImageCollectionMD(ImageCollection,

def ImportFiles(self,RESPONSE=None):	def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""	"""Import the existing files of a folder"""
files=os.listdir(self.ImageStoragePath)	files=os.listdir(self.getImageStoragePath())
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:
	logger("ImageArchiveMD:import", logging.INFO, "adding ZOPE: %s"%file)
ret=ret+"<br>"+file+" created!"	ret=ret+"<br>"+file+" created!"
newObj=ImageDigilib(file,file)	newObj=ImageDigilib(file,file)
#print newObj,file	#print newObj,file
Line 1775 class ImageCollectionMD(ImageCollection,	Line 1943 class ImageCollectionMD(ImageCollection,
except:	except:
"""nothing yet"""	"""nothing yet"""

	# check entry in database
args={}	args={}
args['_table']=self.imageCollectionConfig.getTable()	args['_table']=self.imageCollectionConfig.getTable()
args[self.imageCollectionConfig.getKey()]=file	args[self.imageCollectionConfig.getKey()]=file

if not self.ZSQLInlineSearch(args):	if not self.ZSQLInline(args=args):
self.ZSQLAdd(args)	logger("ImageArchiveMD:import", logging.INFO, "adding DB: %s"%file)
	self.ZSQLAdd(args=args)

#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.ImageStoragePath
Line 1795 class ImageCollectionMD(ImageCollection,	Line 1965 class ImageCollectionMD(ImageCollection,

self.scaleWorkingVersions()	self.scaleWorkingVersions()

	#self.scaleToJpgs()

if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

Line 1827 class ImageCollectionMD(ImageCollection,	Line 1999 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 2046 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

	overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])

if xml is None:	if overview:
RESPONSE.redirect('xmlinput?url='+urllib.quote(url))	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 1919 class ImageCollectionMD(ImageCollection,	Line 2119 class ImageCollectionMD(ImageCollection,

self.REQUEST.SESSION['filename']=filen[0:]	self.REQUEST.SESSION['filename']=filen[0:]

if not self.REQUEST.SESSION['filename']=="":	# if not self.REQUEST.SESSION['filename']=="":
url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()	# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
if mode=="view":	# if mode=="view":
self.REQUEST.RESPONSE.redirect(url)	# self.REQUEST.RESPONSE.redirect(url)
elif mode=="download":	# elif mode=="download":
self.REQUEST.RESPONSE.redirect(url+"/download")	# self.REQUEST.RESPONSE.redirect(url+"/download")
	#
if self.REQUEST.has_key('showall'):	if self.REQUEST.has_key('showall'):

self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')	self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
Line 1939 class ImageCollectionMD(ImageCollection,	Line 2139 class ImageCollectionMD(ImageCollection,


if overview and (generic =='No'):#	if overview and (generic =='No'):#
print "selected"
print repr(overview[0][1])
return overview[0][1]()	return overview[0][1]()
else:	else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
Line 2053 class ImageCollectionMD(ImageCollection,	Line 2252 class ImageCollectionMD(ImageCollection,
#return url	#return url

url=urllib.unquote(url)	url=urllib.unquote(url)

	url=url.replace(" ","+") # ersetze Leerzeichen in der URL durch "+"
	print url
xmldoc=urllib.urlopen(url).read()	xmldoc=urllib.urlopen(url).read()
#return xmldoc	#return xmldoc
try:	try:
dom=xml.dom.minidom.parseString(xmldoc)	dom=NonvalidatingReader.parseUri(url)

except:	except:
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.getElementsByTagName('image')

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

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



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

Line 2089 class ImageCollectionMD(ImageCollection,	Line 2293 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 2097 class ImageCollectionMD(ImageCollection,	Line 2303 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
Line 2110 class ImageCollectionMD(ImageCollection,	Line 2316 class ImageCollectionMD(ImageCollection,
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
return pt()	return pt()

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

def selection(self):	def selection(self):
"""show only selected"""	"""show only selected"""
Line 2133 def manage_AddImageCollectionMDForm(self	Line 2337 def manage_AddImageCollectionMDForm(self
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)
return pt()	return pt()

def manage_AddImageCollectionMD(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):	def manage_AddImageCollectionMD(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):
"""Add ImageCollection"""	"""Add ImageCollection"""
newObj=ImageCollectionMD(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)	newObj=ImageCollectionMD(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath)
self._setObject(id,newObj)	self._setObject(id,newObj)

if RESPONSE is not None:	if RESPONSE is not None:
Line 2273 def manage_AddImageZogiLib(self,id=None,	Line 2477 def manage_AddImageZogiLib(self,id=None,
self._setObject(id,newObj)	self._setObject(id,newObj)
getattr(self,id).caption=caption[0:]	getattr(self,id).caption=caption[0:]
if fileUpload:	if fileUpload:
getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)	getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())

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.82
changed lines
	Added in v.1.103