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("
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("""
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
@@ -222,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()
@@ -230,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:
@@ -293,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()
@@ -333,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):
@@ -358,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):
@@ -510,21 +683,29 @@ class ImageCollection(Folder, Persistent
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>1:
+ if num>1:
ret="Show thumbnail group no:"
- for i in range(num+1):
+ 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[k]
+ href=self.REQUEST['URL1']+"?filename="+ids[int(k)]
ret+="""%i """%(href,i)
@@ -605,7 +786,8 @@ 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"]