--- ImageArchive/ImageArchive.py 2004/01/26 08:18:05 1.15 +++ ImageArchive/ImageArchive.py 2004/07/19 14:30:14 1.23 @@ -52,7 +52,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,7 +74,11 @@ class ImageDigilib(Folder,Persistent,Imp f=open(filename,"w") f.write(filedata) f.close() - os.chmod(filename,0644) + 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) @@ -83,7 +87,7 @@ class ImageDigilib(Folder,Persistent,Imp 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) @@ -103,14 +107,14 @@ class ImageDigilib(Folder,Persistent,Imp path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores" #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""" #DEVELOP: take first one for server - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename + 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 @@ -120,7 +124,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): @@ -164,12 +168,25 @@ class ImageCollection(Folder, Persistent {'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): @@ -287,7 +304,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): @@ -303,7 +320,7 @@ 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=None,RESPONSE=None): @@ -342,7 +359,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): @@ -367,7 +384,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 ImageCollection_config(self): @@ -375,7 +392,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): @@ -501,13 +518,13 @@ class ImageCollection(Folder, Persistent def setColTimesRowForm(self): """form for matrix setting""" - pt=PageTemplateFile('Products/ImageArchive/selectColTimesRow.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self) return pt() def setDone(self): """done""" - pt=PageTemplateFile('Products/ImageArchive/changedColTimesRow.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/changedColTimesRow.zpt').__of__(self) return pt() def setColTimesRow(self,cols,rows): @@ -534,20 +551,22 @@ class ImageCollection(Folder, Persistent try: rows=int(REQUEST.cookies["ImageViewerRows"]) except: - rows=None + rows=6 else: - rows=None + rows=6 if REQUEST.cookies.has_key("ImageViewerCols"): #print "COLS",REQUEST.cookies["ImageViewerCols"] cols=int(REQUEST.cookies["ImageViewerCols"]) else: - cols=3 + cols=2 idsnumber=len(self.show_thumbs()) if rows: if cols*rows >idsnumber: rows=int(idsnumber/cols)+1 + + #print cols,rows return (cols,rows) @@ -558,30 +577,38 @@ class ImageCollection(Folder, Persistent 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] + startId=idsAll[0][0:] else: - startId=idsAll[0] + startId=idsAll[0][0:] - print "NOR:",numberOfRows + 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): @@ -595,34 +622,40 @@ class ImageCollection(Folder, Persistent 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/navigation_selected.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/navigation_selected.zpt').__of__(self) return pt() def navig_html(self): """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] - pt=PageTemplateFile('Products/ImageArchive/navigation.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/navigation.zpt').__of__(self) return pt() @@ -633,7 +666,7 @@ class ImageCollection(Folder, Persistent else: filen="" self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/overview_selected2.zpt').__of__(self) + pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected2.zpt').__of__(self) return pt() def index_html(self): @@ -643,12 +676,12 @@ class ImageCollection(Folder, Persistent else: filen="" self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/overview.zpt').__of__(self) + 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): @@ -657,6 +690,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')