ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.22 and 1.25

version 1.22, 2004/06/25 12:49:01	version 1.25, 2004/07/27 13:36:36
Line 38 class ImageDigilib(Folder,Persistent,Imp	Line 38 class ImageDigilib(Folder,Persistent,Imp

request=self.REQUEST	request=self.REQUEST
objectCreate=objectType.createObjectManager(id,request)	objectCreate=objectType.createObjectManager(id,request)
#for field in self.leiden_meta_fields:
# self.REQUEST[field]=argv[field]
self._setObject(id,objectCreate)	self._setObject(id,objectCreate)

objectCreate.propertysheets.meta.manage_editProperties(request)	objectCreate.propertysheets.meta.manage_editProperties(request)
Line 78 class ImageDigilib(Folder,Persistent,Imp	Line 77 class ImageDigilib(Folder,Persistent,Imp
os.chmod(filename,0644)	os.chmod(filename,0644)
except:	except:
"""hack"""	"""hack"""

os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)	os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)


Line 167 class ImageCollection(Folder, Persistent	Line 167 class ImageCollection(Folder, Persistent
{'label':'Recalculate Metadata','action':'recalculateMeta'},	{'label':'Recalculate Metadata','action':'recalculateMeta'},
{'label':'Import Metadata','action':'importMetaForm'},	{'label':'Import Metadata','action':'importMetaForm'},
{'label':'Rescale thumbs','action':'scaleThumbs'},	{'label':'Rescale thumbs','action':'scaleThumbs'},
	{'label':'Weight (ECHO)','action':'weightForm'},
)	)

	def weightForm(self):
	"""Weight"""
	pt=PageTemplateFile('Products/ImageArchive/zpt/changeWeight.zpt').__of__(self)
	return pt()

	def changeWeight(self,weight,RESPONSE=None):
	"""Change weight"""
	self.weight=weight

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


def importMetaForm(self):	def importMetaForm(self):
"""import metadata"""	"""import metadata"""
Line 494 class ImageCollection(Folder, Persistent	Line 507 class ImageCollection(Folder, Persistent
else:	else:
return ""	return ""

	def showRuler(self,selected=None):
	"""show ruler"""
	showall =self.REQUEST.SESSION.get('showall','no')
	if showall=='no':
	ids=self.show_thumbs()
	colRows=self.getColTimesRow()
	num=int(len(ids)/(colRows[0]*colRows[1]))
	a=colRows[0]*colRows[1]
	if num/a+1>1:

	ret="<b>Show thumbnail group no:</b></br>"
	for i in range(num/a+1):
	k=i*a
	if selected:
	href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
	else:
	href=self.REQUEST['URL1']+"?filename="+ids[k]

	ret+="""<a href="%s" target=_"top">%i</a>  """%(href,i)

	else:
	ret=""
	ret+="""<a href="%s?showall=yes" target="_top">show all</a> """%self.REQUEST['URL1']
	else:
	ret="""<a href="%s?showall=no" target="_top">show groups</a> """%self.REQUEST['URL1']

	return ret

def show_thumbs_selected_rows(self,numberOfColumns):	def show_thumbs_selected_rows(self,numberOfColumns):
"""Ausgabe anzahl"""	"""Ausgabe anzahl"""
ids=self.show_selected_thumbs()	ids=self.show_selected_thumbs()
Line 527 class ImageCollection(Folder, Persistent	Line 568 class ImageCollection(Folder, Persistent

RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")	RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")

def getColTimesRow(self):	def getColTimesRow(self,showall='No'):
"""coltimesrow"""	"""coltimesrow"""

REQUEST=self.REQUEST	REQUEST=self.REQUEST
Line 551 class ImageCollection(Folder, Persistent	Line 592 class ImageCollection(Folder, Persistent
if rows:	if rows:
if cols*rows >idsnumber:	if cols*rows >idsnumber:
rows=int(idsnumber/cols)+1	rows=int(idsnumber/cols)+1

	#print cols,rows
	if showall=='yes':
	rows=int(idsnumber/cols)+1

return (cols,rows)	return (cols,rows)


Line 561 class ImageCollection(Folder, Persistent	Line 607 class ImageCollection(Folder, Persistent

if self.REQUEST.SESSION.has_key("filename"):	if self.REQUEST.SESSION.has_key("filename"):
filename=self.REQUEST.SESSION["filename"]	filename=self.REQUEST.SESSION["filename"]


try:	try:
startId=filename	startId=filename
	if startId=="":
	startId=idsAll[0][0:]
except:	except:
startId=idsAll[0]	startId=idsAll[0][0:]
else:	else:
startId=idsAll[0]	startId=idsAll[0][0:]



print "NOR:",numberOfRows

if numberOfRows:	if numberOfRows:

	startPic=idsAll.index(startId)
try:	try:

startPic=idsAll.index(startId)	startPic=idsAll.index(startId)
endPic=startPic+numberOfColumns*numberOfRows	endPic=startPic+numberOfColumns*numberOfRows
ids=idsAll[startPic:endPic]	ids=idsAll[startPic:endPic]
except:	except:
ids=idsAll	ids=idsAll
else:	else:

ids=idsAll	ids=idsAll


Line 616 class ImageCollection(Folder, Persistent	Line 670 class ImageCollection(Folder, Persistent
pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self)
return pt()	return pt()

	def thumblistNewWindow(self):
	"""Thumbs mit clik neues Fenster oeffnen"""
	pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self)
	return pt()


def navig_selected_html(self):	def navig_selected_html(self):
"""navigation"""	"""navigation"""
#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']	#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
Line 645 class ImageCollection(Folder, Persistent	Line 705 class ImageCollection(Folder, Persistent
filen=self.REQUEST['filename']	filen=self.REQUEST['filename']
else:	else:
filen=""	filen=""

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

	if self.REQUEST.has_key('showall'):

	self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
	else:
	self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')


pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self)
return pt()	return pt()

Line 669 class ImageCollectionIFrame(ImageCollect	Line 738 class ImageCollectionIFrame(ImageCollect
meta_type="ImageCollectionIFrame"	meta_type="ImageCollectionIFrame"
label=ImageCollection.title	label=ImageCollection.title

	def getImageTag(self):
	""" hack : method needed by echo_content"""
	return ""

def rotate(self,angle,url,RESPONSE):	def rotate(self,angle,url,RESPONSE):
"""rotate"""	"""rotate"""

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

Removed from v.1.22
changed lines
	Added in v.1.25