--- ImageArchive/ImageArchive.py 2006/05/17 20:37:29 1.87 +++ ImageArchive/ImageArchive.py 2006/05/17 21:42:49 1.88 @@ -1870,15 +1870,38 @@ class ImageCollectionMD(ImageCollection, def searchDB(self,REQUEST=None,RESPONSE=None,xml=None): """search""" - #context.ZSQLFind(_table='vision_main') - urlTmp=REQUEST['URL1'] - url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING'] + rc=[] + fnIds={} + for found in self.ZSQLInlineSearch(args=self.REQUEST.form): + key=getattr(found,self.imageCollectionConfig.getKey()) + key=self.getImageByName(key,onlyName="yes") + rc.append((key,'',0)) + fnIds[key]=('',0) + + rc.sort() + self.REQUEST.SESSION['filenames']=rc + self.REQUEST.SESSION['filenamesIds']=fnIds - if xml is None: - RESPONSE.redirect('xmlinput?url='+urllib.quote(url)) + overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + + if overview: + return overview[0][1]() else: - RESPONSE.redirect(url) + 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() + + #urlTmp=REQUEST['URL1'] + + #url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING'] + + #if xml is None: + # RESPONSE.redirect('xmlinput?url='+urllib.quote(url)) + #else: + # RESPONSE.redirect(url) def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None): """main template collection"""