ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.16 and 1.26

version 1.16, 2004/02/25 18:30:29	version 1.26, 2004/08/03 13:36:30
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 52 class ImageDigilib(Folder,Persistent,Imp	Line 51 class ImageDigilib(Folder,Persistent,Imp

def addMetaObjectForm(self):	def addMetaObjectForm(self):
"""Add Form"""	"""Add Form"""
pt=PageTemplateFile('Products/ImageArchive/addMetaObject.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/addMetaObject.zpt').__of__(self)
return pt()	return pt()


Line 74 class ImageDigilib(Folder,Persistent,Imp	Line 73 class ImageDigilib(Folder,Persistent,Imp
f=open(filename,"w")	f=open(filename,"w")
f.write(filedata)	f.write(filedata)
f.close()	f.close()
	try:
os.chmod(filename,0644)	os.chmod(filename,0644)
	except:
	"""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 83 class ImageDigilib(Folder,Persistent,Imp	Line 86 class ImageDigilib(Folder,Persistent,Imp

def download(self):	def download(self):
"""download"""	"""download"""
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,highres"	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires"
#self.REQUEST.SESSION['string']="<img src=\"%s\">"% path	#self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
#pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
return self.REQUEST.RESPONSE.redirect(path)	return self.REQUEST.RESPONSE.redirect(path)
Line 103 class ImageDigilib(Folder,Persistent,Imp	Line 106 class ImageDigilib(Folder,Persistent,Imp
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"
#path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname	#path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname
self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path	self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path
pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self)
return pt()	return pt()

def index_html(self):	def index_html(self):
"""show image"""	"""show image"""
#DEVELOP: take first one for server	#DEVELOP: take first one for server

path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename	path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename

#path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename	#path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
#self.REQUEST.SESSION['string']="<img src=\"%s\">"% path	#self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
Line 120 class ImageDigilib(Folder,Persistent,Imp	Line 123 class ImageDigilib(Folder,Persistent,Imp

def manage_AddImageDigilibForm(self):	def manage_AddImageDigilibForm(self):
"""Nothing yet"""	"""Nothing yet"""
pt=PageTemplateFile('Products/ImageArchive/AddImageDigilibForm.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self)
return pt()	return pt()

def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None):	def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None):
Line 164 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"""
pt=PageTemplateFile('Products/ImageArchive/importMeta.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self)
return pt()	return pt()

def importMeta(self,fileupload,tag):	def importMeta(self,fileupload,tag):
Line 287 class ImageCollection(Folder, Persistent	Line 303 class ImageCollection(Folder, Persistent
rc.append(str(text))	rc.append(str(text))
rc.sort()	rc.sort()
self.REQUEST.SESSION['filenames']=rc	self.REQUEST.SESSION['filenames']=rc
pt=PageTemplateFile('Products/ImageArchive/overview_selected.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self)
return pt()	return pt()

def recalculateMeta(self):	def recalculateMeta(self):
Line 303 class ImageCollection(Folder, Persistent	Line 319 class ImageCollection(Folder, Persistent

def addImage(self):	def addImage(self):
"""Add an Image"""	"""Add an Image"""
pt=PageTemplateFile('Products/ImageArchive/addImage.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/addImage.zpt').__of__(self)
return pt()	return pt()

def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None):	def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None):
Line 375 class ImageCollection(Folder, Persistent	Line 391 class ImageCollection(Folder, Persistent
if not hasattr(self,'defaultMetaString'):	if not hasattr(self,'defaultMetaString'):
self.defaultMetaString=""	self.defaultMetaString=""

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

def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):	def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
Line 491 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]
	#print num,num+1
	if num+1>1:

	ret="<b>Show thumbnail group no:</b></br>"
	for i in range(num+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 501 class ImageCollection(Folder, Persistent	Line 546 class ImageCollection(Folder, Persistent

def setColTimesRowForm(self):	def setColTimesRowForm(self):
"""form for matrix setting"""	"""form for matrix setting"""
pt=PageTemplateFile('Products/ImageArchive/selectColTimesRow.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self)
return pt()	return pt()

def setDone(self):	def setDone(self):
"""done"""	"""done"""

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

def setColTimesRow(self,cols,rows):	def setColTimesRow(self,cols,rows):
Line 524 class ImageCollection(Folder, Persistent	Line 569 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 534 class ImageCollection(Folder, Persistent	Line 579 class ImageCollection(Folder, Persistent
try:	try:
rows=int(REQUEST.cookies["ImageViewerRows"])	rows=int(REQUEST.cookies["ImageViewerRows"])
except:	except:
rows=None	rows=6
else:	else:
rows=None	rows=6

if REQUEST.cookies.has_key("ImageViewerCols"):	if REQUEST.cookies.has_key("ImageViewerCols"):
#print "COLS",REQUEST.cookies["ImageViewerCols"]	#print "COLS",REQUEST.cookies["ImageViewerCols"]
cols=int(REQUEST.cookies["ImageViewerCols"])	cols=int(REQUEST.cookies["ImageViewerCols"])
else:	else:
cols=3	cols=2

idsnumber=len(self.show_thumbs())	idsnumber=len(self.show_thumbs())
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 558 class ImageCollection(Folder, Persistent	Line 608 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 595 class ImageCollection(Folder, Persistent	Line 653 class ImageCollection(Folder, Persistent

def thumblistSelected_old(self):	def thumblistSelected_old(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile('Products/ImageArchive/thumbselected.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected.zpt').__of__(self)
return pt()	return pt()

def thumblistSelected(self):	def thumblistSelected(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile('Products/ImageArchive/thumbselected2.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected2.zpt').__of__(self)
return pt()	return pt()

def thumblist_old(self):	def thumblist_old(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile('Products/ImageArchive/thumbs.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/thumbs.zpt').__of__(self)
return pt()	return pt()

def thumblist(self):	def thumblist(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile('Products/ImageArchive/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']
pt=PageTemplateFile('Products/ImageArchive/navigation_selected.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/navigation_selected.zpt').__of__(self)
return pt()	return pt()

def navig_html(self):	def navig_html(self):
"""navigation"""	"""navigation"""
#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']	#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
pt=PageTemplateFile('Products/ImageArchive/navigation.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/navigation.zpt').__of__(self)
return pt()	return pt()


Line 633 class ImageCollection(Folder, Persistent	Line 697 class ImageCollection(Folder, Persistent
else:	else:
filen=""	filen=""
self.REQUEST.SESSION['filename']=filen	self.REQUEST.SESSION['filename']=filen
pt=PageTemplateFile('Products/ImageArchive/overview_selected2.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected2.zpt').__of__(self)
return pt()	return pt()

def index_html(self):	def index_html(self):
Line 642 class ImageCollection(Folder, Persistent	Line 706 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
pt=PageTemplateFile('Products/ImageArchive/overview.zpt').__of__(self)
	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)
return pt()	return pt()

def manage_AddImageCollectionForm(self):	def manage_AddImageCollectionForm(self):
"""Nothing yet"""	"""Nothing yet"""
pt=PageTemplateFile('Products/ImageArchive/AddImageCollectionForm.zpt').__of__(self)	pt=PageTemplateFile('Products/ImageArchive/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,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
Line 657 def manage_AddImageCollection(self,id,ti	Line 730 def manage_AddImageCollection(self,id,ti
self._setObject(id,newObj)	self._setObject(id,newObj)

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


	class ImageCollectionIFrame(ImageCollection):
	"""Class fuer Collection set als IFrame"""

	meta_type="ImageCollectionIFrame"
	label=ImageCollection.title

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

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

	RESPONSE.redirect("javascript:document.domain='mpg.de';parent.iframe.right.rotation(%i)"%int(angle))
	RESPONSE.redirect(url)
	def request(self):
	"""request"""
	return self.REQUEST

	def index_html(self):
	"""index"""
	if self.REQUEST.has_key('filename'):
	filen=self.REQUEST['filename']
	else:
	filen=""
	self.REQUEST.SESSION['filename']=filen


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

	def iframe_html(self):
	"""iframe"""
	if self.REQUEST.has_key('filename'):
	filen=self.REQUEST['filename']
	else:
	filen=""
	self.REQUEST.response.setCookie('filename',filen)
	pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self)
	return pt()


	def manage_AddImageCollectionIFrameForm(self):
	"""Nothing yet"""
	pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self)
	return pt()

	def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
	"""Add ImageCollection"""
	newObj=ImageCollectionIFrame(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
	self._setObject(id,newObj)

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

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

Removed from v.1.16
changed lines
	Added in v.1.26