--- ZSQLExtend/ZSQLExtend.py 2004/10/06 10:51:07 1.40 +++ ZSQLExtend/ZSQLExtend.py 2004/10/19 11:24:12 1.41 @@ -243,6 +243,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLInlineSearch(self,storename=None,**argv): """inlinesearch""" + qs=[] if storename: """store""" @@ -253,7 +254,12 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",argv for a in argv.keys(): - qs.append(a+"="+urllib.quote(str(argv[a]))) + try: + qs.append(a+"="+urllib.quote(str(argv[a]))) + except: + import urllib + qs.append(a+"="+urllib.quote(str(argv[a]))) + #return [] return self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -269,16 +275,27 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLSimpleSearch(self,query=None): """ returrn SQLSearch""" + #print query if not query: query=self.query - - if self.search.meta_type=="Z SQL Method": + if getattr(self,'_v_search',None): + + return self._v_search(var=query) + + if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"): + self._v_search=self.search return self.search(var=query) else: - if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method": + if hasattr(self.aq_parent.aq_parent,'search') and (self.aq_parent.aq_parent.search.meta_type=="Z SQL Method"): + self._v_search=self.aq_parent.aq_parent.search return self.aq_parent.aq_parent.search(var=query) else: - return [] + search=self.ZopeFind(self,obj_metatypes=["Z SQL Method"],search_sub=1) + if search: + self._v_search=search[0][1] + return search[0][1](var=query) + else: + return [] @@ -397,7 +414,7 @@ class ZSQLExtendFolder(Folder,Persistent ret.append(x) return ret - #self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen + #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen if qs=="": if self.REQUEST['QUERY_STRING']: @@ -714,7 +731,7 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly - #print "QS", query + if not NoQuery: return self.ZSQLQuery(query) @@ -724,6 +741,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLQuery(self,query): """query""" + #print "hi",query return self.ZSQLSimpleSearch(query) def ZSQLSearch(self):