--- ImageArchive/ImageArchive.py 2005/01/25 12:26:56 1.44 +++ ImageArchive/ImageArchive.py 2005/04/10 13:47:25 1.52 @@ -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() @@ -288,7 +308,7 @@ class ImageDigilib(Folder,Persistent,Imp return "done" - def thumb(self): + def thumb(self,url=None): """show thumb""" thumbname=os.path.splitext(self.filename)[0]+".jpg" ## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname): @@ -303,8 +323,11 @@ class ImageDigilib(Folder,Persistent,Imp path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname self.REQUEST.SESSION['string']=""% path - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self) - return pt() + if url: + return ""% path + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self) + return pt() def index_html(self): """show image""" @@ -778,6 +801,60 @@ 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)): + imageStoragePath=os.path.join(self.ImageStoragePath,file) + imageViewerPath=os.path.join(self.ImageViewerPath,file) + manage_AddImageCollection(self,file,file,imageStoragePath,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""" @@ -833,9 +910,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__: @@ -933,7 +1011,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') @@ -942,6 +1038,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])) @@ -949,19 +1046,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+="""" + anf="Show thumbnail group no:
" + + + try: + if selected: + href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr-1)*a] + else: + href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr-1)*a)] + + anf+="""%s  """%(href,"prev") + except: + pass + ret=anf+ret + + try: + + if selected: + href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr+1)*a] + else: + href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr+1)*a)] + + end="""%s  """%(href,"next") + except: + end="" + ret=ret+end - ret+="""%i  """%(href,i) + + #for i in range(num): + # + # 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="" @@ -974,6 +1115,9 @@ class ImageCollection(Folder, Persistent def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() + + if not ids: + return None self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 self.REQUEST.SESSION['number']=range(number) @@ -1044,7 +1188,7 @@ class ImageCollection(Folder, Persistent return 0 if self.REQUEST.SESSION.has_key("filename"): filename=self.REQUEST.SESSION["filename"] - + filename=self.getImageByName(filename,onlyName="yes") try: startId=filename @@ -1136,7 +1280,25 @@ class ImageCollection(Folder, Persistent self.REQUEST.SESSION['filename']=filen pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self) return pt() + + def getImageByName(self,filename,onlyName=None): + """get filename""" + fn=getattr(self,filename,None) + if not fn: + filenameM=filename.split(".")[0] + founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) + for found in founds: + foundM=found[0].split(".")[0] + if filenameM.lower()==foundM.lower(): + if onlyName: + return found[0] + else: + return found[1] + if onlyName: + return filename + else: + return fn def index_html(self): """main template collection""" if self.REQUEST.has_key('filename'):