--- ImageArchive/ImageArchive.py 2006/08/31 11:40:06 1.99 +++ ImageArchive/ImageArchive.py 2006/12/08 13:54:21 1.100 @@ -499,7 +499,7 @@ class ImageDigilib(Folder,Persistent,Imp self.scaleWorkingVersions() - self.scaleToJpg() + #self.scaleToJpg() if RESPONSE: RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) @@ -1731,20 +1731,12 @@ class ImageCollection(OrderedFolder, Per else: return ids[(row-1)*numberOfColumns:] - def thumblistSelected_old(self): - """main template collection""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self) - return pt() def thumblistSelected(self): """main template collection""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self) return pt() - def thumblist_old(self): - """main template collection""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self) - return pt() def thumblist(self): """main template collection""" @@ -1947,7 +1939,7 @@ class ImageCollectionMD(ImageCollection, args['_table']=self.imageCollectionConfig.getTable() args[self.imageCollectionConfig.getKey()]=file - if not self.ZSQLInlineSearch(args=args): + if not self.ZSQLInline(args=args): zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding DB: %s"%file) self.ZSQLAdd(args=args) @@ -2250,6 +2242,9 @@ class ImageCollectionMD(ImageCollection, #return url url=urllib.unquote(url) + + url=url.replace(" ","+") # ersetze Leerzeichen in der URL durch "+" + print url xmldoc=urllib.urlopen(url).read() #return xmldoc try: @@ -2311,9 +2306,7 @@ class ImageCollectionMD(ImageCollection, pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) return pt() - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) - return pt() - + def selection(self): """show only selected""" if self.REQUEST.has_key('filename'):