--- ImageArchive/ImageArchive.py 2004/08/03 13:36:30 1.26
+++ ImageArchive/ImageArchive.py 2004/10/13 14:07:19 1.30
@@ -9,6 +9,11 @@ import os
import os.path
import urllib
import xml.dom.minidom
+import operator
+
+def splitPath(str):
+ str2=str.replace("\\","/")
+ return os.path.split(str2)[1]
def getText(nodelist):
@@ -68,7 +73,8 @@ 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)
@@ -129,7 +135,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)
@@ -333,9 +340,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):
@@ -510,21 +518,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 +621,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"]