ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.31 and 1.40

version 1.31, 2004/11/11 19:12:39	version 1.40, 2004/11/24 17:03:23
Line 1	Line 1
from OFS.Folder import Folder	from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
from Globals import Persistent	from Globals import Persistent,package_home
from Acquisition import Implicit	from Acquisition import Implicit
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate	from Products.PageTemplates.PageTemplate import PageTemplate
Line 13 import operator	Line 13 import operator
import tempfile	import tempfile
import shutil	import shutil


	try:
	from Products.ECHO_content.ECHO_collection import ECHO_basis
	except:
	print "ECHO Elements not imported"
	class ECHO_basis:
	"""leer"""
	manage_options=()


def splitPath(str):	def splitPath(str):
str2=str.replace("\\","/")	str2=str.replace("\\","/")
return os.path.split(str2)[1]	return os.path.split(str2)[1]
Line 58 class ImageDigilib(Folder,Persistent,Imp	Line 68 class ImageDigilib(Folder,Persistent,Imp

def addMetaObjectForm(self):	def addMetaObjectForm(self):
"""Add Form"""	"""Add Form"""
pt=PageTemplateFile('Products/ImageArchive/zpt/addMetaObject.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMetaObject.zpt')).__of__(self)
return pt()	return pt()


Line 85 class ImageDigilib(Folder,Persistent,Imp	Line 95 class ImageDigilib(Folder,Persistent,Imp
os.chmod(filename,0644)	os.chmod(filename,0644)
except:	except:
"""hack"""	"""hack"""
	#scale thumb

	self.scaleThumbs()

	#scale standard

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



	def downloadWorkingVersion(self):
	"""download working version (2000 pixel)"""

def download(self):	return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg")

	def download(self,fmt="&mo=rawfile,hires",suffix=None):
"""download"""	"""download"""
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires"	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt

if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename):	if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename):
filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename	filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename
else:	else:
filename=self.filename	filename=self.filename

	if suffix:
	filename=os.path.splitext(filename)[0]+suffix

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")
image=urllib.urlopen(path).read()	image=urllib.urlopen(path).read()
Line 106 class ImageDigilib(Folder,Persistent,Imp	Line 129 class ImageDigilib(Folder,Persistent,Imp
self.REQUEST.RESPONSE.close()	self.REQUEST.RESPONSE.close()
#return self.REQUEST.RESPONSE.redirect(path)	#return self.REQUEST.RESPONSE.redirect(path)

	def updateImageForm(self):
	"""form"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
	return pt()

	def updateImage(self,file,RESPONSE):
	"""lade neues Version des Bildes"""
	#teste ob Dokumenten ordner schon vorhanden
	imagePath=os.path.join(self.ImageStoragePath,self.getId())
	path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")
	print "path",path
	if not os.path.exists(path):
	os.mkdir(path,0775)
	os.chmod(path,0775)

	versionNumber=getattr(self,'versionNumber',0)+1

	#teste ob version schon existiert

	while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))):
	versionNumber+=1

	#kopieren der bestehenden Version in den Versions ordner.
	imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))
	os.rename(imagePath,imageNewPath)

	#lesen des upload files und schreiben
	filedata=file.read()
	f=open(imagePath,"w")
	f.write(filedata)
	f.close()
	try:
	os.chmod(imagePath,0664)
	except:
	"""hack"""
	#scale thumb

	self.scaleThumbs()

	#scale standard

	self.scaleWorkingVersions()

	if RESPONSE:
	RESPONSE.redirect(self.absolute_url())

	return "done"

def thumb(self):	def thumb(self):
"""show thumb"""	"""show thumb"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"	thumbname=os.path.splitext(self.filename)[0]+".jpg"
Line 118 class ImageDigilib(Folder,Persistent,Imp	Line 189 class ImageDigilib(Folder,Persistent,Imp

#DEVEL:take nausikaa for server solution	#DEVEL:take nausikaa for server solution

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+"/"+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
pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename	path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]

#path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
#self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
#pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
return self.REQUEST.RESPONSE.redirect(path)	return self.REQUEST.RESPONSE.redirect(path)


def manage_AddImageDigilibForm(self):	def manage_AddImageDigilibForm(self):
"""Nothing yet"""	"""Nothing yet"""
pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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 154 def manage_AddImageDigilib(self,id,fileu	Line 221 def manage_AddImageDigilib(self,id,fileu
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


class ImageCollection(Folder, Persistent, Implicit):	class ImageCollection(Folder, Persistent, Implicit,ECHO_basis):
"""Sammelordner f�r Bilder"""	"""Sammelordner f�r Bilder"""
meta_type="ImageCollection"	meta_type="ImageCollection"



genericMetaDataType="leiden_meta"	genericMetaDataType="leiden_meta"

leiden_meta_fields=['image_id','date','country','place','people','description','photographer']	leiden_meta_fields=['image_id','date','country','place','people','description','photographer']
Line 167 class ImageCollection(Folder, Persistent	Line 236 class ImageCollection(Folder, Persistent



def createSet(self,RESPONSE=None):	def createSet(self,RESPONSE=None,local=None,version="working"):
"""download aller gewaehlten files"""	"""download aller gewaehlten files"""
tempfile.tempdir="/tmp/archivesImageServer"	tempfile.tempdir="/tmp/archivesImageServer"

Line 196 class ImageCollection(Folder, Persistent	Line 265 class ImageCollection(Folder, Persistent
return 0	return 0

for id in self.REQUEST.SESSION['filenames']:	for id in self.REQUEST.SESSION['filenames']:
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires"

image=urllib.urlopen(path).read()
if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):	if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):
filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0]	filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0]
else:	else:
filename=id[0]	filename=id[0]

	if RESPONSE:
	RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))

	if local:
	if version=="working":
	sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
	else:
	sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]
	targetPath=tmpPath+"/"+filename
	try:
	shutil.copyfile(sourcePath,targetPath)
	except:
	if RESPONSE:
	RESPONSE.write(str("<p>Error in File: %s (possible missing)<br>\n"%filename))
	else:
	"""nothing"""
	else:
	if version=="working":
	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
	else:
	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires"
	image=urllib.urlopen(path).read()


fh=file(tmpPath+"/"+filename,"w")	fh=file(tmpPath+"/"+filename,"w")
if RESPONSE:
RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))

fh.write(image)	fh.write(image)
	fh.close()

#folgeseiten	#folgeseiten
if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1:	if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1:
Line 220 class ImageCollection(Folder, Persistent	Line 309 class ImageCollection(Folder, Persistent
numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1]	numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1]
for k in range(int(numberOfPages)-1):	for k in range(int(numberOfPages)-1):
i=k+1	i=k+1

path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"&/"+ids[nr+i]+"&mo=rawfile,hires"

image=urllib.urlopen(path).read()
if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):	if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):
filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i]	filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i]
else:	else:
filename=id[0]	filename=id[0]



