ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.57 and 1.72

version 1.57, 2005/04/29 18:24:04	version 1.72, 2005/11/23 17:41:04
Line 1	Line 1
	genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config



from OFS.Folder import Folder	from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
from Globals import Persistent,package_home	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
	from xmlrpclib import ServerProxy
import re	import re
import os	import os
import os.path	import os.path
Line 16 from types import *	Line 21 from types import *
import time	import time
from threading import Thread	from threading import Thread
import Queue	import Queue
	import cgi

	from AccessControl import ClassSecurityInfo, getSecurityManager

	try:
	from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
	except:
	print "ZSQL Extend Folder nicht importiert"
	print "Metadatendfolder funktioniert nicht!!!"
	class ZSQLExtendFolder:
	"""leer"""
	manage_options=()



try:	try:
from Products.ECHO_content.ECHO_collection import ECHO_basis	from Products.ECHO_content.ECHO_collection import ECHO_basis
Line 97 class generateSet:	Line 116 class generateSet:

self.response+=str("<p>Get File: %s<br>\n"%filename)	self.response+=str("<p>Get File: %s<br>\n"%filename)


if self.local:	if self.local:

if self.version=="working":	if self.version=="working":
Line 111 class generateSet:	Line 131 class generateSet:
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename))	self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename))
else:	else:
if self.version=="working":	if self.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"	requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString

else:	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"	requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires"
	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString


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


Line 124 class generateSet:	Line 149 class generateSet:
fh.close()	fh.close()

#folgeseiten	#folgeseiten

if int(self.filenamesIds[id[0]][1])>1:	if int(self.filenamesIds[id[0]][1])>1:
#ids=self.show_thumbs()	#ids=self.show_thumbs()

Line 155 class generateSet:	Line 181 class generateSet:
self.response+=str("<p>Error in File: %s (missing?)<br>\n"%filename)	self.response+=str("<p>Error in File: %s (missing?)<br>\n"%filename)

else:	else:
path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"
	requestString=self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"
	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString

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

Line 238 class metaData(SimpleItem):	Line 266 class metaData(SimpleItem):
return ret+"</body></html>"	return ret+"</body></html>"




class ImageDigilib(Folder,Persistent,Implicit):	class ImageDigilib(Folder,Persistent,Implicit):
"""Anzeige object fuer digilib"""	"""Anzeige object fuer digilib"""
meta_type="ImageDigilib"	meta_type="ImageDigilib"
	security=ClassSecurityInfo()
leiden_meta_fields=['image_id','date','country','place','people','description','photographer']	leiden_meta_fields=['image_id','date','country','place','people','description','photographer']

manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
Line 250 class ImageDigilib(Folder,Persistent,Imp	Line 280 class ImageDigilib(Folder,Persistent,Imp

)	)

	def getAccessRight(self):
	"""get the accessright, return is string "extern" or "intern" """
	return self.getRights(self.filename.split('.')[0])

	security.declarePublic('isAccessible')

	def isAccessible(self):
	"""gives true if obejct is accessible taking the rights of the user into account"""

	#TODO: implement rights, currently true if external and false if internal, and true if user has role authenticated

	username=self.REQUEST['AUTHENTICATED_USER']
	#print username
	#print self.acl_users.getUserNames()
	user=getSecurityManager().getUser()

	roles=user.getRoles()
	if 'Authenticated' in roles:
	return True

	if self.getAccessRight()=="extern":
	return True
	else:
	return False

