ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.44 and 1.48

version 1.44, 2005/01/25 12:26:56	version 1.48, 2005/03/18 14:28:00
Line 13 import operator	Line 13 import operator
import tempfile	import tempfile
import shutil	import shutil
from types import *	from types import *
	import time

try:	try:
from Products.ECHO_content.ECHO_collection import ECHO_basis	from Products.ECHO_content.ECHO_collection import ECHO_basis
Line 193 class ImageDigilib(Folder,Persistent,Imp	Line 193 class ImageDigilib(Folder,Persistent,Imp
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename)	self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")	self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
#print path	#print path
imagefh=urllib.urlopen(path)	imagefh=urllib.urlopen(path,'rb')

self.REQUEST.RESPONSE.write(imagefh.read())	self.REQUEST.RESPONSE.write(imagefh.read())
self.REQUEST.RESPONSE.close()	self.REQUEST.RESPONSE.close()
Line 223 class ImageDigilib(Folder,Persistent,Imp	Line 223 class ImageDigilib(Folder,Persistent,Imp

#umbenennen des versionsfolders	#umbenennen des versionsfolders
oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")	oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")
if os.path.exists(oldfolder):
newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")	newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
	if os.path.exists(oldfolder):
os.rename(oldfolder,newfolder)	os.rename(oldfolder,newfolder)
	else:
	os.mkdir(newfolder)

	#schreibe info uber umbennenung

	renameName=os.path.join(newfolder,"renamed")
	if os.path.exists(renameName):
	fh=file(renameName,'a')
	else:
	fh=file(renameName,'w')

	tm=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
	try:
	user=self.REQUEST['AUTHENTICATED_USER']
	except:
	user="unknown"

	str="""%s %s %s %s\n"""%(tm,user,oldname,newname)
	fh.write(str)
	fh.close()

#scale thumb	#scale thumb

Line 288 class ImageDigilib(Folder,Persistent,Imp	Line 308 class ImageDigilib(Folder,Persistent,Imp

return "done"	return "done"

def thumb(self):	def thumb(self,url=None):
"""show thumb"""	"""show thumb"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"	thumbname=os.path.splitext(self.filename)[0]+".jpg"
## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname):	## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname):
Line 303 class ImageDigilib(Folder,Persistent,Imp	Line 323 class ImageDigilib(Folder,Persistent,Imp
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&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
	if url:
	return "<img border=\"0\" src=\"%s\">"% path
	else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self)
return pt()	return pt()

Line 833 class ImageCollection(Folder, Persistent	Line 856 class ImageCollection(Folder, Persistent

def show_selected_thumbs(self):	def show_selected_thumbs(self):
#ids=[]	#ids=[]
	try:
return self.REQUEST.SESSION['filenames']	return self.REQUEST.SESSION['filenames']
	except:
	return None
def show_thumbs(self):	def show_thumbs(self):
ids=[]	ids=[]
for entry in self.__dict__:	for entry in self.__dict__:
Line 974 class ImageCollection(Folder, Persistent	Line 998 class ImageCollection(Folder, Persistent
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()

	if not ids:
	return None
self.REQUEST.SESSION['ids']=ids	self.REQUEST.SESSION['ids']=ids
number=int(len(ids)/numberOfColumns)+1	number=int(len(ids)/numberOfColumns)+1
self.REQUEST.SESSION['number']=range(number)	self.REQUEST.SESSION['number']=range(number)
Line 1044 class ImageCollection(Folder, Persistent	Line 1071 class ImageCollection(Folder, Persistent
return 0	return 0
if self.REQUEST.SESSION.has_key("filename"):	if self.REQUEST.SESSION.has_key("filename"):
filename=self.REQUEST.SESSION["filename"]	filename=self.REQUEST.SESSION["filename"]
	filename=self.getImageByName(filename,onlyName="yes")

try:	try:
startId=filename	startId=filename
Line 1137 class ImageCollection(Folder, Persistent	Line 1164 class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self)
return pt()	return pt()

	def getImageByName(self,filename,onlyName=None):
	"""get filename"""

	fn=getattr(self,filename,None)
	if not fn:
	filenameM=filename.split(".")[0]
	founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
	for found in founds:
	foundM=found[0].split(".")[0]
	if filenameM.lower()==foundM.lower():
	if onlyName:
	return found[0]
	else:
	return found[1]
	if onlyName:
	return filename
	else:
	return fn
def index_html(self):	def index_html(self):
"""main template collection"""	"""main template collection"""
if self.REQUEST.has_key('filename'):	if self.REQUEST.has_key('filename'):

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

Removed from v.1.44
changed lines
	Added in v.1.48