[BACK]Return to ImageArchive.py CVS log [TXT] [DIR] Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.37 and 1.38

version 1.37, 2004/11/17 15:56:14 version 1.38, 2004/11/18 16:34:36
Line 13  import operator Line 13  import operator
 import tempfile  import tempfile
 import shutil  import shutil
   
   
   try:
       from Products.ECHO_content.ECHO_collection import ECHO_basis
   except:
       print "ECHO Elements not imported"
       ECHO_basis=None
       
 def splitPath(str):  def splitPath(str):
     str2=str.replace("\\","/")      str2=str.replace("\\","/")
     return os.path.split(str2)[1]      return os.path.split(str2)[1]
Line 190  class ImageDigilib(Folder,Persistent,Imp Line 197  class ImageDigilib(Folder,Persistent,Imp
         #DEVELOP: take first one for server          #DEVELOP: take first one for server
                   
         path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]          path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
   
         #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename  
         #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path  
         #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt')).__of__(self)  
         return self.REQUEST.RESPONSE.redirect(path)          return self.REQUEST.RESPONSE.redirect(path)
   
           
Line 215  def manage_AddImageDigilib(self,id,fileu Line 218  def manage_AddImageDigilib(self,id,fileu
         RESPONSE.redirect('manage_main')          RESPONSE.redirect('manage_main')
   
                                     
 class ImageCollection(Folder, Persistent, Implicit):  class ImageCollection(Folder, Persistent, Implicit, ECHO_basis):
     """Sammelordner für Bilder"""      """Sammelordner für Bilder"""
     meta_type="ImageCollection"      meta_type="ImageCollection"
   
Line 405  class ImageCollection(Folder, Persistent Line 408  class ImageCollection(Folder, Persistent
         self.ImageViewerPath=ImageViewerPath          self.ImageViewerPath=ImageViewerPath
         self.defaultMetaString=defaultMetaString          self.defaultMetaString=defaultMetaString
   
     manage_options = Folder.manage_options+(      if ECHO_basis:
           optTMP= Folder.manage_options+ECHO_basis.manage_options
       else:
           optTMP= Folder.manage_options
   
       manage_options = optTMP+(
         {'label':'Main Config','action':'ImageCollection_config'},          {'label':'Main Config','action':'ImageCollection_config'},
         {'label':'Import','action':'ImportFiles'},          {'label':'Import','action':'ImportFiles'},
         {'label':'Recalculate Metadata','action':'recalculateMeta'},          {'label':'Recalculate Metadata','action':'recalculateMeta'},
         {'label':'Import Metadata','action':'importMetaForm'},          {'label':'Import Metadata','action':'importMetaForm'},
         {'label':'Rescale thumbs','action':'scaleThumbs'},          {'label':'Rescale thumbs','action':'scaleThumbs'},
     {'label':'Rescale working version','action':'scaleWorkingVersions'},      {'label':'Rescale working version','action':'scaleWorkingVersions'},
         {'label':'Weight (ECHO)','action':'weightForm'},  
         )          )
   
     def weightForm(self):  
         """Weight"""  
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeWeight.zpt')).__of__(self)  
         return pt()  
   
     def changeWeight(self,weight,RESPONSE=None):  
         """Change weight"""  
         self.weight=weight  
           
         if RESPONSE is not None:  
             RESPONSE.redirect('manage_main')  
   
                   
     def importMetaForm(self):      def importMetaForm(self):
Line 984  class ImageCollection(Folder, Persistent Line 980  class ImageCollection(Folder, Persistent
     def navig_html(self):      def navig_html(self):
         """navigation"""          """navigation"""
         #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']          #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
          
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)
         return pt()          return pt()
   
Line 1005  class ImageCollection(Folder, Persistent Line 1002  class ImageCollection(Folder, Persistent
         else:          else:
             filen=""              filen=""
   
         self.REQUEST.SESSION['filename']=filen          self.REQUEST.SESSION['filename']=filen[0:]
                   
         if self.REQUEST.has_key('showall'):          if self.REQUEST.has_key('showall'):
   
Removed from v.1.37  
changed lines
  Added in v.1.38

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>