--- ImageArchive/ImageArchive.py 2005/10/12 19:33:39 1.66 +++ ImageArchive/ImageArchive.py 2005/11/23 17:41:04 1.72 @@ -1,6 +1,5 @@ +genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config -#genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images" -genericServerPath="http://127.0.0.1:8080/zogilib_images" from OFS.Folder import Folder @@ -24,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=() @@ -278,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) @@ -307,6 +334,9 @@ 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""" @@ -494,7 +524,8 @@ 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" @@ -599,6 +630,13 @@ 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""" path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn=" @@ -728,6 +766,8 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString self.serverPath=serverPath + self.defaultrows = 6 + self.defaultcols = 2 optTMP= Folder.manage_options @@ -747,7 +787,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" @@ -860,7 +900,7 @@ class ImageCollection(Folder, Persistent def xmlinput(self,url): - """Anzeige 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() @@ -1123,39 +1180,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() @@ -1182,11 +1239,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="" @@ -1206,9 +1265,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+="""" + + 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=''+texton+'' + else: + ret=''+textoff+'' + return ret + + def showRuler(self,selected=None): """show ruler""" - showall =self.REQUEST.SESSION.get('showall','no') + showall=self.REQUEST.SESSION.get('showall','no') ids=self.show_thumbs() if len(ids)==0: return "No entries" @@ -1242,7 +1356,7 @@ class ImageCollection(Folder, Persistent else: ret+=""""""%(ids[k],i) ret+="" - anf="Show thumbnail group no:
" + anf="Show thumbnail group no:
" try: @@ -1287,6 +1401,7 @@ class ImageCollection(Folder, Persistent ret="""show groups """%self.REQUEST['URL1'] return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" @@ -1323,33 +1438,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 @@ -1360,7 +1481,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"] @@ -1459,7 +1580,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] @@ -1494,9 +1615,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: + 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'] @@ -1515,9 +1641,13 @@ class ImageCollection(Folder, Persistent 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) return pt() + def manage_AddImageCollectionForm(self): """Nothing yet""" @@ -1539,8 +1669,12 @@ 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: @@ -1548,6 +1682,32 @@ class ImageCollectionMD(ImageCollection, 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) @@ -1561,7 +1721,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"""