--- ImageArchive/Attic/#ImageArchive.py# 2003/12/08 18:15:39 1.1 +++ ImageArchive/Attic/#ImageArchive.py# 2004/02/25 18:30:29 1.2 @@ -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) + @@ -97,16 +98,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) 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://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) @@ -139,6 +145,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 +163,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 +206,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""" @@ -249,7 +306,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 +315,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 +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): @@ -308,7 +367,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): @@ -345,6 +404,93 @@ 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 show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() @@ -353,9 +499,86 @@ 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/selectColTimesRow.zpt').__of__(self) + return pt() + + def setDone(self): + """done""" + + pt=PageTemplateFile('Products/ImageArchive/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): + """coltimesrow""" + + REQUEST=self.REQUEST + """matrix""" + if REQUEST.cookies.has_key("ImageViewerRows"): + + try: + rows=int(REQUEST.cookies["ImageViewerRows"]) + except: + rows=None + else: + rows=None + + if REQUEST.cookies.has_key("ImageViewerCols"): + #print "COLS",REQUEST.cookies["ImageViewerCols"] + cols=int(REQUEST.cookies["ImageViewerCols"]) + else: + cols=3 + + idsnumber=len(self.show_thumbs()) + if rows: + if cols*rows >idsnumber: + 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 + except: + startId=idsAll[0] + else: + startId=idsAll[0] + + + print "NOR:",numberOfRows + + if numberOfRows: + 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 @@ -369,6 +592,7 @@ 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) @@ -389,12 +613,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'):