ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

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

version 1.79, 2006/05/15 15:21:07	version 1.82, 2006/05/16 15:56:18
Line 491 class ImageDigilib(Folder,Persistent,Imp	Line 491 class ImageDigilib(Folder,Persistent,Imp
RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)	RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)


def updateImage(self,file,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.ImageStoragePath,self.getId())

	identifyField="filename"

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

Line 525 class ImageDigilib(Folder,Persistent,Imp	Line 529 class ImageDigilib(Folder,Persistent,Imp
try:	try:
os.chmod(imagePath,0664)	os.chmod(imagePath,0664)
except:	except:
"""hack"""	pass
#scale thumb	#scale thumb

self.scaleThumbs()	self.scaleThumbs()
Line 534 class ImageDigilib(Folder,Persistent,Imp	Line 538 class ImageDigilib(Folder,Persistent,Imp

self.scaleWorkingVersions()	self.scaleWorkingVersions()

if rename:	if _rename:
self.renameImage(file.filename)	self.renameImage(file.filename)


	args=self.REQUEST.form

	args['-identify']=identifyField+"="+args['_identifyField']

	self.ZSQLChange(args=args)

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

Line 1626 class ImageCollection(OrderedFolder, Per	Line 1636 class ImageCollection(OrderedFolder, Per
fn=getattr(self,repr(filename),None)	fn=getattr(self,repr(filename),None)
if not fn:	if not fn:
filenameM=filename.split(".")[0]	filenameM=filename.split(".")[0]

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]	foundM=found[0].split(".")[0]

	if filenameM.lower()==foundM.lower():
	if onlyName:
	return found[0]
	else:
	return found[1]
	#HACK teste noch ob am ende des filenames eventuell ein "_" und loesche das.
	if foundM[-1]=="_":
	foundM=foundM[0:-1]

if filenameM.lower()==foundM.lower():	if filenameM.lower()==foundM.lower():
if onlyName:	if onlyName:
return found[0]	return found[0]
else:	else:
return found[1]	return found[1]

if onlyName:	if onlyName:
return filename	return filename
else:	else:
Line 1731 class ImageCollectionMD(ImageCollection,	Line 1755 class ImageCollectionMD(ImageCollection,
pass	pass


	def ImportFiles(self,RESPONSE=None):
	"""Import the existing files of a folder"""
	files=os.listdir(self.ImageStoragePath)
	ret=""
	#print self.__dict__
	for file in files:
	if not file[0]==".":
	if self.__dict__.has_key(file):

	ret=ret+"<br>"+file+" already exists!"
	else:
	ret=ret+"<br>"+file+" created!"
	newObj=ImageDigilib(file,file)
	#print newObj,file
	#print newObj
	try:
	self._setObject(file,newObj)
	except:
	"""nothing yet"""


	args={}
	args['_table']=self.imageCollectionConfig.getTable()
	args[self.imageCollectionConfig.getKey()]=file

	if not self.ZSQLInlineSearch(args):
	self.ZSQLAdd(args)
	#print ret
	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
	#print self.ImageStoragePath

	#scale thumb


	self.scaleThumbs()

	#scale standard

	self.scaleWorkingVersions()

	if RESPONSE:
	RESPONSE.redirect('manage_main')

def addImage(self):	def addImage(self):
"""Add an Image"""	"""Add an Image"""

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

def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None,**argv):	def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None):
"""Add"""	"""Add"""

filenameKey="filename"	filenameKey="filename"
Line 1755 class ImageCollectionMD(ImageCollection,	Line 1822 class ImageCollectionMD(ImageCollection,

manage_AddImageDigilib(self,fn,_fileupload,meta=meta)	manage_AddImageDigilib(self,fn,_fileupload,meta=meta)

args[key]=_filename	args=self.REQUEST.form
	args[filenameKey]=fn

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

if RESPONSE:	if RESPONSE:
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)	return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
Line 1805 class ImageCollectionMD(ImageCollection,	Line 1873 class ImageCollectionMD(ImageCollection,
#context.ZSQLFind(_table='vision_main')	#context.ZSQLFind(_table='vision_main')
urlTmp=REQUEST['URL1']	urlTmp=REQUEST['URL1']

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

if xml is None:	if xml is None:
RESPONSE.redirect('xmlinput?url='+urllib.quote(url))	RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
Line 1900 class ImageCollectionMD(ImageCollection,	Line 1968 class ImageCollectionMD(ImageCollection,

if not selected and self.REQUEST.has_key('fn'):	if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]	imagename=self.REQUEST['fn'].split('/')[-1]

	imagename=self.getImageByName(imagename,onlyName=True)

nr=self.getObjectPosition(imagename)	nr=self.getObjectPosition(imagename)

objects=self.objectIds()	objects=self.objectIds()
Line 1914 class ImageCollectionMD(ImageCollection,	Line 1985 class ImageCollectionMD(ImageCollection,

if not selected and self.REQUEST.has_key('fn'):	if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]	imagename=self.REQUEST['fn'].split('/')[-1]

	imagename=self.getImageByName(imagename,onlyName=True)

nr=self.getObjectPosition(imagename)	nr=self.getObjectPosition(imagename)

objects=self.objectIds()	objects=self.objectIds()

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

Removed from v.1.79
changed lines
	Added in v.1.82