--- ImageArchive/ImageArchive.py 2004/03/20 10:46:52 1.20 +++ ImageArchive/ImageArchive.py 2004/11/12 10:59:26 1.33 @@ -9,6 +9,13 @@ import os import os.path import urllib import xml.dom.minidom +import operator +import tempfile +import shutil + +def splitPath(str): + str2=str.replace("\\","/") + return os.path.split(str2)[1] def getText(nodelist): @@ -38,8 +45,7 @@ class ImageDigilib(Folder,Persistent,Imp request=self.REQUEST objectCreate=objectType.createObjectManager(id,request) - #for field in self.leiden_meta_fields: - # self.REQUEST[field]=argv[field] + self._setObject(id,objectCreate) objectCreate.propertysheets.meta.manage_editProperties(request) @@ -69,24 +75,36 @@ class ImageDigilib(Folder,Persistent,Imp def uploadImage(self,fileupload,path_name): """upload an Image from an Requast""" #path_name=self.ImageStoragePath - filename=path_name+"/"+fileupload.filename + fn=splitPath(fileupload.filename) + filename=path_name+"/"+fn filedata=fileupload.read() 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) - - + def download(self): """download""" - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,highres" - #self.REQUEST.SESSION['string']=""% path - #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) - return self.REQUEST.RESPONSE.redirect(path) + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires" + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename): + filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename + else: + filename=self.filename + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + image=urllib.urlopen(path).read() + self.REQUEST.RESPONSE.write(image) + self.REQUEST.RESPONSE.close() + #return self.REQUEST.RESPONSE.redirect(path) def thumb(self): """show thumb""" @@ -110,7 +128,7 @@ class ImageDigilib(Folder,Persistent,Imp """show image""" #DEVELOP: take first one for server - path="http://nausikaa2.rz-berlin.mpg.de:18080/digitallibrary/digilib.jsp?lv=1&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 @@ -126,7 +144,8 @@ def manage_AddImageDigilibForm(self): def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None): """Add ImageCollection""" #fileupload=self.REQUEST['fileupload'] - newObj=ImageDigilib(id,fileupload.filename,meta) + fn=splitPath(fileupload.filename) + newObj=ImageDigilib(id,fn,meta) self._setObject(id,newObj) getattr(self,id).uploadImage(fileupload,self.ImageStoragePath) @@ -146,10 +165,145 @@ 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): + + + def createSet(self,RESPONSE=None,local=None): + """download aller gewaehlten files""" + tempfile.tempdir="/tmp/archivesImageServer" + + tmpPath=tempfile.mktemp() + + + tmpZip=tempfile.mktemp()+".zip" + tmpFn=os.path.split(tmpZip)[1] + + + if not os.path.exists(tempfile.tempdir): + os.mkdir(tempfile.tempdir) + + if not os.path.exists(tmpPath): + os.mkdir(tmpPath) + + + if RESPONSE: + RESPONSE.setHeader("Content-Type","text/html") + RESPONSE.write("

I am creating the download archive

") + RESPONSE.write("

1. step: getting the images

") + + if not self.REQUEST.SESSION.has_key('filenames'): + RESPONSE.write("

ERROR

") + RESPONSE.write("

I forgot, the selected files. Please reselect.\n") + return 0 + + for id in self.REQUEST.SESSION['filenames']: + + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]): + filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0] + else: + filename=id[0] + + if RESPONSE: + RESPONSE.write(str("

Get File: %s
\n"%filename)) + + if local: + sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0] + targetPath=tmpPath+"/"+filename + shutil.copyfile(sourcePath,targetPath) + + else: + + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires" + + image=urllib.urlopen(path).read() + + + fh=file(tmpPath+"/"+filename,"w") + + + fh.write(image) + fh.close() + + #folgeseiten + if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1: + ids=self.show_thumbs() + nr=ids.index(id[0]) + + numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1] + for k in range(int(numberOfPages)-1): + i=k+1 + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]): + filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i] + else: + filename=id[0] + + if RESPONSE: + RESPONSE.write(str("

Get File: %s
\n"%filename)) + + if local: + sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+ids[nr+1] + targetPath=tmpPath+"/"+filename + shutil.copyfile(sourcePath,targetPath) + else: + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+ids[nr+i]+"&mo=rawfile,hires" + + image=urllib.urlopen(path).read() + + + fh=file(tmpPath+"/"+filename,"w") + fh.write(image) + fh.close() + + if RESPONSE: + RESPONSE.write("

2. step: creating the downloadable file

") + RESPONSE.write("

Create Zip
") + RESPONSE.write("

This can take a while....
\n") + if RESPONSE: + fh=os.popen2("zip -u %s %s/*"%(tmpZip,tmpPath),1)[1] + RESPONSE.write("
") + for c in fh.read(): + RESPONSE.write(c) + + if c==")": + RESPONSE.write("
\n") + + + else: + os.popen("zip -u %s %s/*"%(tmpZip,tmpPath)) + + + shutil.rmtree(tmpPath) + + if RESPONSE: + RESPONSE.write("

finished
\n") + + if RESPONSE: + len=os.stat(tmpZip)[6] + downloadUrl=self.absolute_url()+"/downloadSet" + RESPONSE.write("""

Click here for download ( %i Byte)

\n"""%(tmpFn,len)) + RESPONSE.write("""

The file will be stored for a while, you can download it later, the URL is:

+

%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn)) + RESPONSE.close() + + def downloadSet(self,fn): + """download prepared set""" + filename="/tmp/archivesImageServer/"+fn + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.zip") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + len=os.stat(filename)[6] + self.REQUEST.RESPONSE.setHeader("Content-Length",len) + images=file(filename).read() + self.REQUEST.RESPONSE.write(images) + self.REQUEST.RESPONSE.close() + + + + def scaleThumbs(self,RESPONSE=None): """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" + + + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) + return "RESCALING STARTED" def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString): self.id=id @@ -164,9 +318,22 @@ 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/zpt/importMeta.zpt').__of__(self) @@ -206,7 +373,7 @@ class ImageCollection(Folder, Persistent return "OK" - def nextImage(self,request,selected=None): + def nextImage(self,request,selected=None,returnFn=None): """show nextimage""" try: ids=self.show_thumbs() @@ -214,14 +381,18 @@ class ImageCollection(Folder, Persistent filename=request.SESSION["filename"] try: nr=ids.index(filename) + except: nr=0 else: nr=0 if nr==len(ids)-1: - return "" + return "" else: + if returnFn: + return ids[nr+1] + if selected: return "next image" else: @@ -277,16 +448,32 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() #print url - dom=xml.dom.minidom.parseString(xmldoc) - - images=dom.getElementsByTagName('imagename') + try: + dom=xml.dom.minidom.parseString(xmldoc) + except: + return xmldoc + images=dom.getElementsByTagName('image') + rc=[] + fnIds={} for image in images: - text=getText(image.childNodes) - if not text=="": - rc.append(str(text)) + imagename=image.getElementsByTagName('imagename')[0] + text=getText(imagename.childNodes) + idnr=image.getElementsByTagName('idnr')[0] + id=getText(idnr.childNodes) + numberOfPages=image.getElementsByTagName('numberOfPages')[0] + nopT=getText(numberOfPages.childNodes) + try: + nop=int(nopT) + except: + nop=0 + if not text=="": + rc.append((str(text),id,nop)) + fnIds[str(text)]=(id,nop) rc.sort() self.REQUEST.SESSION['filenames']=rc + self.REQUEST.SESSION['filenamesIds']=fnIds + pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self) return pt() @@ -317,9 +504,10 @@ class ImageCollection(Folder, Persistent meta=None else: meta=None - - manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta) - return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename) + fn=splitPath(fileupload.filename) + + manage_AddImageDigilib(self,fn,fileupload,meta=meta) + return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) #return self.REQUEST['URL1']+'/'+fileupload.filename def ImportFiles2(self,RESPONSE=None): @@ -342,7 +530,8 @@ 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.ImageViewerPath) + os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) + RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): @@ -490,7 +679,44 @@ class ImageCollection(Folder, Persistent return "previous sets" else: return "" - + + def showRuler(self,selected=None): + """show ruler""" + showall =self.REQUEST.SESSION.get('showall','no') + ids=self.show_thumbs() + if len(ids)==0: + return "No entries" + + if showall=='no': + ids=self.show_thumbs() + colRows=self.getColTimesRow() + num=int(len(ids)/(colRows[0]*colRows[1])) + if not (operator.mod(len(ids),colRows[0]*colRows[1])==0): + num+=1 + a=colRows[0]*colRows[1] + #print num,num+1 + if num>1: + + ret="Show thumbnail group no:
" + for i in range(num): + if (operator.mod(i,10)==0) and i>0: + ret +="
" #alle 10 linebreak einfuegen + k=i*a + if selected: + href=self.REQUEST['URL1']+"/selection?filename="+ids[k] + else: + href=self.REQUEST['URL1']+"?filename="+ids[int(k)] + + ret+="""%i  """%(href,i) + + else: + ret="" + ret+="""show all """%self.REQUEST['URL1'] + else: + ret="""show groups """%self.REQUEST['URL1'] + + return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() @@ -524,7 +750,7 @@ class ImageCollection(Folder, Persistent RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") - def getColTimesRow(self): + def getColTimesRow(self,showall='No'): """coltimesrow""" REQUEST=self.REQUEST @@ -534,20 +760,25 @@ 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 + if showall=='yes': + rows=int(idsnumber/cols)+1 + return (cols,rows) @@ -555,33 +786,42 @@ class ImageCollection(Folder, Persistent """Ausgabe anzahl""" idsAll=self.show_thumbs() - + if len(idsAll)==0: #keine Einträge + return 0 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): @@ -613,6 +853,12 @@ class ImageCollection(Folder, Persistent 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'] @@ -642,7 +888,16 @@ class ImageCollection(Folder, Persistent filen=self.REQUEST['filename'] else: filen="" + self.REQUEST.SESSION['filename']=filen + + if self.REQUEST.has_key('showall'): + + self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') + else: + self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no') + + pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self) return pt() @@ -666,6 +921,10 @@ class ImageCollectionIFrame(ImageCollect meta_type="ImageCollectionIFrame" label=ImageCollection.title + def getImageTag(self): + """ hack : method needed by echo_content""" + return "" + def rotate(self,angle,url,RESPONSE): """rotate"""