ZSQLExtend/ZSQLExtend.py - diff

Return to ZSQLExtend.py CVS log

Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.40 and 1.42

version 1.40, 2004/10/06 10:51:07	version 1.42, 2004/10/21 15:36:53
Line 13 from Products.PageTemplates.PageTemplate	Line 13 from Products.PageTemplates.PageTemplate
from Products.ZSQLMethods.SQL import SQLConnectionIDs	from Products.ZSQLMethods.SQL import SQLConnectionIDs
import Shared.DC.ZRDB.DA	import Shared.DC.ZRDB.DA

	def analyseIntSearch(word):
	#analyse integer searches

	splitted=word.split("-")
	print splitted
	if splitted[0]=="":
	return "< "+splitted[1]

	if splitted[1]=='':
	return "> "+splitted[0]
	else:
	return "BETWEEN "+splitted[0]+" AND "+splitted[1]



def sql_quote(v):	def sql_quote(v):
# quote dictionary	# quote dictionary
quote_dict = {"\'": "''", "\\": "\\\\"}	quote_dict = {"\'": "''", "\\": "\\\\"}
Line 243 class ZSQLExtendFolder(Folder,Persistent	Line 258 class ZSQLExtendFolder(Folder,Persistent

def ZSQLInlineSearch(self,storename=None,**argv):	def ZSQLInlineSearch(self,storename=None,**argv):
"""inlinesearch"""	"""inlinesearch"""

qs=[]	qs=[]
if storename:	if storename:
"""store"""	"""store"""
Line 253 class ZSQLExtendFolder(Folder,Persistent	Line 269 class ZSQLExtendFolder(Folder,Persistent

#print "INLINE:",argv	#print "INLINE:",argv
for a in argv.keys():	for a in argv.keys():
	try:
	qs.append(a+"="+urllib.quote(str(argv[a])))
	except:
	import urllib
qs.append(a+"="+urllib.quote(str(argv[a])))	qs.append(a+"="+urllib.quote(str(argv[a])))

#return []	#return []
return self.parseQueryString(string.join(qs,","),"_",storename=storename)	return self.parseQueryString(string.join(qs,","),"_",storename=storename)

Line 269 class ZSQLExtendFolder(Folder,Persistent	Line 290 class ZSQLExtendFolder(Folder,Persistent

def ZSQLSimpleSearch(self,query=None):	def ZSQLSimpleSearch(self,query=None):
""" returrn SQLSearch"""	""" returrn SQLSearch"""
	#print query
if not query:	if not query:
query=self.query	query=self.query
	if getattr(self,'_v_search',None):

	return self._v_search(var=query)

if self.search.meta_type=="Z SQL Method":	if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"):
	self._v_search=self.search
return self.search(var=query)	return self.search(var=query)
else:	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)	return self.aq_parent.aq_parent.search(var=query)
else:	else:
	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 []	return []


Line 397 class ZSQLExtendFolder(Folder,Persistent	Line 429 class ZSQLExtendFolder(Folder,Persistent
ret.append(x)	ret.append(x)
return ret	return ret

#self.REQUEST.SESSION['come_from_search']="no" # zur�cksetzen	#self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen
if qs=="":	if qs=="":

if self.REQUEST['QUERY_STRING']:	if self.REQUEST['QUERY_STRING']:
Line 644 class ZSQLExtendFolder(Folder,Persistent	Line 676 class ZSQLExtendFolder(Folder,Persistent

tmp=string.join(tmps,' AND ')	tmp=string.join(tmps,' AND ')

	elif op=="numerical":
	term=analyseIntSearch(value)
	tmp=(name+" "+term)
	elif op=="one":
	tmps=[]
	for word in value.split(" "):
	tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))

	tmp=string.join(tmps,' OR ')

op="ct"	op="ct"

if (not tableExt) or (namealt.split('.')[0]==tableExt):	if (not tableExt) or (namealt.split('.')[0]==tableExt):
Line 714 class ZSQLExtendFolder(Folder,Persistent	Line 756 class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['rangeSize']=limit	self.REQUEST.SESSION[storename]['rangeSize']=limit
self.REQUEST.SESSION[storename]['searchFields']=searchFields	self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly	self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
#print "QS", query
if not NoQuery:	if not NoQuery:

return self.ZSQLQuery(query)	return self.ZSQLQuery(query)
Line 724 class ZSQLExtendFolder(Folder,Persistent	Line 766 class ZSQLExtendFolder(Folder,Persistent

def ZSQLQuery(self,query):	def ZSQLQuery(self,query):
"""query"""	"""query"""
	#print "hi",query
return self.ZSQLSimpleSearch(query)	return self.ZSQLSimpleSearch(query)

def ZSQLSearch(self):	def ZSQLSearch(self):
Line 768 class ZSQLExtendFolder(Folder,Persistent	Line 811 class ZSQLExtendFolder(Folder,Persistent

def nextLink(self,html,storename="foundCount"):	def nextLink(self,html,storename="foundCount"):
"""nextLink"""	"""nextLink"""
	print self.REQUEST.SESSION[storename]['rangeSize']
try:	try:
limit=self.REQUEST.SESSION[storename]['rangeSize']	limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :	if int(limit)==0 :
Line 820 class ZSQLExtendFolder(Folder,Persistent	Line 864 class ZSQLExtendFolder(Folder,Persistent

def prevLink(self,html,storename="foundCount"):	def prevLink(self,html,storename="foundCount"):
"""prev link"""	"""prev link"""

try:	try:
limit=self.REQUEST.SESSION[storename]['rangeSize']	limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :	if int(limit)==0 :

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

Removed from v.1.40
changed lines
	Added in v.1.42