--- ImageArchive/ImageArchive.py 2003/12/08 18:15:02 1.6
+++ ImageArchive/ImageArchive.py 2003/12/10 19:01:58 1.7
@@ -75,8 +75,9 @@ class ImageDigilib(Folder,Persistent,Imp
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)
+ os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
+
@@ -139,6 +140,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,6 +158,7 @@ class ImageCollection(Folder, Persistent
{'label':'Import','action':'ImportFiles'},
{'label':'Recalculate Metadata','action':'recalculateMeta'},
{'label':'Import Metadata','action':'importMetaForm'},
+ {'label':'Rescale thumbs','action':'scaleThumbs'},
)
@@ -194,7 +201,46 @@ class ImageCollection(Folder, Persistent
return "OK"
+ 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:
+ nr=0
+ else:
+ nr=0
+ if nr==len(ids)-1:
+ return ""
+ else:
+ if selected:
+ return "next image"
+ else:
+ return "next image"
+
+ 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:
+ nr=0
+ else:
+ nr=0
+
+ if nr==0:
+ return ""
+ else:
+ if selected:
+ return "previous image"
+ else:
+ return "previous image"
def meta_default(self,filename):
"""url der metadaten"""
@@ -249,7 +295,7 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile('Products/ImageArchive/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 +304,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)
@@ -308,7 +356,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.ImageStoragePath)
RESPONSE.redirect('manage_main')
def ImageCollection_config(self):
@@ -389,12 +437,29 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile('Products/ImageArchive/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)
+ return pt()
+
def navig_html(self):
"""navigation"""
+ #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
pt=PageTemplateFile('Products/ImageArchive/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/overview_selected2.zpt').__of__(self)
+ return pt()
+
def index_html(self):
"""main template collection"""
if self.REQUEST.has_key('filename'):