ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.81 and 1.85

version 1.81, 2006/05/16 10:28:08	version 1.85, 2006/05/17 19:43:45
Line 390 class ImageDigilib(Folder,Persistent,Imp	Line 390 class ImageDigilib(Folder,Persistent,Imp
"""hack"""	"""hack"""
#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()



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

#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()


if RESPONSE:	if RESPONSE:
Line 532 class ImageDigilib(Folder,Persistent,Imp	Line 532 class ImageDigilib(Folder,Persistent,Imp
pass	pass
#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()

if _rename:	if _rename:
self.renameImage(file.filename)	self.renameImage(file.filename)
Line 1075 class ImageCollection(OrderedFolder, Per	Line 1075 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 1163 class ImageCollection(OrderedFolder, Per	Line 1163 class ImageCollection(OrderedFolder, Per

#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

Line 1755 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=args):
	self.ZSQLAdd(args=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"""

Line 1876 class ImageCollectionMD(ImageCollection,	Line 1919 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 1896 class ImageCollectionMD(ImageCollection,	Line 1939 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)

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

Removed from v.1.81
changed lines
	Added in v.1.85