--- ImageArchive/ImageArchive.py 2005/01/27 20:21:56 1.45
+++ ImageArchive/ImageArchive.py 2005/04/10 13:01:45 1.50
@@ -13,7 +13,7 @@ import operator
import tempfile
import shutil
from types import *
-
+import time
try:
from Products.ECHO_content.ECHO_collection import ECHO_basis
@@ -193,7 +193,7 @@ class ImageDigilib(Folder,Persistent,Imp
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
#print path
- imagefh=urllib.urlopen(path)
+ imagefh=urllib.urlopen(path,'rb')
self.REQUEST.RESPONSE.write(imagefh.read())
self.REQUEST.RESPONSE.close()
@@ -223,10 +223,30 @@ class ImageDigilib(Folder,Persistent,Imp
#umbenennen des versionsfolders
oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")
+ newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
if os.path.exists(oldfolder):
- newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
- os.rename(oldfolder,newfolder)
-
+ os.rename(oldfolder,newfolder)
+ else:
+ os.mkdir(newfolder)
+
+ #schreibe info uber umbennenung
+
+ renameName=os.path.join(newfolder,"renamed")
+ if os.path.exists(renameName):
+ fh=file(renameName,'a')
+ else:
+ fh=file(renameName,'w')
+
+ tm=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
+ try:
+ user=self.REQUEST['AUTHENTICATED_USER']
+ except:
+ user="unknown"
+
+ str="""%s %s %s %s\n"""%(tm,user,oldname,newname)
+ fh.write(str)
+ fh.close()
+
#scale thumb
self.scaleThumbs()
@@ -781,6 +801,58 @@ class ImageCollection(Folder, Persistent
RESPONSE.redirect('manage_main')
+
+ def importStructure(self,path):
+ """import"""
+ splitted=os.path.split(path)
+ if os.path.isDir(path):
+ manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None)
+
+ obj=getattr(self,splitted[1])
+ obj.ImportFiles()
+
+ def ImportStructure(self,RESPONSE=None):
+ """Import the existing files of a folder"""
+ files=os.listdir(self.ImageStoragePath)
+ ret=""
+ #print self.__dict__
+
+
+ for file in files:
+
+ if os.path.isdir(os.path.join(self.ImageStoragePath,file)):
+ manage_AddImageCollection(self,file,file,os.path.join(self.ImageStoragePath,file),self.ImageViewerPath,self.defaultMetaString)
+
+ obj=getattr(self,file)
+ obj.ImportStructure()
+ else:
+ if not file[0]==".":
+ if self.__dict__.has_key(file):
+
+ ret=ret+"
"+file+" already exists!"
+ else:
+ ret=ret+"
"+file+" created!"
+ newObj=ImageDigilib(file,file)
+ #print newObj,file
+ #print newObj
+ try:
+ self._setObject(file,newObj)
+ except:
+ """nothing yet"""
+ #print ret
+ #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+ #print self.ImageStoragePath
+
+ #scale thumb
+
+ #self.scaleThumbs()
+
+ #scale standard
+
+ #self.scaleWorkingVersions()
+
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""
@@ -836,9 +908,10 @@ class ImageCollection(Folder, Persistent
def show_selected_thumbs(self):
#ids=[]
-
- return self.REQUEST.SESSION['filenames']
-
+ try:
+ return self.REQUEST.SESSION['filenames']
+ except:
+ return None
def show_thumbs(self):
ids=[]
for entry in self.__dict__:
@@ -936,7 +1009,25 @@ class ImageCollection(Folder, Persistent
return "previous sets"
else:
return ""
+ def showFolders(self):
+ """show subfolders"""
+ ret=""
+ link=""" %s
"""
+ if self.aq_parent.meta_type=="ImageCollection":
+ ret+=link%(self.aq_parent.absolute_url(), "back ("+self.aq_parent.title+")")
+ ret+="
"
+
+ iCs=self.ZopeFind(self,obj_metatypes="ImageCollection")
+ if not iCs:
+ return ret
+ else:
+
+ link=""" %s
"""
+ for iC in iCs:
+ ret+=link%(iC[1].absolute_url(),iC[0])
+ ret+="
"
+ return ret
def showRuler(self,selected=None):
"""show ruler"""
showall =self.REQUEST.SESSION.get('showall','no')
@@ -945,6 +1036,7 @@ class ImageCollection(Folder, Persistent
return "No entries"
if showall=='no':
+ actualNr=0
ids=self.show_thumbs()
colRows=self.getColTimesRow()
num=int(len(ids)/(colRows[0]*colRows[1]))
@@ -952,19 +1044,63 @@ class ImageCollection(Folder, Persistent
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=""
+ if selected:
+ ret+="""