def addMetaObject(self,id,RESPONSE=None):	def addMetaObject(self,id,RESPONSE=None):
"""Add an MetaObject"""	"""Add an MetaObject"""
objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType)	objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType)
Line 279 class ImageDigilib(Folder,Persistent,Imp	Line 334 class ImageDigilib(Folder,Persistent,Imp
self.filename=filename	self.filename=filename
self.meta=meta	self.meta=meta

	def getBasename(self):
	"""returns base filename (sans extension)"""
	return os.path.splitext(self.filename)[0]

def getMeta(self):	def getMeta(self):
"""ausgabe der metadaten"""	"""ausgabe der metadaten"""
return self.meta	return self.meta
Line 332 class ImageDigilib(Folder,Persistent,Imp	Line 391 class ImageDigilib(Folder,Persistent,Imp

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


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
Line 356 class ImageDigilib(Folder,Persistent,Imp	Line 418 class ImageDigilib(Folder,Persistent,Imp
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
return pt()	return pt()


	security.declareProtected('View management screens','renameImageForm')
def renameImageForm(self):	def renameImageForm(self):
"""form"""	"""form"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)
return pt()	return pt()

	security.declareProtected('View management screens','renameImage')
def renameImage(self,newname,RESPONSE=None):	def renameImage(self,newname,RESPONSE=None):
"""umbenennen"""	"""umbenennen"""
#umbennen des files im folder	#umbennen des files im folder
Line 460 class ImageDigilib(Folder,Persistent,Imp	Line 525 class ImageDigilib(Folder,Persistent,Imp

return "done"	return "done"

	security.declarePublic('thumb')
def thumb(self,url=None):	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):	requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
## image=urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:18080/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=150&mo=lores").read()	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString
## f=open("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname,"w")
## f.write(image)
## f.close()
## os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 150 &"% self.ImageViewerPath)

#DEVEL:take nausikaa for server solution

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
self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path	self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path
if url:	if url:
return "<img border=\"0\" src=\"%s\">"% path	return "<img border=\"0\" src=\"%s\">"% path
Line 481 class ImageDigilib(Folder,Persistent,Imp	Line 540 class ImageDigilib(Folder,Persistent,Imp
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()


	def thumbMD(self,url=None):
	"""show thumb mit Metadaten erwarten image in ImageCollectionMD
	"""
	thumbname=os.path.splitext(self.filename)[0]+".jpg"

	requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString



	self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path
	if url:
	return "<img border=\"0\" src=\"%s\">"% path
	else:

	overview=self.ZopeFind(self.aq_parent,obj_ids=['thumb.html'])
	if overview:
	return getattr(self,overview[0][0])()
	else:
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbMD.zpt')).__of__(self)
	return pt()


	def image(self,dw=None,dh=None):
	"""show image only with scaler"""
	str=[]
	if (not dw) and (not dh):
	str.append("mo=file")
	if dw:
	str.append("dw=%s"%dw)

	if dh:
	str.append("dw=%s"%dh)

	str.append("lv=2&fn=%s"%self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0])


	requestString="&".join(str)

	self.REQUEST.RESPONSE.redirect(getattr(self,'serverPath',genericServerPath)+"/scaledImage?"+requestString)

def index_html(self):	def index_html(self):
"""show image"""	"""show image with zogilib"""
#DEVELOP: take first one for server	#DEVELOP: take first one for server
	#path="http://127.0.0.1:8080/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]	path=getattr(self,'serverPath',genericServerPath)+"?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
return self.REQUEST.RESPONSE.redirect(path)	return self.REQUEST.RESPONSE.redirect(path)


Line 510 def manage_AddImageDigilib(self,id,fileu	Line 611 def manage_AddImageDigilib(self,id,fileu


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


	security=ClassSecurityInfo()

	#scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn="
	#scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="

zipThreads={}	zipThreads={}
zipThreads2={}	zipThreads2={}

Line 525 class ImageCollection(Folder, Persistent	Line 630 class ImageCollection(Folder, Persistent

defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP	defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP

	imgcoll_main = PageTemplateFile('zpt/overview', globals())
	imgcoll_thumb = PageTemplateFile('zpt/thumb', globals())

	def getServerPath(self):
	"""get Server path"""
	return getattr(self,'serverPath',genericServerPath)

	def getScalerPath(self):
	"""get ScalerPath"""
	path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="

	def getImageViewerPath(self):
	"""get ImageViewerPath"""
	return self.ImageViewerPath

	def getImageStoragePath(self):
	"""get ImageStoragePath"""
	return self.ImageStoragePath

def refreshTxt(self):	def refreshTxt(self):
"""txt fuer refresh"""	"""txt fuer refresh"""
Line 636 class ImageCollection(Folder, Persistent	Line 759 class ImageCollection(Folder, Persistent



def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString):	def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath):
self.id=id	self.id=id
self.title=title	self.title=title
self.ImageStoragePath=ImageStoragePath	self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString	self.defaultMetaString=defaultMetaString
	self.serverPath=serverPath
	self.defaultrows = 6
	self.defaultcols = 2

optTMP= Folder.manage_options	optTMP= Folder.manage_options

Line 661 class ImageCollection(Folder, Persistent	Line 787 class ImageCollection(Folder, Persistent
"""import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty"""	"""import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty"""

for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]):	for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]):
print image[1].getId()
image[1].manageMetaData(strict)	image[1].manageMetaData(strict)
return "ok"	return "ok"

Line 795 class ImageCollection(Folder, Persistent	Line 921 class ImageCollection(Folder, Persistent

idnr=image.getElementsByTagName('idnr')[0]	idnr=image.getElementsByTagName('idnr')[0]
id=getText(idnr.childNodes)	id=getText(idnr.childNodes)
	try:
numberOfPages=image.getElementsByTagName('numberOfPages')[0]	numberOfPages=image.getElementsByTagName('numberOfPages')[0]
	except:
	numberOfPages=None

	if numberOfPages:
nopT=getText(numberOfPages.childNodes)	nopT=getText(numberOfPages.childNodes)
try:	try:
nop=int(nopT)	nop=int(nopT)
except:	except:
nop=0	nop=0
	else:
	nop=0

texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste	texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
for text in texts:	for text in texts:
if not text=="":	if not text=="":
Line 816 class ImageCollection(Folder, Persistent	Line 950 class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['filenames']=rc	self.REQUEST.SESSION['filenames']=rc
self.REQUEST.SESSION['filenamesIds']=fnIds	self.REQUEST.SESSION['filenamesIds']=fnIds

	overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])

	if overview:
	return overview[0][1]()
	else:
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
	return pt()

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

Line 836 class ImageCollection(Folder, Persistent	Line 978 class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'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,fileName=None,meta=None,use_default=None,RESPONSE=None):
"""Add"""	"""Add"""

#print "FU",fileupload	#print "FU",fileupload
Line 848 class ImageCollection(Folder, Persistent	Line 990 class ImageCollection(Folder, Persistent
meta=None	meta=None
else:	else:
meta=None	meta=None

	if fileName:
	fn=fileName
	else:
fn=splitPath(fileupload.filename)	fn=splitPath(fileupload.filename)

manage_AddImageDigilib(self,fn,fileupload,meta=meta)	manage_AddImageDigilib(self,fn,fileupload,meta=meta)

	if RESPONSE:
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)	return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
#return self.REQUEST['URL1']+'/'+fileupload.filename	#return self.REQUEST['URL1']+'/'+fileupload.filename

Line 886 class ImageCollection(Folder, Persistent	Line 1034 class ImageCollection(Folder, Persistent

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

def importStructure(self,path):	## def importStructure(self,path):
"""import"""	## """import"""
splitted=os.path.split(path)	## splitted=os.path.split(path)
if os.path.isDir(path) and (len(splitted[1])>0) and (splitted[1][0]=="."):	## if os.path.isDir(path) and (len(splitted[1])>0) and (splitted[1][0]=="."):
manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None)	## manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None)

obj=getattr(self,splitted[1])	## obj=getattr(self,splitted[1])
obj.ImportFiles()	## obj.ImportFiles()

def ImportStructure(self,RESPONSE=None):	def ImportStructure(self,RESPONSE=None):
"""Import the existing files of a folder"""	"""Import the existing files of a folder"""
Line 982 class ImageCollection(Folder, Persistent	Line 1130 class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'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,serverPath,RESPONSE=None):
"""Change"""	"""Change"""
self.title=title	self.title=title
self.ImageStoragePath=ImageStoragePath	self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath	self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString	self.defaultMetaString=defaultMetaString
	self.serverPath=serverPath

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1009 class ImageCollection(Folder, Persistent	Line 1158 class ImageCollection(Folder, Persistent
ids.sort()	ids.sort()
return ids	return ids

def firstSets(self,selected=None):	def firstSets(self,selected=None,text='first set'):
ids=self.show_thumbs()	ids=self.show_thumbs()
if ids:	if ids:
if selected:	if selected:
return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[0]+"\" target=\"_top\">first sets</a>"	return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[0]+"\" target=\"_top\">"+text+"</a>"
else:	else:
return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[0]+"\" target=\"_top\">first sets</a>"	return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[0]+"\" target=\"_top\">"+text+"</a>"

def lastSets(self,selected=None):	def lastSets(self,selected=None,text='last set'):
ids=self.show_thumbs()	ids=self.show_thumbs()
if ids:	if ids:
colRows=self.getColTimesRow()	colRows=self.getColTimesRow()
Line 1031 class ImageCollection(Folder, Persistent	Line 1180 class ImageCollection(Folder, Persistent
nr=0	nr=0

if selected:	if selected:
return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">last set</a>"	return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"
else:	else:
return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">last sets</a>"	return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"



def nextSets(self,selected=None):	def nextSets(self,selected=None,text='next set'):
"""show nextimage"""	"""show nextimage"""
ids=self.show_thumbs()	ids=self.show_thumbs()
colRows=self.getColTimesRow()	colRows=self.getColTimesRow()
	pagesize = colRows[0] * colRows[1]
if ids:	if ids:
if colRows[1]:	if colRows[1]:

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:
nr=ids.index(filename)+colRows[0]*colRows[1]	nr=ids.index(filename)+pagesize
if nr>=len(ids):	if nr>=len(ids):
nr=len(ids)-1	return ""
except:	except:
nr=0	nr=pagesize
else:	else:
nr=0	nr = pagesize

if nr==len(ids)-1:	if nr>=len(ids)-1:
return ""	return ""
else:	else:
if selected:	if selected:
return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">next set</a>"	return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"
else:	else:
return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">next set</a>"	return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"

def prevSets(self,selected=None):	def prevSets(self,selected=None,text='previous sets'):

"""show nextimage"""	"""show nextimage"""
#return self.getId()	#return self.getId()
Line 1090 class ImageCollection(Folder, Persistent	Line 1239 class ImageCollection(Folder, Persistent
return ""	return ""
else:	else:
if selected:	if selected:
return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"	return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"
else:	else:
return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"	return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">"+text+"</a>"
else:	else:
return ""	return ""


def showFolders(self):	def showFolders(self):
"""show subfolders"""	"""show subfolders"""
ret=""	ret=""
Line 1114 class ImageCollection(Folder, Persistent	Line 1265 class ImageCollection(Folder, Persistent
ret+=link%(iC[1].absolute_url(),iC[0])	ret+=link%(iC[1].absolute_url(),iC[0])
ret+="<br>"	ret+="<br>"
return ret	return ret


	def getSetSelector(self, selected=None):
	"""returns the HTML select element for the sets"""
	actualNr=0
	ids=self.show_thumbs()
	colRows=self.getColTimesRow()
	pagesize = colRows[0]*colRows[1]
	numpages = int(len(ids)/pagesize)
	if not ((len(ids) % pagesize)==0):
	numpages+=1

	ret=""
	if numpages>1:
	if selected:
	ret+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""/selection?filename='+this.options[this.selectedIndex].value">"""
	else:
	ret+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""?filename='+this.options[this.selectedIndex].value">"""

	for i in range(numpages):
	try:
	nr=ids.index(self.REQUEST.SESSION['filename'])
	except:
	nr=0
	k=i * pagesize
	if (k <= nr) and (nr < i*(pagesize+1)):
	actualNr=i
	ret+="""<option value="%s" selected>%i</option>"""%(ids[k], i + 1)
	else:
	ret+="""<option value="%s">%i</option>"""%(ids[k], i + 1)

	ret+="</select>"

	return ret

	def isAllSets(self, showall=None):
	"""returns if there are any sets"""
	ids=self.show_thumbs()
	colRows=self.getColTimesRow(showall=showall)
	pagesize = colRows[0]*colRows[1]
	return (len(ids) <= pagesize)


	def allSets(self, texton='show all', textoff='show groups'):
	"""returns HTML to toggle 'show all'"""
	if self.isAllSets(showall='No'):
	return ""
	showall=self.REQUEST.SESSION.get('showall','no')
	if showall=='no':
	ret='<a href="'+self.REQUEST['URL1']+'?showall=yes" target="_top">'+texton+'</a>'
	else:
	ret='<a href="'+self.REQUEST['URL1']+'?showall=no" target="_top">'+textoff+'</a>'
	return ret


def showRuler(self,selected=None):	def showRuler(self,selected=None):
"""show ruler"""	"""show ruler"""
showall =self.REQUEST.SESSION.get('showall','no')	showall =self.REQUEST.SESSION.get('showall','no')
Line 1196 class ImageCollection(Folder, Persistent	Line 1402 class ImageCollection(Folder, Persistent

return ret	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 1232 class ImageCollection(Folder, Persistent	Line 1439 class ImageCollection(Folder, Persistent

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

	def setDefaultColTimesRow(self, cols, rows):
	"""sets default columns and rows"""
	self.defaultcols = cols
	self.defaultrows = rows

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

REQUEST=self.REQUEST	REQUEST=self.REQUEST
"""matrix"""	"""matrix"""
if REQUEST.cookies.has_key("ImageViewerRows"):	if REQUEST.cookies.has_key("ImageViewerRows"):

try:	try:
rows=int(REQUEST.cookies["ImageViewerRows"])	rows=int(REQUEST.cookies["ImageViewerRows"])
except:	except:
rows=6	rows=getattr(self,'defaultrows',6)
else:	else:
rows=6	rows=getattr(self,'defaultrows',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=2	cols=getattr(self,'defaultcols',3)


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 is None:
	showall=self.REQUEST.SESSION.get('showall', 'No')
if showall=='yes':	if showall=='yes':
rows=int(idsnumber/cols)+1	rows=int(idsnumber/cols)+1

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


def show_thumbs_rows(self,numberOfColumns,numberOfRows=None,startId=None):	def show_thumbs_rows(self,numberOfColumns,numberOfRows=None,startId=None,showall="No"):
"""Ausgabe anzahl"""	"""Ausgabe anzahl"""

idsAll=self.show_thumbs()	idsAll=self.show_thumbs()
if len(idsAll)==0: #keine Eintr�ge	if len(idsAll)==0: #keine Eintraege
return 0	return 0
if self.REQUEST.SESSION.has_key("filename"):	if self.REQUEST.SESSION.has_key("filename") and not (showall=="yes"):
filename=self.REQUEST.SESSION["filename"]	filename=self.REQUEST.SESSION["filename"]
filename=self.getImageByName(filename,onlyName="yes")	filename=self.getImageByName(filename,onlyName="yes")

Line 1383 class ImageCollection(Folder, Persistent	Line 1596 class ImageCollection(Folder, Persistent
return filename	return filename
else:	else:
return fn	return fn
def index_html(self):

	security.declareProtected('View','index_html')
	def index_html(self,fn=None):
"""main template collection"""	"""main template collection"""

	if fn:
	ret=[]

	if type(fn) is ListType:
	"""experimentell mehr als ein filename"""
	for filename in fn:
	if not (filename == ""):
	ret.append((filename,'',1))
	else:
	ret.append((fn,'',1))

	self.REQUEST.SESSION['filenames']=ret
	#self.REQUEST.SESSION['filenamesIds']=fnIds

	overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])

	if overview:
	return overview[0][1]()
	else:
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
	return pt()

if self.REQUEST.has_key('filename'):	if self.REQUEST.has_key('filename'):
filen=self.REQUEST['filename']	filen=self.REQUEST['filename']
else:	else:
Line 1399 class ImageCollection(Folder, Persistent	Line 1638 class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')	self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')


	overview=self.ZopeFind(self,obj_ids=['overview.html'])
	if overview:
	return overview[0][1]()
	elif hasattr(self,'templates'):
	pt=self.templates.imgcoll_main.__of__(self)
	return pt()
	else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'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(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self)
Line 1416 def manage_AddImageCollection(self,id,ti	Line 1663 def manage_AddImageCollection(self,id,ti
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')



	class ImageCollectionMD(ImageCollection,ZSQLExtendFolder):
	"""Imageviewer and Metadata"""
	meta_type="ImageCollection MD"
	#scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn="
	scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
	rightsQueryDefault="SELECT accessibility from vision_main where id_image=(SELECT id from vision_images where filename ~ '%s*' )"
	rightsQueryFieldDefault="accessibility"

	manage_options=ImageCollection.manage_options+(
	{'label':'ZSQLExtend','action':'changeZSQLExtendForm'},
	{'label':'Change Rights Query','action':'changeRightsQueryForm'},
	)

	try:
	changeZSQLExtendForm=ZSQLExtendFolder.changeZSQLExtendForm
	except:
	pass

	def changeRightsQueryForm(self):
	"""change Rights Query"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeRightsQueryForm.zpt')).__of__(self)
	return pt()

	def changeRightsQuery(self,rightsQuery,rightsQueryField,RESPONSE=None):
	"""change Rightsquery"""

	self.rightsQuery=rightsQuery
	self.rightsQueryField=rightsQueryField

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



	def getRightsQuery(self):
	"""get Query"""
	return getattr(self,'rightsQuery',self.rightsQueryDefault)

	def getRightsQueryField(self):
	"""get Query Fiueld"""
	return getattr(self,'rightsQueryField',self.rightsQueryFieldDefault)



	def setGenericSearchStringForm(self):
	"""form setze generischen search string fuer MD"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','setGenericSearchStringForm.zpt')).__of__(self)
	return pt()

	def setGenericSearchString(self,searchString):
	"""setze generischen search string"""
	self.searchString=searchString

	def thumblistMD(self):
	"""main template collection"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbListMD.zpt')).__of__(self)
	return pt()

	def getRights(self,id):
	"""get the rights from a database"""
	#print self.rightsQuery%id
	results=self.ZSQLSimpleSearch(self.getRightsQuery()%id)
	if results:
	result = getattr(results[0],self.getRightsQueryField())
	else:
	result = ''
	return result


	def manage_AddImageCollectionMDForm(self):
	"""Nothing yet"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)
	return pt()

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

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




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

Line 1472 def manage_AddImageCollectionIFrame(self	Line 1805 def manage_AddImageCollectionIFrame(self
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


	class ImageZogiLib(ImageDigilib):
	"""Anzeige Object fuer Bilder ausserhalb von collections
	ImageViewerPath und ImageStoragePath und wenn vorhanden Pfad zur Collection
	werden zusaetzlich abgespeichert
	"""
	#TODO: scaler path notwendig?
	meta_type="ImageZogiLib"

	manage_options=ImageDigilib.manage_options+(
	{'label':'Main Config','action':'changeImageZogiLibForm'},
	)

	def __init__(self,id,fn,ImageViewerPath,ImageStoragePath,scalerPath,ImageCollectionPath=None,REQUEST=None):
	ImageDigilib.__init__(self,id,fn)
	self.ImageViewerPath=ImageViewerPath
	self.ImageStoragePath=ImageStoragePath
	self.ImageCollectionPath=ImageCollectionPath
	self.scalerPath=scalerPath

	def changeImageZogiLibForm(self):
	"""change zogilib Form"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeImageZogiLib.zpt')).__of__(self)
	return pt()


	def changeImageZogilib(fn,ImageViewerPath,ImageStoragePath,scalerPath,ImageCollectionPath,REQUEST=None):
	"""Change it"""
	self.ImageViewerPath=ImageViewerPath
	self.ImageStoragePath=ImageStoragePath
	self.ImageCollectionPath=ImageColectionPath
	self.scalerPath=scalerPath

	def manage_AddImageZogiLib(self,id=None,ImageViewerPath=None,ImageStoragePath=None,fileUpload=None,ImageCollectionPath=None,scalerPath=None,libPath=None,caption=None,RESPONSE=None):
	"""hinzufuegen eineis zogilibImage"""

	if libPath:
	splitted=libPath.split("?")
	urlSplit=splitted[0].split("/")
	params=cgi.parse_qs(splitted[1])
	#is LibPath a digilib path?
	if urlSplit[-1]=="Scaler":
	if type(params['fn']) is ListType:
	fnParam=params['fn'][0]
	else:
	fnParam=params['fn']
	fileNameSplit=os.path.split(fnParam)
	ImageViewerPath=fileNameSplit[0]
	id=fileNameSplit[1]
	scalerPath=splitted[0]+"?fn="
	else: #assume if not the path is a path to an ImageCollection
	if type(params['filename']) is ListType:
	id=params['filename'][0]
	else:
	id=params['filename']

	server=ServerProxy(splitted[0])
	ImageCollectionPath=libPath
	ImageViewerPath=server.getImageViewerPath()
	ImageStoragePath=server.getImageStoragePath()
	scalerPath=server.getScalerPath()



	if fileUpload:
	fn=splitPath(fileUpload.filename)
	else:
	fn=id

	newObj=ImageZogiLib(id,fn,ImageViewerPath,ImageStoragePath,scalerPath,ImageCollectionPath)

	self._setObject(id,newObj)
	getattr(self,id).caption=caption[0:]
	if fileUpload:
	getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)

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


	def manage_AddImageZogiLibForm(self):
	"""to be done"""

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

Removed from v.1.57
changed lines
	Added in v.1.72