--- ImageArchive/ImageArchive.py 2004/01/06 16:16:42 1.11
+++ 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()
@@ -102,8 +102,8 @@ 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)
+ self.REQUEST.SESSION['string']=""% path
+ pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self)
return pt()
def index_html(self):
@@ -120,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):
@@ -169,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):
@@ -208,44 +208,50 @@ class ImageCollection(Folder, Persistent
def nextImage(self,request,selected=None):
"""show nextimage"""
- ids=self.show_thumbs()
- if request.SESSION.has_key("filename"):
- filename=request.SESSION["filename"]
- try:
- nr=ids.index(filename)
- except:
+ 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
- else:
- nr=0
- if nr==len(ids)-1:
- return ""
- else:
- if selected:
- return "next image"
+ if nr==len(ids)-1:
+ return ""
else:
- return "next image"
-
+ if selected:
+ return "next image"
+ else:
+ return "next image"
+ except:
+ return ""
+
def prevImage(self,request,selected=None):
"""show nextimage"""
#return self.getId()
- ids=self.show_thumbs()
- if request.SESSION.has_key("filename"):
- filename=request.SESSION["filename"]
- try:
- nr=ids.index(filename)
- except:
+ 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
- else:
- nr=0
- if nr==0:
- return ""
- else:
- if selected:
- return "previous image"
+ if nr==0:
+ return ""
else:
- return "previous image"
+ if selected:
+ return "previous image"
+ else:
+ return "previous image"
+ except:
+ return ""
def meta_default(self,filename):
"""url der metadaten"""
@@ -281,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):
@@ -297,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):
@@ -336,7 +342,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):
@@ -361,7 +367,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):
@@ -369,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):
@@ -400,27 +406,29 @@ class ImageCollection(Folder, Persistent
def firstSets(self,selected=None):
ids=self.show_thumbs()
- if selected:
- return "first sets"
- else:
- return "first sets"
+ if ids:
+ if selected:
+ return "first sets"
+ else:
+ return "first sets"
def lastSets(self,selected=None):
ids=self.show_thumbs()
- 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"
+ 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"
@@ -428,26 +436,27 @@ class ImageCollection(Folder, Persistent
"""show nextimage"""
ids=self.show_thumbs()
colRows=self.getColTimesRow()
- 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:
+ 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
- else:
- nr=0
- if nr==len(ids)-1:
- return ""
- else:
- if selected:
- return "next set"
+ if nr==len(ids)-1:
+ return ""
else:
- return "next set"
+ if selected:
+ return "next set"
+ else:
+ return "next set"
def prevSets(self,selected=None):
@@ -455,27 +464,32 @@ class ImageCollection(Folder, Persistent
#return self.getId()
ids=self.show_thumbs()
colRows=self.getColTimesRow()
- 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:
+ 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
- except:
+ else:
nr=0
- else:
- nr=0
+ try:
+ num=ids.index(filename)
+ except:
+ num=0
- if ids.index(filename)==0:
- return ""
- else:
- if selected:
- return "previous sets"
+ if num==0:
+ return ""
else:
- return "previous sets"
- else:
- return ""
+ if selected:
+ return "previous sets"
+ else:
+ return "previous sets"
+ else:
+ return ""
def show_thumbs_selected_rows(self,numberOfColumns):
"""Ausgabe anzahl"""
@@ -487,28 +501,31 @@ 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):
"""set coltimes row"""
RESPONSE=self.REQUEST.RESPONSE
if not rows:
- rows=100000
+ rows=None
if rows=="":
- rows=100000
- RESPONSE.setCookie("ImageViewerRows",rows)
+ rows=None
+
+ if rows:
+ RESPONSE.setCookie("ImageViewerRows",rows)
RESPONSE.setCookie("ImageViewerCols",cols)
RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")
def getColTimesRow(self):
+ """coltimesrow"""
REQUEST=self.REQUEST
"""matrix"""
@@ -517,16 +534,20 @@ class ImageCollection(Folder, Persistent
try:
rows=int(REQUEST.cookies["ImageViewerRows"])
except:
- rows=20
+ rows=None
else:
- rows=20
+ rows=None
if REQUEST.cookies.has_key("ImageViewerCols"):
- print "COLS",REQUEST.cookies["ImageViewerCols"]
+ #print "COLS",REQUEST.cookies["ImageViewerCols"]
cols=int(REQUEST.cookies["ImageViewerCols"])
else:
- cols=4
- print cols,rows
+ cols=3
+
+ idsnumber=len(self.show_thumbs())
+ if rows:
+ if cols*rows >idsnumber:
+ rows=int(idsnumber/cols)+1
return (cols,rows)
@@ -548,9 +569,12 @@ class ImageCollection(Folder, Persistent
print "NOR:",numberOfRows
if numberOfRows:
- startPic=idsAll.index(startId)
- endPic=startPic+numberOfColumns*numberOfRows
- ids=idsAll[startPic:endPic]
+ try:
+ startPic=idsAll.index(startId)
+ endPic=startPic+numberOfColumns*numberOfRows
+ ids=idsAll[startPic:endPic]
+ except:
+ ids=idsAll
else:
ids=idsAll
@@ -571,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()
@@ -609,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):
@@ -619,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):