--- ZSQLExtend/ZSQLExtend.py 2006/09/16 12:34:50 1.91
+++ ZSQLExtend/ZSQLExtend.py 2006/12/14 17:10:23 1.99
@@ -17,8 +17,22 @@ import Shared.DC.ZRDB.DA
import zLOG
import os.path
import os
+import copy
+import unicodedata
+
from OFS.SimpleItem import SimpleItem
+def getTextFromNode(nodename):
+ """get the cdata content of a node"""
+ if nodename is None:
+ return ""
+ nodelist=nodename.childNodes
+ rc = ""
+ for node in nodelist:
+ if node.nodeType == node.TEXT_NODE:
+ rc = rc + node.data
+ return rc
+
def analyseIntSearch(word):
#analyse integer searches
@@ -72,7 +86,232 @@ class ZSQLExtendFolder(Folder,Persistent
return sql_quote(str)
- def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None):
+ def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
+ """normalize a field"""
+ import unicodedata
+
+ if not newFieldName:
+ newFieldName=fieldname+"_normal"
+
+ def normal(str):
+ if str:
+ return unicodedata.normalize('NFKD', str.decode('utf-8')).encode('ASCII', 'ignore')
+ else:
+ return ""
+ if mode=="create": # create the field
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text'))
+
+ qstr="select oid,%s from %s"%(fieldname,table)
+ for result in self.ZSQLSimpleSearch(qstr):
+ qstr="update %s set %s = %s where oid = %s"
+
+ self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid))
+
+ def importAccessModell(self,configFileName,RESPONSE=None):
+ """import tables from access
+ @param configFileName: xml-configfile
+ """
+ from Ft.Xml import Parse
+ fh=file(configFileName)
+
+ doc=Parse(fh)
+
+ x=doc.xpath("//pathToFolder/@path")
+
+
+ if not (len(x)==1): # tag ist nich eineindeutig
+ return False
+
+ pathToFolder=x[0].value
+
+ for db in doc.xpath("//db"):
+
+ containers=db.xpath("./@container")
+ identifiers=db.xpath("./@identify")
+
+
+ if not (len(containers)==1):
+ return False
+ else:
+ container=containers[0].value
+
+ if not (len(identifiers)==1):
+ identifier=None
+ else:
+ identifier=identifiers[0].value
+
+ self.xsdToTable(container.lower(),container,modus="drop",filename=os.path.join(pathToFolder,container.lower()+".xsd"))
+ self.importXMLFileAccess(container.lower(),container,filename=os.path.join(pathToFolder,container.lower()+".xml"),identify=identifier)
+
+ return "
DONE"
+
+ def xsdToTable(self,table,elementNameForTable,modus="update", filename=None,data=None,RESPONSE=None):
+ """reads an xsd file an creates the columns of a table out of its structure
+ @param table: name of the table the xml shall be imported into
+ @param elementNameForTable: must be a element of type complex type. the element of the sequence in the complex type
+ define the columns of the table >table<
+ @param data (optional): data to be imported
+
+ @param filename (optional) or filename
+ @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
+ @param RESPONSE: (optional)
+
+ """
+ #from xml.dom.minidom import parseString,parse
+
+ from Ft.Xml import Parse
+ zLOG.LOG("import xsd",zLOG.INFO,"called")
+ #fh=file("/tmp/fmpxml.xml")
+ import bz2
+ import base64
+
+
+ ret=""
+ if data:
+ data=bz2.decompress(base64.decodestring(data))
+
+ #zLOG.LOG("import xsd",zLOG.INFO,"received file")
+ doc=Parse(data)
+ #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
+
+ elif filename:
+ fh=file(filename)
+ txt=fh.read()
+
+ doc=Parse(txt)
+ #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
+
+
+ Nss={'xsd':'http://www.w3.org/2001/XMLSchema'}
+ definingSequence=doc.xpath("""//xsd:element[@name='%s']/xsd:complexType/xsd:sequence/xsd:element/@name"""%elementNameForTable,explicitNss=Nss)
+
+ fieldNames=[x.value for x in definingSequence]
+
+
+
+ #check if table exists
+
+ qstr="""select relname from pg_class where relname = '%s'"""%table
+ if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table
+ columns=[]
+ create=True
+ else:
+ create=False
+
+ zLOG.LOG("update xsd: fieldnames",zLOG.INFO,repr(fieldNames))
+ qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """
+ columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]
+
+
+ if (modus=="drop") and (not create): #table shall be deleted, therefore it should exist (not create)
+ print "drop"
+ qstr="""DROP TABLE %s """
+ self.ZSQLSimpleSearch(qstr%table)
+ columns=[]
+ create=True
+
+ for fieldName in fieldNames:
+ if type(fieldName) is UnicodeType:
+ fieldName=fieldName.encode('utf-8')
+ zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
+ if fieldName.lower() not in columns:
+
+ if create:# table does not exist therefore create with one column
+ qstr="""create table %s (%s %s)"""
+ create=False
+ else:# otherwise add the field
+ qstr="""alter table %s add %s %s"""
+
+ self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
+ zLOG.LOG("update xsd: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text'))
+
+
+ def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None):
+ '''
+ Import XML file in access format into the table
+ @param table: name of the table the xml shall be imported into
+ @param containerTagName: XML-Tag which describes a dataset
+ @param data: data to be imported
+ @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
+ @param RESPONSE: (optional)
+ '''
+ from xml.dom.pulldom import parseString,parse
+
+ zLOG.LOG("import xml",zLOG.INFO,"called")
+ #fh=file("/tmp/fmpxml.xml")
+ import bz2
+ import base64
+
+ ret=""
+ if data:
+ data=bz2.decompress(base64.decodestring(data))
+
+ zLOG.LOG("import xml",zLOG.INFO,"received file")
+ doc=parseString(data)
+ zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+
+ elif filename:
+ fh=file(filename)
+ doc=parse(fh)
+ zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ while 1:
+ node=doc.getEvent()
+
+ if node is None:
+ break;
+ else:
+ if node[1].nodeName.lower()==container.lower(): # make everything case insensitive
+ doc.expandNode(node[1])
+
+ dataSet={}
+ for col in node[1].childNodes:
+ if col.nodeType is col.ELEMENT_NODE:
+ data=col.nodeName
+ dataSet[data]=getTextFromNode(col)
+
+ update=False
+
+ if identify:
+
+ field=dataSet[identify]
+
+ searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)
+ zLOG.LOG("import xml",zLOG.INFO,searchStr)
+ search=self.ZSQLSimpleSearch(searchStr)
+ if search:
+ update=True
+
+ if update:
+ tmp=[]
+ for fieldName in dataSet.keys():
+ tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldName])))
+ setStr=",".join(tmp)
+
+ field=dataSet[identify]
+
+ queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ self.ZSQLSimpleSearch(queryStr)
+ ret+="ud: %s \n"%field
+ else:
+
+
+ fields=",".join(dataSet.keys())
+ values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
+
+
+ queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
+ self.ZSQLSimpleSearch(queryStr)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+
+
+
+
+ return ret
+
+
+ def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None):
#TODO: finish importXMLFile
'''
Import XML file into the table
@@ -93,11 +332,214 @@ class ZSQLExtendFolder(Folder,Persistent
else:
if node[1].nodeName==containerTagName:
doc.expandNode(node[1])
+ cols=node[1].getElementsByTagName('COL')
+ dataSet=[]
+ for col in cols:
+ data=col.getElementsByTagName('DATA')
+ dataSet.append(getTextFromNode(data[0]))
+ update=False
+ if identify:
+
+ nr=fieldNames.index(identify)
+ field=dataSet[nr]
+
+ searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)
+ zLOG.LOG("import xml",zLOG.INFO,searchStr)
+ search=self.ZSQLSimpleSearch(searchStr)
+ if search:
+ update=True
+
+ if update:
+ tmp=[]
+ for fieldName in fieldNames:
+ tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)])))
+ setStr=",".join(tmp)
+ nr=fieldNames.index(identify)
+ field=dataSet[nr]
+
+ queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ self.ZSQLSimpleSearch(queryStr)
+ ret+="ud: %s \n"%field
+ else:
+
+
+ fields=",".join(fieldNames)
+ values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet])
+
+
+ queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
+ self.ZSQLSimpleSearch(queryStr)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ ret+="ad: %s \n"%field
+
+ elif node[1].nodeName=="METADATA":
+ fieldNames=[]
+ doc.expandNode(node[1])
+
+ names=node[1].getElementsByTagName('FIELD')
+
+ for name in names:
+ fieldNames.append(name.getAttribute('NAME'))
+
+ zLOG.LOG("update xml: fieldnames",zLOG.INFO,repr(fieldNames))
+ qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """
+ columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]
+
+ for fieldName in fieldNames:
+ zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
+ if fieldName not in columns:
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
+ zLOG.LOG("update xml: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text'))
#fn=node[1].getAttribute("xml:id")
#nf=file("xtf/"+fn+".xtf",'w')
#nf.write(""""""+node[1].toxml()+"")
#print "wrote: %s"%fn
+
+
+ def importXMLFileFMP(self,table,data=None,filename=None,update_fields=None,id_field=None,sync_mode=False,RESPONSE=None):
+ '''
+ Import FileMaker XML file (FMPXMLRESULT format) into the table.
+ @param table: name of the table the xml shall be imported into
+ @param data: xml data as bz2 string
+ @param filename: xmlfile filename
+ @param update_fields: (optional) list of fields to update; default is to create all fields
+ @param id_field: (optional) field which uniquely identifies an entry for updating purposes.
+ @param sync_mode: (optional) really synchronise, i.e. delete entries not in XML file
+ @param RESPONSE: (optional)
+ '''
+ from xml.dom.pulldom import parseString,parse
+ import transaction
+
+ ret = ""
+
+ if data:
+ data=bz2.decompress(base64.decodestring(data))
+ zLOG.LOG("fmpxml",zLOG.INFO,"received file")
+ doc=parseString(data)
+ zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")
+
+ elif filename:
+ fh=file(filename)
+ zLOG.LOG("fmpxml",zLOG.INFO,"reading file")
+ doc=parse(fh)
+ zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")
+
+ dbIDs = {}
+ rowcnt = 0
+
+ if id_field is not None:
+ # prepare a list of ids for sync mode
+ qstr="select %s from %s"%(id_field,table)
+ for id in self.ZSQLSimpleSearch(qstr):
+ # value 0: not updated
+ dbIDs[id[0]] = 0;
+ rowcnt += 1
+ zLOG.LOG("fmpxml",zLOG.INFO,"%d entries in DB to sync"%rowcnt)
+
+ fieldNames = []
+ rowcnt = 0
+ id_val = ''
+
+ while 1:
+ node=doc.getEvent()
+
+ if node is None:
+ break;
+
+ # METADATA tag defines number and names of fields in FMPXMLRESULT
+ if node[1].nodeName == 'METADATA':
+ doc.expandNode(node[1])
+
+ names=node[1].getElementsByTagName('FIELD')
+
+ for name in names:
+ fn = name.getAttribute('NAME')
+ fieldNames.append(fn)
+
+ if update_fields is None:
+ # update all fields
+ update_fields = fieldNames
+
+ zLOG.LOG("fmpxml fieldnames:",zLOG.INFO,repr(fieldNames))
+ # get list of fields in db table
+ qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s'"""
+ columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]
+
+ # adjust db table to fields in XML and fieldlist
+ for fieldName in fieldNames:
+ zLOG.LOG("fmpxml fieldname:",zLOG.INFO,repr(fieldName))
+ if (fieldName not in columns) and (fieldName in update_fields):
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
+ zLOG.LOG("fmpxml add field:",zLOG.INFO,qstr%(table,fieldName,'text'))
+
+ # ROW tags (in RESULTSET tag) hold data
+ elif node[1].nodeName == 'ROW':
+ rowcnt += 1
+
+ doc.expandNode(node[1])
+ cols=node[1].getElementsByTagName('COL')
+ dataSet={}
+ i = 0
+ # populate with data
+ for col in cols:
+ data=col.getElementsByTagName('DATA')
+ dataSet[fieldNames[i]] = getTextFromNode(data[0])
+ i += 1
+
+ update=False
+
+ # synchronize by id_field
+ if id_field:
+ id_val=dataSet[id_field]
+ if id_val in dbIDs:
+ dbIDs[id_val] += 1
+ update=True
+
+ if update:
+ # update existing row (by id_field)
+ setvals=[]
+ for fieldName in update_fields:
+ setvals.append("%s = %s"%(fieldName,self.ZSQLQuote(dataSet[fieldName])))
+ setStr=string.join(setvals, ',')
+ id_val=dataSet[id_field]
+ qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val)
+ #zLOG.LOG("fmpxml update:",zLOG.INFO,queryStr)
+ self.ZSQLSimpleSearch(qstr)
+ ret+="up: %s \n"%id_val
+ else:
+ # create new row
+ fields=string.join(update_fields, ',')
+ values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',')
+ qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
+ self.ZSQLSimpleSearch(qstr)
+ #zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr)
+ ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)
+
+ #zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))
+ if (rowcnt % 10) == 0:
+ zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))
+ transaction.commit()
+
+ transaction.commit()
+ if sync_mode:
+ # delete unmatched entries in db
+ for id in dbIDs.keys():
+ # find all not-updated fields
+ if dbIDs[id] == 0:
+ zLOG.LOG("fmpxml delete:",zLOG.INFO,id)
+ qstr = "DELETE FROM %s WHERE %s = '%s'"
+ self.ZSQLSimpleSearch(qstr%(table,id_field,id))
+
+ elif dbIDs[id] > 1:
+ zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id)
+
+ transaction.commit()
+
+ return ret
def generateIndex(self,field,index_name,table,RESPONSE=None):
"""erzeuge index aus feld"""
@@ -405,7 +847,8 @@ class ZSQLExtendFolder(Folder,Persistent
#print "INLINE:",argv
for a in argTmp.keys():
- qs.append(a+"="+urllib.quote(str(argTmp[a])))
+ aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_"
+ qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
#return []
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename)
@@ -413,7 +856,29 @@ class ZSQLExtendFolder(Folder,Persistent
return ret[0]
except:
return None
+
+
+ def ZSQLSequentialSearch(self,_fieldlist,_searchTerm,storename=None,args=None,**argv):
+ """get a list of tuples (fields,searchoptions,table) to search the searchTerm in, returns dictionary. """
+ #print "do search with:",_fieldlist,_searchTerm,storename,args,argv
+ ret={}
+ if args:
+ argTmp=args
+ else:
+ argTmp=argv
+
+ for field in _fieldlist:
+
+ argTmp2=copy.deepcopy(argTmp)
+ argTmp2[field[0]]=_searchTerm
+ argTmp2['_op_'+field[0]]=field[1]
+ argTmp2['_table']=field[2]
+
+ ret[field[0]]=(self.ZSQLInlineSearch(storename=storename,args=argTmp2),field[3],field[4],field[5],field[6])
+ return ret
+
+
def ZSQLInlineSearch(self,storename=None,args=None,**argv):
"""inlinesearch"""
@@ -433,11 +898,9 @@ class ZSQLExtendFolder(Folder,Persistent
#print "INLINE:",argv
for a in argTmp.keys():
- try:
- qs.append(a+"="+urllib.quote(str(argTmp[a])))
- except:
- import urllib
- qs.append(a+"="+urllib.quote(str(argTmp[a])))
+ aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_"
+ qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
+
#return []
@@ -464,8 +927,8 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""
-
-
+
+ #print query
if not query:
query=self.query
@@ -626,7 +1089,10 @@ class ZSQLExtendFolder(Folder,Persistent
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
elif (not (name[0]=="-" or name[0]=="_")):
- changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))
+ if value=="":
+ changeList.append("\""+name+"\"=null")
+ else:
+ changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))
changeString=string.join(changeList,",")
@@ -657,7 +1123,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv):
"""find2"""
-
+
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)
@@ -792,7 +1258,13 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv):
"""suche mit alten parametern bis auf die in argv getauschten"""
+ str = self.ZSQLNewSearchURL(storename, url, args, **argv)
+ return """ %s"""%(str,linkText)
+
+ def ZSQLNewSearchURL(self, storename=None,url=None,args=None,**argv):
+ """suche mit alten parametern bis auf die in argv getauschten"""
+
if storename:
"""store"""
else:
@@ -835,7 +1307,7 @@ class ZSQLExtendFolder(Folder,Persistent
else:
str="ZSQLSearch?"+"&".join(newquery)
- return """ %s"""%(str,linkText)
+ return str
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
"""analysieren den QueryString"""
@@ -852,6 +1324,7 @@ class ZSQLExtendFolder(Folder,Persistent
opfields={}
lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld
sortfields={} #order of sortfields
+ diacritics={} #diacritische zeichen, falls "no", dann werden diese fuer das feld gefiltert.
sortAllFields=None
skip=""
rangeStart=0
@@ -894,6 +1367,10 @@ class ZSQLExtendFolder(Folder,Persistent
field=name[5:]
lopfields[field]=lop
+ if name[0:11]==iCT+"diacritics":
+ field=name[12:]
+ diacritics[field]=value
+
if name[0:10]==iCT+"sortorder":
#sort=value
@@ -919,6 +1396,11 @@ class ZSQLExtendFolder(Folder,Persistent
punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:
#analysiere alle anderen faelle
+
+ if diacritics.get(name,'yes')=='no':
+ """filter diacritische zeichen"""
+ value=unicodedata.normalize('NFKD', value.decode('utf-8')).encode('ASCII', 'ignore')
+
if name==iCT+"lop":
lop=value
elif name==iCT+"table":
@@ -959,6 +1441,13 @@ class ZSQLExtendFolder(Folder,Persistent
op=value
+ #sonderfall Name hat das Format:
+ #TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table
+ #i.e. erzeugt wird
+ #das Statement
+ #WHERE IDENTIFIER_IN_TABELLE in (select * from SELECT_FIELD
+ #where LOWER(SUCHFELD_IN_DIESER_TABELLE) something value)
+ #something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE
elif (not name[0]==iCT) and len(punktsplit)==4:
if opfields.has_key(name):
@@ -967,7 +1456,7 @@ class ZSQLExtendFolder(Folder,Persistent
op="ct"
namealt=name
name="LOWER("+punktsplit[1]+")"
-
+ value=value.lower()
if op=="ct":
tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
elif op=="gt":
@@ -1130,9 +1619,9 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
-
+
if not NoQuery:
-
+
return self.ZSQLQuery(query)
else:
@@ -1683,4 +2172,4 @@ def manage_addZSQLBibliography(self, id,
-
+
\ No newline at end of file