--- ZSQLExtend/ZSQLExtend.py 2004/10/05 17:48:50 1.39
+++ ZSQLExtend/ZSQLExtend.py 2004/10/28 14:16:00 1.46
@@ -13,6 +13,24 @@ from Products.PageTemplates.PageTemplate
from Products.ZSQLMethods.SQL import SQLConnectionIDs
import Shared.DC.ZRDB.DA
+def analyseIntSearch(word):
+ #analyse integer searches
+
+ splitted=word.split("-")
+
+ if len(splitted)==1:
+ return "="+splitted[0]
+
+ if splitted[0]=="":
+ return "< "+splitted[1]
+
+ if splitted[1]=='':
+ return "> "+splitted[0]
+ else:
+ return "BETWEEN "+splitted[0]+" AND "+splitted[1]
+
+
+
def sql_quote(v):
# quote dictionary
quote_dict = {"\'": "''", "\\": "\\\\"}
@@ -40,11 +58,11 @@ class ZSQLExtendFolder(Folder,Persistent
"""suche relative haufigkeiten"""
ret={}
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
- print statement + " where "+wherePart
+
for oneclass in classes:
ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass))
- print statement + " where ("+wherePart+") and "+ relStatement%oneclass
- return (ret,allRecords)
+
+. return (ret,allRecords)
def content_html(self):
"""template fuer content"""
@@ -53,7 +71,7 @@ class ZSQLExtendFolder(Folder,Persistent
obj=getattr(self,"ZSQLBibliography_template")
return obj()
except:
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt'),content_type='text/html').__of__(self)
pt.content_type="text/html"
return pt()
@@ -86,7 +104,7 @@ class ZSQLExtendFolder(Folder,Persistent
def changeZSQLExtendForm(self):
"""change folder config"""
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self)
return pt()
@@ -243,6 +261,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLInlineSearch(self,storename=None,**argv):
"""inlinesearch"""
+
qs=[]
if storename:
"""store"""
@@ -253,7 +272,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)
@@ -262,23 +286,34 @@ class ZSQLExtendFolder(Folder,Persistent
qs=[]
-
+
#print "INLINE:",query
return self.ZSQLSimpleSearch(query)
def ZSQLSimpleSearch(self,query=None):
""" returrn SQLSearch"""
+ #print "hi",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 +432,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']:
@@ -499,14 +534,15 @@ class ZSQLExtendFolder(Folder,Persistent
"""analysieren den QueryString"""
#print "NO",nostore
lop="AND" # standardsuche mit and
- max="ALL" #standard alle auswählen
+ max="ALL" #standard alle auswaehlen
maxstr=""
whereList=[]
sort=""
op="bw"
opfields={}
- lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld
+ lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld
sortfields={} #order of sortfields
+ sortAllFields=None
skip=""
rangeStart=0
limit=0
@@ -642,7 +678,19 @@ class ZSQLExtendFolder(Folder,Persistent
tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
tmp=string.join(tmps,' AND ')
-
+
+ elif op=="numerical":
+ term=analyseIntSearch(value)
+ tmp=(name+" "+term)
+ elif op=="grep":
+ tmp=(name+" ~* "+sql_quote(value))
+ elif op=="one":
+ tmps=[]
+ for word in value.split(" "):
+ tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
+
+ tmp=string.join(tmps,' OR ')
+
op="ct"
if (not tableExt) or (namealt.split('.')[0]==tableExt):
@@ -713,7 +761,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)
@@ -723,6 +771,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLQuery(self,query):
"""query"""
+ #print "hi",query
return self.ZSQLSimpleSearch(query)
def ZSQLSearch(self):
@@ -767,6 +816,7 @@ class ZSQLExtendFolder(Folder,Persistent
def nextLink(self,html,storename="foundCount"):
"""nextLink"""
+
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :
@@ -813,12 +863,13 @@ class ZSQLExtendFolder(Folder,Persistent
newquery.append(query)
newquerystring=string.join(newquery,"&")
-
- return "%s"%(self.actualPath()+"?"+newquerystring,html)
+ return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html)
+
def prevLink(self,html,storename="foundCount"):
"""prev link"""
+
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :
@@ -839,7 +890,7 @@ class ZSQLExtendFolder(Folder,Persistent
if self.REQUEST['QUERY_STRING']=="":
qs=self.REQUEST.SESSION['query']
- #qs=re.sub(r'_','-',qs) #aendern für query
+ #qs=re.sub(r'_','-',qs) #aendern fuer query
queries=string.split(qs,",")
@@ -870,7 +921,7 @@ class ZSQLExtendFolder(Folder,Persistent
newquerystring=string.join(newquery,"&")
- return "%s"%(self.actualPath()+"?"+newquerystring,html)
+ return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html)
@@ -995,7 +1046,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
def changeZSQLBibliographyForm(self):
"""change folder config"""
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLBibliographyForm.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLBibliographyForm.zpt')).__of__(self)
return pt()
@@ -1006,7 +1057,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
obj=getattr(self,"ZSQLBibliography_template")
return obj()
except:
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt')).__of__(self)
pt.content_type="text/html"
return pt()
@@ -1099,13 +1150,13 @@ class ZSQLBibliography(Folder,ZSQLExtend
fn=os.path.splitext(self.REQUEST['fn'])[0]+"."
self.REQUEST['fn']=fn
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record2.xml')).__of__(self)
pt.content_type="text/xml"
return pt()
def getMetaDataXML(self):
"""crate index meta"""
- pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml').__of__(self)
pt.content_type="text/xml"
return pt()