--- ImageArchive/ImageArchive.py 2004/07/19 14:30:14 1.23
+++ ImageArchive/ImageArchive.py 2004/10/13 13:39:59 1.29
@@ -9,6 +9,7 @@ import os
import os.path
import urllib
import xml.dom.minidom
+import operator
def getText(nodelist):
@@ -38,8 +39,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,7 +69,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=os.path.split(fileupload.filename)[1]
+ filename=path_name+"/"+fn
filedata=fileupload.read()
f=open(filename,"w")
f.write(filedata)
@@ -130,7 +131,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=os.path.split(fileupload.filename)[1]
+ newObj=ImageDigilib(id,fn,meta)
self._setObject(id,newObj)
getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)
@@ -507,7 +509,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()
@@ -541,7 +580,7 @@ class ImageCollection(Folder, Persistent
RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")
- def getColTimesRow(self):
+ def getColTimesRow(self,showall='No'):
"""coltimesrow"""
REQUEST=self.REQUEST
@@ -567,6 +606,9 @@ class ImageCollection(Folder, Persistent
rows=int(idsnumber/cols)+1
#print cols,rows
+ if showall=='yes':
+ rows=int(idsnumber/cols)+1
+
return (cols,rows)
@@ -574,7 +616,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"]
@@ -675,7 +718,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()