fh=file(tmpPath+"/"+filename,"w")
if RESPONSE:	if RESPONSE:
RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))	RESPONSE.write(str("<p>Get File: %s<br>\n"%filename))

fh.write(image)	if local:
	sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+ids[nr+1]
	targetPath=tmpPath+"/"+filename
	try:
	shutil.copyfile(sourcePath,targetPath)
	except:
	if RESPONSE:
	RESPONSE.write(str("<p>Error in File: %s (missing?)<br>\n"%filename))
	else:
	"""nothing"""
	else:
	path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"

	image=urllib.urlopen(path).read()


	fh=file(tmpPath+"/"+filename,"w")
	fh.write(image)
fh.close()	fh.close()

if RESPONSE:	if RESPONSE:
Line 288 class ImageCollection(Folder, Persistent	Line 385 class ImageCollection(Folder, Persistent
def scaleThumbs(self,RESPONSE=None):	def scaleThumbs(self,RESPONSE=None):
"""scale thumbs"""	"""scale thumbs"""

	#scale thumbs
	ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
	if RESPONSE:
	RESPONSE.write(ret.read())
	RESPONSE.write("\n")

os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
return "RESCALING STARTED"	return "RESCALING STARTED"

	def scaleWorkingVersions(self,RESPONSE=None):
	"""scale working versions"""

	#scale standard

	ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)
	if RESPONSE:
	RESPONSE.write(ret.read())
	RESPONSE.write("\n")
	return "rescaling started"



def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString):	def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString):
self.id=id	self.id=id
self.title=title	self.title=title
Line 299 class ImageCollection(Folder, Persistent	Line 413 class ImageCollection(Folder, Persistent
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString	self.defaultMetaString=defaultMetaString

manage_options = Folder.manage_options+(	if ECHO_basis:
	optTMP= Folder.manage_options+ECHO_basis.manage_options
	else:
	optTMP= Folder.manage_options

	manage_options = optTMP+(
{'label':'Main Config','action':'ImageCollection_config'},	{'label':'Main Config','action':'ImageCollection_config'},
{'label':'Import','action':'ImportFiles'},	{'label':'Import','action':'ImportFiles'},
{'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'},	{'label':'Rescale working version','action':'scaleWorkingVersions'},
)	)

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/zpt/importMeta.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importMeta.zpt')).__of__(self)
return pt()	return pt()

def importMeta(self,fileupload,tag):	def importMeta(self,fileupload,tag):
Line 434 class ImageCollection(Folder, Persistent	Line 542 class ImageCollection(Folder, Persistent

url=urllib.unquote(url)	url=urllib.unquote(url)
xmldoc=urllib.urlopen(url).read()	xmldoc=urllib.urlopen(url).read()
#print url	#return xmldoc
try:	try:
dom=xml.dom.minidom.parseString(xmldoc)	dom=xml.dom.minidom.parseString(xmldoc)
except:	except:
Line 445 class ImageCollection(Folder, Persistent	Line 553 class ImageCollection(Folder, Persistent
fnIds={}	fnIds={}
for image in images:	for image in images:
imagename=image.getElementsByTagName('imagename')[0]	imagename=image.getElementsByTagName('imagename')[0]
text=getText(imagename.childNodes)


idnr=image.getElementsByTagName('idnr')[0]	idnr=image.getElementsByTagName('idnr')[0]
id=getText(idnr.childNodes)	id=getText(idnr.childNodes)
numberOfPages=image.getElementsByTagName('numberOfPages')[0]	numberOfPages=image.getElementsByTagName('numberOfPages')[0]
nop=getText(numberOfPages.childNodes)	nopT=getText(numberOfPages.childNodes)
	try:
	nop=int(nopT)
	except:
	nop=0
	texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
	for text in texts:
if not text=="":	if not text=="":
	try:
rc.append((str(text),id,nop))	rc.append((str(text),id,nop))
fnIds[str(text)]=(id,nop)	fnIds[str(text)]=(id,nop)
	except:
	rc.append((repr(text),id,nop))
	fnIds[repr(text)]=(id,nop)


rc.sort()	rc.sort()
self.REQUEST.SESSION['filenames']=rc	self.REQUEST.SESSION['filenames']=rc
self.REQUEST.SESSION['filenamesIds']=fnIds	self.REQUEST.SESSION['filenamesIds']=fnIds

pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
return pt()	return pt()

def recalculateMeta(self):	def recalculateMeta(self):
Line 474 class ImageCollection(Folder, Persistent	Line 595 class ImageCollection(Folder, Persistent

def addImage(self):	def addImage(self):
"""Add an Image"""	"""Add an Image"""
pt=PageTemplateFile('Products/ImageArchive/zpt/addImage.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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 512 class ImageCollection(Folder, Persistent	Line 633 class ImageCollection(Folder, Persistent
#print newObj	#print newObj
self._setObject(file,newObj)	self._setObject(file,newObj)
#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.ImageStoragePath
os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
	#scale thumb

	self.scaleThumbs()

	#scale standard

	self.scaleWorkingVersions()


RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

Line 538 class ImageCollection(Folder, Persistent	Line 667 class ImageCollection(Folder, Persistent
except:	except:
"""nothing yet"""	"""nothing yet"""
#print ret	#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self)	#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
#print self.ImageStoragePath	#print self.ImageStoragePath
os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
	#scale thumb

	self.scaleThumbs()

	#scale standard

	self.scaleWorkingVersions()

	if RESPONSE:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def ImageCollection_config(self):	def ImageCollection_config(self):
Line 548 class ImageCollection(Folder, Persistent	Line 686 class ImageCollection(Folder, Persistent
if not hasattr(self,'defaultMetaString'):	if not hasattr(self,'defaultMetaString'):
self.defaultMetaString=""	self.defaultMetaString=""

pt=PageTemplateFile('Products/ImageArchive/zpt/ChangeImageCollectionForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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 711 class ImageCollection(Folder, Persistent	Line 849 class ImageCollection(Folder, Persistent

def setColTimesRowForm(self):	def setColTimesRowForm(self):
"""form for matrix setting"""	"""form for matrix setting"""
pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','selectColTimesRow.zpt')).__of__(self)
return pt()	return pt()

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

pt=PageTemplateFile('Products/ImageArchive/zpt/changedColTimesRow.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changedColTimesRow.zpt')).__of__(self)
return pt()	return pt()

def setColTimesRow(self,cols,rows):	def setColTimesRow(self,cols,rows):
Line 819 class ImageCollection(Folder, Persistent	Line 957 class ImageCollection(Folder, Persistent

def thumblistSelected_old(self):	def thumblistSelected_old(self):
"""main template collection"""	"""main template collection"""
pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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/zpt/thumbselected2.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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/zpt/thumbs.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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/zpt/thumb2.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb2.zpt')).__of__(self)
return pt()	return pt()

def thumblistNewWindow(self):	def thumblistNewWindow(self):
"""Thumbs mit clik neues Fenster oeffnen"""	"""Thumbs mit clik neues Fenster oeffnen"""
pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbNewWindow.zpt')).__of__(self)
return pt()	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/zpt/navigation_selected.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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/zpt/navigation.zpt').__of__(self)
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)
return pt()	return pt()


Line 863 class ImageCollection(Folder, Persistent	Line 1002 class ImageCollection(Folder, Persistent
else:	else:
filen=""	filen=""
self.REQUEST.SESSION['filename']=filen	self.REQUEST.SESSION['filename']=filen
pt=PageTemplateFile('Products/ImageArchive/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 index_html(self):	def index_html(self):
Line 873 class ImageCollection(Folder, Persistent	Line 1012 class ImageCollection(Folder, Persistent
else:	else:
filen=""	filen=""

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

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

Line 882 class ImageCollection(Folder, Persistent	Line 1021 class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')	self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')


pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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/zpt/AddImageCollectionForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'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 927 class ImageCollectionIFrame(ImageCollect	Line 1066 class ImageCollectionIFrame(ImageCollect
self.REQUEST.SESSION['filename']=filen	self.REQUEST.SESSION['filename']=filen


pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameMain.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameMain.zpt')).__of__(self)
return pt()	return pt()

def iframe_html(self):	def iframe_html(self):
Line 937 class ImageCollectionIFrame(ImageCollect	Line 1076 class ImageCollectionIFrame(ImageCollect
else:	else:
filen=""	filen=""
self.REQUEST.response.setCookie('filename',filen)	self.REQUEST.response.setCookie('filename',filen)
pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameOverview.zpt')).__of__(self)
return pt()	return pt()


def manage_AddImageCollectionIFrameForm(self):	def manage_AddImageCollectionIFrameForm(self):
"""Nothing yet"""	"""Nothing yet"""
pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionIFrameForm.zpt')).__of__(self)
return pt()	return pt()

def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):	def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):

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

Removed from v.1.31
changed lines
	Added in v.1.40