--- ImageArchive/ImageArchive.py 2005/10/07 10:51:38 1.64 +++ ImageArchive/ImageArchive.py 2006/02/07 18:36:07 1.74 @@ -1,3 +1,7 @@ +genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config + + + from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem from Globals import Persistent,package_home @@ -19,13 +23,16 @@ from threading import Thread import Queue import cgi -from AccessControl import ClassSecurityInfo +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=() @@ -124,9 +131,14 @@ class generateSet: self.response+=(str("
Error in File: %s (possible missing)
\n"%filename))
else:
if self.version=="working":
- path=self.scalerPath+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:
- path=self.scalerPath+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()
@@ -169,7 +181,9 @@ class generateSet:
self.response+=str("
Error in File: %s (missing?)
\n"%filename)
else:
- path=self.scalerPath+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()
@@ -266,6 +280,31 @@ 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):
"""Add an MetaObject"""
objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType)
@@ -295,6 +334,10 @@ class ImageDigilib(Folder,Persistent,Imp
self.filename=filename
self.meta=meta
+ def getBasename(self):
+ """returns base filename (sans extension)"""
+ return os.path.splitext(self.filename)[0]
+
def getMeta(self):
"""ausgabe der metadaten"""
return self.meta
@@ -321,12 +364,13 @@ class ImageDigilib(Folder,Persistent,Imp
def uploadImage(self,fileupload,path_name):
"""upload an Image from an Requast"""
#path_name=self.ImageStoragePath
- fn=splitPath(fileupload.filename)
+ fn = self.filename or splitPath(fileupload.filename)
filename=path_name+"/"+fn
filedata=fileupload.read()
f=open(filename,"w")
f.write(filedata)
f.close()
+ self.filename = fn
try:
os.chmod(filename,0664)
except:
@@ -348,7 +392,10 @@ class ImageDigilib(Folder,Persistent,Imp
def download(self,fmt="&mo=rawfile,hires",suffix=None):
"""download"""
- path=self.scalerPath+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):
filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename
@@ -368,16 +415,16 @@ class ImageDigilib(Folder,Persistent,Imp
#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()
+ """form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
+ return pt()
security.declareProtected('View management screens','renameImageForm')
def renameImageForm(self):
- """form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)
- return pt()
+ """form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self)
+ return pt()
security.declareProtected('View management screens','renameImage')
def renameImage(self,newname,RESPONSE=None):
@@ -478,12 +525,14 @@ class ImageDigilib(Folder,Persistent,Imp
return "done"
-
+
+ security.declarePublic('thumb')
def thumb(self,url=None):
"""show thumb"""
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
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
self.REQUEST.SESSION['string']=""% path
if url:
@@ -497,8 +546,11 @@ class ImageDigilib(Folder,Persistent,Imp
"""show thumb mit Metadaten erwarten image in ImageCollectionMD
"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"
-
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
+
+ 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']=""% path
if url:
@@ -513,12 +565,29 @@ class ImageDigilib(Folder,Persistent,Imp
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):
- """show image"""
+ """show image with zogilib"""
#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)
@@ -531,7 +600,8 @@ def manage_AddImageDigilib(self,id,fileu
"""Add ImageCollection"""
#fileupload=self.REQUEST['fileupload']
- fn=splitPath(fileupload.filename)
+ #fn=splitPath(fileupload.filename)
+ fn = id # filename is the same as id
newObj=ImageDigilib(id,fn,meta)
self._setObject(id,newObj)
@@ -550,7 +620,7 @@ class ImageCollection(Folder, Persistent
security=ClassSecurityInfo()
#scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn="
- scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
+ #scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
zipThreads={}
zipThreads2={}
@@ -562,9 +632,16 @@ 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
+ 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"""
- return self.scalerPath
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="
def getImageViewerPath(self):
"""get ImageViewerPath"""
@@ -684,12 +761,15 @@ 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.title=title
self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
+ self.serverPath=serverPath
+ self.defaultrows = 6
+ self.defaultcols = 2
optTMP= Folder.manage_options
@@ -709,7 +789,7 @@ class ImageCollection(Folder, Persistent
"""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"]):
- print image[1].getId()
+
image[1].manageMetaData(strict)
return "ok"
@@ -843,12 +923,20 @@ class ImageCollection(Folder, Persistent
idnr=image.getElementsByTagName('idnr')[0]
id=getText(idnr.childNodes)
- numberOfPages=image.getElementsByTagName('numberOfPages')[0]
- nopT=getText(numberOfPages.childNodes)
try:
- nop=int(nopT)
+ numberOfPages=image.getElementsByTagName('numberOfPages')[0]
except:
- nop=0
+ numberOfPages=None
+
+ if numberOfPages:
+ nopT=getText(numberOfPages.childNodes)
+ try:
+ nop=int(nopT)
+ except:
+ nop=0
+ else:
+ nop=0
+
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
for text in texts:
if not text=="":
@@ -864,6 +952,14 @@ class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['filenames']=rc
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)
return pt()
@@ -884,7 +980,7 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self)
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"""
#print "FU",fileupload
@@ -896,10 +992,13 @@ class ImageCollection(Folder, Persistent
meta=None
else:
meta=None
- fn=splitPath(fileupload.filename)
+
+ fn=fileName or splitPath(fileupload.filename)
manage_AddImageDigilib(self,fn,fileupload,meta=meta)
- return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
+
+ if RESPONSE:
+ return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
#return self.REQUEST['URL1']+'/'+fileupload.filename
def ImportFiles2(self,RESPONSE=None):
@@ -1030,12 +1129,13 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self)
return pt()
- def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
+ def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath,RESPONSE=None):
"""Change"""
self.title=title
self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
+ self.serverPath=serverPath
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1057,15 +1157,15 @@ class ImageCollection(Folder, Persistent
ids.sort()
return ids
- def firstSets(self,selected=None):
+ def firstSets(self,selected=None,text='first set'):
ids=self.show_thumbs()
if ids:
if selected:
- return "first sets"
+ return ""+text+""
else:
- return "first sets"
+ return ""+text+""
- def lastSets(self,selected=None):
+ def lastSets(self,selected=None,text='last set'):
ids=self.show_thumbs()
if ids:
colRows=self.getColTimesRow()
@@ -1079,39 +1179,39 @@ class ImageCollection(Folder, Persistent
nr=0
if selected:
- return "last set"
+ return ""+text+""
else:
- return "last sets"
+ return ""+text+""
- def nextSets(self,selected=None):
+ def nextSets(self,selected=None,text='next set'):
"""show nextimage"""
ids=self.show_thumbs()
colRows=self.getColTimesRow()
+ pagesize = colRows[0] * colRows[1]
if ids:
if colRows[1]:
-
if self.REQUEST.SESSION.has_key("filename"):
filename=self.REQUEST.SESSION["filename"]
try:
- nr=ids.index(filename)+colRows[0]*colRows[1]
+ nr=ids.index(filename)+pagesize
if nr>=len(ids):
- nr=len(ids)-1
+ return ""
except:
- nr=0
+ nr=pagesize
else:
- nr=0
+ nr = pagesize
- if nr==len(ids)-1:
+ if nr>=len(ids)-1:
return ""
else:
if selected:
- return "next set"
+ return ""+text+""
else:
- return "next set"
+ return ""+text+""
- def prevSets(self,selected=None):
+ def prevSets(self,selected=None,text='previous sets'):
"""show nextimage"""
#return self.getId()
@@ -1138,11 +1238,13 @@ class ImageCollection(Folder, Persistent
return ""
else:
if selected:
- return "previous sets"
+ return ""+text+""
else:
- return "previous sets"
+ return ""+text+""
else:
return ""
+
+
def showFolders(self):
"""show subfolders"""
ret=""
@@ -1162,9 +1264,64 @@ class ImageCollection(Folder, Persistent
ret+=link%(iC[1].absolute_url(),iC[0])
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+=""""
- anf="Show thumbnail group no:"
+ anf="Show thumbnail group no: "
try:
@@ -1243,6 +1400,7 @@ class ImageCollection(Folder, Persistent
ret="""show groups """%self.REQUEST['URL1']
return ret
+
def show_thumbs_selected_rows(self,numberOfColumns):
"""Ausgabe anzahl"""
@@ -1279,33 +1437,39 @@ class ImageCollection(Folder, Persistent
RESPONSE.setCookie("ImageViewerCols",cols)
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'):
"""coltimesrow"""
REQUEST=self.REQUEST
"""matrix"""
if REQUEST.cookies.has_key("ImageViewerRows"):
-
try:
rows=int(REQUEST.cookies["ImageViewerRows"])
except:
- rows=6
+ rows=getattr(self,'defaultrows',6)
else:
- rows=6
+ rows=getattr(self,'defaultrows',6)
if REQUEST.cookies.has_key("ImageViewerCols"):
#print "COLS",REQUEST.cookies["ImageViewerCols"]
cols=int(REQUEST.cookies["ImageViewerCols"])
else:
- cols=2
+ cols=getattr(self,'defaultcols',3)
+
idsnumber=len(self.show_thumbs())
if rows:
if cols*rows >idsnumber:
rows=int(idsnumber/cols)+1
- #print cols,rows
+ if showall is None:
+ showall=self.REQUEST.SESSION.get('showall', 'No')
if showall=='yes':
rows=int(idsnumber/cols)+1
@@ -1316,7 +1480,7 @@ class ImageCollection(Folder, Persistent
"""Ausgabe anzahl"""
idsAll=self.show_thumbs()
- if len(idsAll)==0: #keine Einträge
+ if len(idsAll)==0: #keine Eintraege
return 0
if self.REQUEST.SESSION.has_key("filename") and not (showall=="yes"):
filename=self.REQUEST.SESSION["filename"]
@@ -1415,7 +1579,7 @@ class ImageCollection(Folder, Persistent
def getImageByName(self,filename,onlyName=None):
"""get filename"""
-
+
fn=getattr(self,filename,None)
if not fn:
filenameM=filename.split(".")[0]
@@ -1434,7 +1598,7 @@ class ImageCollection(Folder, Persistent
security.declareProtected('View','index_html')
- def index_html(self,fn=None):
+ def index_html(self,fn=None,generic=None):
"""main template collection"""
if fn:
@@ -1450,9 +1614,14 @@ class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['filenames']=ret
#self.REQUEST.SESSION['filenamesIds']=fnIds
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
- return pt()
+
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+
+ if overview and (generic is None):
+ 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'):
filen=self.REQUEST['filename']
@@ -1469,11 +1638,15 @@ class ImageCollection(Folder, Persistent
overview=self.ZopeFind(self,obj_ids=['overview.html'])
- if overview:
+ if overview and (generic is None):
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)
return pt()
+
def manage_AddImageCollectionForm(self):
"""Nothing yet"""
@@ -1495,15 +1668,45 @@ class ImageCollectionMD(ImageCollection,
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:
+ 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)
@@ -1517,7 +1720,17 @@ class ImageCollectionMD(ImageCollection,
"""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"""
@@ -1596,7 +1809,7 @@ class ImageZogiLib(ImageDigilib):
ImageViewerPath und ImageStoragePath und wenn vorhanden Pfad zur Collection
werden zusaetzlich abgespeichert
"""
-
+ #TODO: scaler path notwendig?
meta_type="ImageZogiLib"
manage_options=ImageDigilib.manage_options+(