--- ImageArchive/ImageArchive.py 2003/12/08 18:15:02 1.6 +++ ImageArchive/ImageArchive.py 2004/08/03 13:36:30 1.26 @@ -38,8 +38,7 @@ class ImageDigilib(Folder,Persistent,Imp request=self.REQUEST objectCreate=objectType.createObjectManager(id,request) - #for field in self.leiden_meta_fields: - # self.REQUEST[field]=argv[field] + self._setObject(id,objectCreate) objectCreate.propertysheets.meta.manage_editProperties(request) @@ -52,7 +51,7 @@ class ImageDigilib(Folder,Persistent,Imp def addMetaObjectForm(self): """Add Form""" - pt=PageTemplateFile('Products/ImageArchive/addMetaObject.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/addMetaObject.zpt').__of__(self) return pt() @@ -74,15 +73,20 @@ class ImageDigilib(Folder,Persistent,Imp f=open(filename,"w") f.write(filedata) f.close() - os.chmod(filename,0644) - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath) + try: + os.chmod(filename,0644) + except: + """hack""" + + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + def download(self): """download""" - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,highres" + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires" #self.REQUEST.SESSION['string']=""% path #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) return self.REQUEST.RESPONSE.redirect(path) @@ -97,16 +101,21 @@ class ImageDigilib(Folder,Persistent,Imp ## 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+"/"+self.filename+"&dw=100&dh=100&mo=lores" - #path="/thumbs"+self.ImageViewerPath+"/"+thumbname + #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname self.REQUEST.SESSION['string']=""% path - pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self) return pt() def index_html(self): """show image""" - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename + #DEVELOP: take first one for server + + path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename + + #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename #self.REQUEST.SESSION['string']=""% path #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) return self.REQUEST.RESPONSE.redirect(path) @@ -114,7 +123,7 @@ class ImageDigilib(Folder,Persistent,Imp def manage_AddImageDigilibForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/AddImageDigilibForm.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self) return pt() def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None): @@ -139,6 +148,11 @@ 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 + + def scaleThumbs(self): + """scale thumbs""" + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + return "RESCALING STARTED" def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString): self.id=id @@ -152,12 +166,26 @@ class ImageCollection(Folder, Persistent {'label':'Import','action':'ImportFiles'}, {'label':'Recalculate Metadata','action':'recalculateMeta'}, {'label':'Import Metadata','action':'importMetaForm'}, + {'label':'Rescale thumbs','action':'scaleThumbs'}, + {'label':'Weight (ECHO)','action':'weightForm'}, ) + 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): """import metadata""" - pt=PageTemplateFile('Products/ImageArchive/importMeta.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self) return pt() def importMeta(self,fileupload,tag): @@ -174,7 +202,7 @@ class ImageCollection(Folder, Persistent image_id=self.REQUEST['image_id'] if (not hasattr(self,image_id)) & (not image_id==""): - print image_id + #print image_id newObj=ImageCollection(str(image_id),image_id,'','','') self._setObject(str(image_id),newObj) @@ -194,7 +222,52 @@ class ImageCollection(Folder, Persistent return "OK" - + def nextImage(self,request,selected=None): + """show nextimage""" + try: + ids=self.show_thumbs() + if request.SESSION.has_key("filename"): + filename=request.SESSION["filename"] + try: + nr=ids.index(filename) + except: + nr=0 + else: + nr=0 + + if nr==len(ids)-1: + return "" + else: + if selected: + return "next image" + else: + return "next image" + except: + return "" + + def prevImage(self,request,selected=None): + """show nextimage""" + #return self.getId() + try: + ids=self.show_thumbs() + if request.SESSION.has_key("filename"): + filename=request.SESSION["filename"] + try: + nr=ids.index(filename) + except: + nr=0 + else: + nr=0 + + if nr==0: + return "" + else: + if selected: + return "previous image" + else: + return "previous image" + except: + return "" def meta_default(self,filename): """url der metadaten""" @@ -230,7 +303,7 @@ class ImageCollection(Folder, Persistent rc.append(str(text)) rc.sort() self.REQUEST.SESSION['filenames']=rc - pt=PageTemplateFile('Products/ImageArchive/overview_selected.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self) return pt() def recalculateMeta(self): @@ -246,10 +319,10 @@ class ImageCollection(Folder, Persistent def addImage(self): """Add an Image""" - pt=PageTemplateFile('Products/ImageArchive/addImage.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/addImage.zpt').__of__(self) return pt() - def addImage2(self,fileupload,meta,use_default,RESPONSE=None): + def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None): """Add""" #print "FU",fileupload @@ -258,6 +331,8 @@ class ImageCollection(Folder, Persistent meta=self.meta_default(fileupload.filename) except: meta=None + else: + meta=None manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta) return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename) @@ -283,7 +358,7 @@ class ImageCollection(Folder, Persistent #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) #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.ImageStoragePath) + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): @@ -308,7 +383,7 @@ class ImageCollection(Folder, Persistent #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) #print self.ImageStoragePath - print os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% 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) RESPONSE.redirect('manage_main') def ImageCollection_config(self): @@ -316,7 +391,7 @@ class ImageCollection(Folder, Persistent if not hasattr(self,'defaultMetaString'): self.defaultMetaString="" - pt=PageTemplateFile('Products/ImageArchive/ChangeImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/ChangeImageCollectionForm.zpt').__of__(self) return pt() def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -345,6 +420,122 @@ class ImageCollection(Folder, Persistent ids.sort() return ids + def firstSets(self,selected=None): + ids=self.show_thumbs() + if ids: + if selected: + return "first sets" + else: + return "first sets" + + def lastSets(self,selected=None): + ids=self.show_thumbs() + if ids: + colRows=self.getColTimesRow() + + if colRows[1]: + nr=len(ids)-colRows[0]*colRows[1] + else: + nr=0 + + if nr<0: + nr=0 + + if selected: + return "last set" + else: + return "last sets" + + + + def nextSets(self,selected=None): + """show nextimage""" + ids=self.show_thumbs() + colRows=self.getColTimesRow() + 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] + if nr>=len(ids): + nr=len(ids)-1 + except: + nr=0 + else: + nr=0 + + if nr==len(ids)-1: + return "" + else: + if selected: + return "next set" + else: + return "next set" + + def prevSets(self,selected=None): + + """show nextimage""" + #return self.getId() + ids=self.show_thumbs() + colRows=self.getColTimesRow() + 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] + if nr<0: + nr=0 + except: + nr=0 + else: + nr=0 + try: + num=ids.index(filename) + except: + num=0 + + if num==0: + return "" + else: + if selected: + return "previous sets" + else: + return "previous sets" + else: + return "" + + def showRuler(self,selected=None): + """show ruler""" + showall =self.REQUEST.SESSION.get('showall','no') + if showall=='no': + ids=self.show_thumbs() + colRows=self.getColTimesRow() + num=int(len(ids)/(colRows[0]*colRows[1])) + a=colRows[0]*colRows[1] + #print num,num+1 + if num+1>1: + + ret="Show thumbnail group no:
" + for i in range(num+1): + k=i*a + if selected: + href=self.REQUEST['URL1']+"/selection?filename="+ids[k] + else: + href=self.REQUEST['URL1']+"?filename="+ids[k] + + ret+="""%i  """%(href,i) + + else: + ret="" + ret+="""show all """%self.REQUEST['URL1'] + else: + ret="""show groups """%self.REQUEST['URL1'] + + return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() @@ -353,12 +544,102 @@ class ImageCollection(Folder, Persistent self.REQUEST.SESSION['number']=range(number) return range(number+1) - def show_thumbs_rows(self,numberOfColumns): + def setColTimesRowForm(self): + """form for matrix setting""" + pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self) + return pt() + + def setDone(self): + """done""" + + pt=PageTemplateFile('Products/ImageArchive/zpt/changedColTimesRow.zpt').__of__(self) + return pt() + + def setColTimesRow(self,cols,rows): + """set coltimes row""" + RESPONSE=self.REQUEST.RESPONSE + if not rows: + rows=None + if rows=="": + rows=None + + if rows: + RESPONSE.setCookie("ImageViewerRows",rows) + RESPONSE.setCookie("ImageViewerCols",cols) + + RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") + + 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 + else: + rows=6 + + if REQUEST.cookies.has_key("ImageViewerCols"): + #print "COLS",REQUEST.cookies["ImageViewerCols"] + cols=int(REQUEST.cookies["ImageViewerCols"]) + else: + cols=2 + + idsnumber=len(self.show_thumbs()) + if rows: + if cols*rows >idsnumber: + rows=int(idsnumber/cols)+1 + + #print cols,rows + if showall=='yes': + rows=int(idsnumber/cols)+1 + + return (cols,rows) + + + def show_thumbs_rows(self,numberOfColumns,numberOfRows=None,startId=None): """Ausgabe anzahl""" - ids=self.show_thumbs() + + idsAll=self.show_thumbs() + + if self.REQUEST.SESSION.has_key("filename"): + filename=self.REQUEST.SESSION["filename"] + + + try: + startId=filename + if startId=="": + startId=idsAll[0][0:] + except: + startId=idsAll[0][0:] + else: + startId=idsAll[0][0:] + + + + + if numberOfRows: + + startPic=idsAll.index(startId) + try: + + startPic=idsAll.index(startId) + endPic=startPic+numberOfColumns*numberOfRows + ids=idsAll[startPic:endPic] + except: + ids=idsAll + else: + + ids=idsAll + + self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 - + return range(number+1) def show_thumbs_columns(self,row,numberOfColumns): @@ -369,45 +650,78 @@ class ImageCollection(Folder, Persistent return ids[(row-1)*numberOfColumns:row*numberOfColumns] else: return ids[(row-1)*numberOfColumns:] + def thumblistSelected_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/thumbselected.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected.zpt').__of__(self) return pt() def thumblistSelected(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/thumbselected2.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected2.zpt').__of__(self) return pt() def thumblist_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/thumbs.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/thumbs.zpt').__of__(self) return pt() def thumblist(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/thumb2.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self) + return pt() + + def thumblistNewWindow(self): + """Thumbs mit clik neues Fenster oeffnen""" + pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self) + return pt() + + + def navig_selected_html(self): + """navigation""" + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] + pt=PageTemplateFile('Products/ImageArchive/zpt/navigation_selected.zpt').__of__(self) return pt() def navig_html(self): """navigation""" - pt=PageTemplateFile('Products/ImageArchive/navigation.zpt').__of__(self) + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] + pt=PageTemplateFile('Products/ImageArchive/zpt/navigation.zpt').__of__(self) return pt() + def selection(self): + """show only selected""" + if self.REQUEST.has_key('filename'): + filen=self.REQUEST['filename'] + else: + filen="" + self.REQUEST.SESSION['filename']=filen + pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected2.zpt').__of__(self) + return pt() + def index_html(self): """main template collection""" if self.REQUEST.has_key('filename'): filen=self.REQUEST['filename'] else: filen="" + self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/overview.zpt').__of__(self) + + if self.REQUEST.has_key('showall'): + + self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') + else: + self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no') + + + pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self) return pt() def manage_AddImageCollectionForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/AddImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionForm.zpt').__of__(self) return pt() def manage_AddImageCollection(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -416,6 +730,62 @@ def manage_AddImageCollection(self,id,ti self._setObject(id,newObj) if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + +class ImageCollectionIFrame(ImageCollection): + """Class fuer Collection set als IFrame""" + + meta_type="ImageCollectionIFrame" + label=ImageCollection.title + + def getImageTag(self): + """ hack : method needed by echo_content""" + return "" + + def rotate(self,angle,url,RESPONSE): + """rotate""" + + RESPONSE.redirect("javascript:document.domain='mpg.de';parent.iframe.right.rotation(%i)"%int(angle)) + RESPONSE.redirect(url) + def request(self): + """request""" + return self.REQUEST + + def index_html(self): + """index""" + if self.REQUEST.has_key('filename'): + filen=self.REQUEST['filename'] + else: + filen="" + self.REQUEST.SESSION['filename']=filen + + + pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameMain.zpt').__of__(self) + return pt() + + def iframe_html(self): + """iframe""" + if self.REQUEST.has_key('filename'): + filen=self.REQUEST['filename'] + else: + filen="" + self.REQUEST.response.setCookie('filename',filen) + pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self) + return pt() + + +def manage_AddImageCollectionIFrameForm(self): + """Nothing yet""" + pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self) + return pt() + +def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): + """Add ImageCollection""" + newObj=ImageCollectionIFrame(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString) + self._setObject(id,newObj) + + if RESPONSE is not None: RESPONSE.redirect('manage_main')