--- ImageArchive/ImageArchive.py 2004/03/05 11:56:50 1.17 +++ ImageArchive/ImageArchive.py 2004/03/11 19:44:17 1.18 @@ -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() @@ -62,8 +62,6 @@ class ImageDigilib(Folder,Persistent,Imp self.filename=filename self.meta=meta - - def getMeta(self): """ausgabe der metadaten""" return self.meta @@ -105,7 +103,7 @@ 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): @@ -122,7 +120,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): @@ -171,7 +169,7 @@ class ImageCollection(Folder, Persistent 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): @@ -289,7 +287,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): @@ -305,7 +303,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): @@ -377,7 +375,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): @@ -503,13 +501,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): @@ -520,14 +518,8 @@ class ImageCollection(Folder, Persistent if rows=="": rows=None - if rows=="all": - rows=None - - if rows: RESPONSE.setCookie("ImageViewerRows",rows) - else: - RESPONSE.expireCookie("ImageViewerRows") RESPONSE.setCookie("ImageViewerCols",cols) RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") @@ -603,34 +595,34 @@ 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 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() @@ -641,7 +633,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): @@ -651,12 +643,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):