--- ZSQLExtend/ZSQLExtend.py 2005/10/14 15:08:18 1.69
+++ ZSQLExtend/ZSQLExtend.py 2005/11/23 14:15:11 1.73
@@ -17,7 +17,7 @@ import Shared.DC.ZRDB.DA
import zLOG
import os.path
import os
-
+from OFS.SimpleItem import SimpleItem
def analyseIntSearch(word):
#analyse integer searches
@@ -48,11 +48,81 @@ def sql_quote(v):
def showSQLConnectionIDs(self):
return SQLConnectionIDs(self)
+class ZSQLIndex(SimpleItem):
+ """index"""
+ meta_type="ZSQLIndex"
+
+ def __init__(self,index,id,table=''):
+ self.index=[x for x in index]
+ self.id=id
+ self.table=table
+
+ def setIndex(self,index):
+ self.index=[x for x in index]
+
+ def getIndex(self):
+ return self.index
+
class ZSQLExtendFolder(Folder,Persistent, Implicit):
"""Folder"""
meta_type="ZSQLExtendFolder"
-
-
+
+ def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None):
+ #TODO: finish importXMLFile
+ '''
+ Import XML file into the table
+ @param table: name of the table the xml shall be imported into
+ @param containerTagName: XML-Tag which describes a dataset
+ @param file: xmlfile handle
+ @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
+ @param RESPONSE: (optional)
+ '''
+ from xml.dom.pulldom import parseString
+
+ doc=parseString(file.read())
+ while 1:
+ node=doc.getEvent()
+
+ if node is None:
+ break;
+ else:
+ if node[1].nodeName==containerTagName:
+ doc.expandNode(node[1])
+ #fn=node[1].getAttribute("xml:id")
+ #nf=file("xtf/"+fn+".xtf",'w')
+ #nf.write(""""""+node[1].toxml()+"")
+ #print "wrote: %s"%fn
+
+
+ def generateIndex(self,field,index_name,table,RESPONSE=None):
+ """erzeuge index aus feld"""
+ index={}
+ founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table))
+
+ for found in founds:
+ tmp=getattr(found,field,None)
+ if tmp:
+ strings=tmp.split(" ")
+ for string in strings:
+ if index.get(string):
+ index[string].append(found.oid)
+ else:
+ index[string]=[found.oid]
+ RESPONSE.write(string+"\n")
+
+ if not hasattr(self,index_name):
+ obj=ZSQLIndex(index,index_name,table)
+ self._setObject(index_name,obj)
+
+ self._getOb(index_name).setIndex(index)
+
+ def getIndex(self,index_name):
+ """getIndex"""
+ founds=self.ZopeFind(self,obj_ids=[index_name])
+
+ return founds[0][1].getIndex()
+
+
def testneu(self):
"""test"""
relStatement="""period like '%s%%'"""
@@ -64,6 +134,7 @@ class ZSQLExtendFolder(Folder,Persistent
def URLquote(self,txt):
"""urlquote"""
return urllib.quote(txt)
+
def searchRel(self,relStatement,statement,wherePart,classes):
"""suche relative haufigkeiten"""
ret={}
@@ -131,6 +202,8 @@ class ZSQLExtendFolder(Folder,Persistent
def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch
"""
#url=None
+ str=str.rstrip().lstrip()
+
if url and str:
retStr=""
@@ -486,10 +559,10 @@ class ZSQLExtendFolder(Folder,Persistent
qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
- qs=string.join(qs_temp,",")
+
changeList=[]
- for q in qs.split(","):
+ for q in qs_temp:
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
value="=".join(q.split("=")[1:])
@@ -518,6 +591,19 @@ class ZSQLExtendFolder(Folder,Persistent
return True
+ def ZSQLFindIndexed(self,qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv):
+ """find2"""
+
+ for index in self.ZopeFind(self,obj_ids=indexedFields):
+ txt=argv.get(index[0],None)
+ if txt:
+ oids=index[1].getIndex()[txt]
+
+ search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv)
+
+ search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv)
+ return search2
+
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv):
"""find2"""
@@ -529,9 +615,10 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv):
- """Find"""
+ """search in database"""
def delEmpty(list):
+ """"loesche leere elemente aus der liste"""
ret=[]
for x in list:
splitted=x.split("=")
@@ -539,15 +626,11 @@ class ZSQLExtendFolder(Folder,Persistent
ret.append(x)
return ret
-
-
- #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen
if qs=="":
-
+ #kein querystring ubergeben
if self.REQUEST['QUERY_STRING']:
qs=self.REQUEST['QUERY_STRING']
-
qs=string.join(qs.split("&"),",")
for field in argv.keys():
@@ -579,7 +662,7 @@ class ZSQLExtendFolder(Folder,Persistent
- qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.
+ qs=re.sub("\\+"," ",qs)#TODO: Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.
qs=string.join(delEmpty(qs.split(",")),",")
@@ -707,6 +790,8 @@ class ZSQLExtendFolder(Folder,Persistent
"""analysieren den QueryString"""
+ #setzte generische werte
+
lop="AND" # standardsuche mit and
max="ALL" #standard alle auswaehlen
maxstr=""
@@ -722,21 +807,22 @@ class ZSQLExtendFolder(Folder,Persistent
limit=0
searchFields={}
searchFieldsOnly={}
+ queryTemplate=[]
+
if not select:
select="oid,*"
- #print "Q",nostore,qs
- #check for op
-
+ #check for op
+ splitted=qs.split(",")
-
- splitted=qs.split(",")
if tableExt:
table=tableExt
if restrictField:
select=restrictField
-
+
+
+ #erster durchgang suche operatoren
for q in splitted:
name=re.sub("r'+'"," ",q.split("=")[0].lower())
@@ -767,25 +853,21 @@ class ZSQLExtendFolder(Folder,Persistent
sortAllFields=value
else:
sortfields[field]=value
-
- #print "HI",op,field
- #print opfieldsa
- #now analyse the querystring
-
+
+ #zweiter durchgang analysiere felder
for q in qs.split(","):
- #try:
-
+
name=re.sub("r'+'"," ",q.split("=")[0].lower())
try:
value=urllib.unquote(q.split("=",1)[1])
except:
value=""
- #value=sql_quote(value)
-
-
+ punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:
+
+ #analysiere alle anderen faelle
if name==iCT+"lop":
lop=value
elif name==iCT+"table":
@@ -826,7 +908,53 @@ class ZSQLExtendFolder(Folder,Persistent
op=value
+
+ elif (not name[0]==iCT) and len(punktsplit)==4:
+ if opfields.has_key(name):
+ op=opfields[name]
+ else:
+ op="ct"
+ namealt=name
+ name="LOWER("+punktsplit[1]+")"
+
+ if op=="ct":
+ tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
+ elif op=="gt":
+ tmp=(name+">"+sql_quote(value))
+ elif op=="lt":
+ tmp=(name+"<"+sql_quote(value))
+ elif op=="eq":
+ tmp=(name+"="+sql_quote(value))
+ elif op=="bw":
+ tmp=(name+" LIKE "+sql_quote(value+"%"))
+ elif op=="ew":
+ tmp=(name+" LIKE "+sql_quote("%"+value))
+ elif op=="all":
+ tmps=[]
+ for word in value.split(" "):
+ 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="all"
+
+
+ searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
+
+ queryTemplate.append(searchTmp)
+
elif (not name[0]==iCT) and (not len(value)==0):
#print "OP",op,name
@@ -881,6 +1009,7 @@ class ZSQLExtendFolder(Folder,Persistent
whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
+ whereList+=queryTemplate
if len(whereList)>0:
if filter:
@@ -904,7 +1033,7 @@ class ZSQLExtendFolder(Folder,Persistent
#print "QE",table
#print (select,table,where,sort,maxstr,skip)
query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip)
-
+
if not nostore=="yes":
self.REQUEST.SESSION['qs']=opfields
@@ -978,29 +1107,24 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLSearch(self):
"""To be done"""
- rq=self.REQUEST['QUERY_STRING']
-
- querys=rq.split("&")
-
-
+
formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url
+
+ #zerlege querystring in key value paare
+ #TODO: check if this is really necessary, use argv**
- for querytemp in querys:
+ rq=self.REQUEST['QUERY_STRING']
+ querys=rq.split("&")
+ for querytemp in querys: #zerg
query=querytemp.split("=")
-
-
-
try:
if query[0].lower()=="-format":
formatfile=query[1]
except:
- """nothing"""
+ pass
-
- #print formatfile
-
-
+ #sichern
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")
self.REQUEST.SESSION['come_from_search']="yes"