--- ZSQLExtend/ZSQLExtend.py 2007/04/03 14:44:24 1.109
+++ ZSQLExtend/ZSQLExtend.py 2009/09/23 12:30:50 1.130
@@ -56,6 +56,36 @@ def analyseIntSearch(word):
else:
return "BETWEEN "+splitted[0]+" AND "+splitted[1]
+def unicodify(str):
+ """decode str (utf-8 or latin-1 representation) into unicode object"""
+ if not str:
+ return u""
+ if type(str) is StringType:
+ try:
+ return str.decode('utf-8')
+ except:
+ return str.decode('latin-1')
+ else:
+ return str
+
+def utf8ify(str):
+ """encode unicode object or string into byte string in utf-8 representation"""
+ if not str:
+ return ""
+ if type(str) is StringType:
+ return str
+ else:
+ return str.encode('utf-8')
+
+
+def setPsycopg2UseUnicode():
+ """force Psycopg2DA to return unicode objects"""
+ try:
+ import psycopg2
+ import psycopg2.extensions
+ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+ except:
+ logging.error("Unable to force psycopg2 to use unicode")
def sql_quote(v):
@@ -88,26 +118,44 @@ class ZSQLIndex(SimpleItem):
return self.index
class ZSQLExtendFolder(Folder,Persistent, Implicit):
- """Folder"""
+ """Klasse die Methoden fuer die Abfrage einer SQL-Datenbank zur Verfuegung stellt.
+
+ """
meta_type="ZSQLExtendFolder"
def ZSQLQuote(self,str):
"""quote str for sql"""
return sql_quote(str)
-
+ def unicodify(self, s):
+ """return unicode object for string (utf-8 or latin1) or unicode object s"""
+ return unicodify(s)
+
+ def utf8ify(self, s):
+ """return utf-8 encoded string object for string or unicode object s"""
+ return utf8ify(s)
+
+
def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
- """normalize a field"""
+ """normalize a field, d.h. entfernt alle diakritischen Zeichen und ersetzt diese
+ durch den Grundbuchstaben in einer Spalte einer Tabelle
+ @param table: Tabellename
+ @param fieldname: Name der Spalte
+ @param newFieldName: (optional) default ist fieldname+"_normal"
+ @param mode: (optional) default ist "alter". Mode "alter" aendert ein bestehendes Feld newFieldName, mode "create" erzeugt diese zuerst.
+ """
import unicodedata
if not newFieldName:
newFieldName=fieldname+"_normal"
-
+
+ #normalisierungs routine
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'))
@@ -304,9 +352,8 @@ class ZSQLExtendFolder(Folder,Persistent
logger("update xml",logging.INFO,queryStr)
self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field
- else:
-
+ else:
fields=",".join(dataSet.keys())
values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
@@ -315,116 +362,33 @@ class ZSQLExtendFolder(Folder,Persistent
self.ZSQLSimpleSearch(queryStr)
logger("update xml",logging.INFO,queryStr)
-
-
-
return ret
- def importXMLFile(self,table,containerTagName,fieldNames,data=None,identify=None,filename=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)
- '''
- ret=""
- 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])
- 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)
- logger("import xml",logging.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)
- logger("update xml",logging.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)
- logger("update xml",logging.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'))
-
- logger("update xml: fieldnames",logging.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:
- logger("update xml: fieldname",logging.INFO,repr(fieldName))
- if fieldName not in columns:
- qstr="""alter table %s add %s %s"""
- self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
- logger("update xml: fieldname add",logging.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,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,replace=False,redirect_url=None,ascii_db=False,RESPONSE=None):
+ def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,
+ lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False,
+ debug=False,log_to_response=False,
+ redirect_url=None,RESPONSE=None):
'''
Import FileMaker XML file (FMPXMLRESULT format) into the table.
@param dsn: database connection string
- @param table: name of the table the xml shall be imported into
+ @param table: name of the table the xml shall be imported into (may be comma-separated list)
@param uploadfile: xmlfile file
@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 lc_names: (optional) lower case and clean up field names from XML
+ @param keep_fields: (optional) don't add fields to SQL database
+ @param ascii_db: (optional) assume ascii encoding in db
+ @param replace: (optional) delete and re-insert data
+ @param backup: (optional) create backup of old table (breaks indices)
@param RESPONSE: (optional)
@param redirect_url: (optional) url for redirecting after the upload is done
'''
tfilehd,filename=tempfile.mkstemp()
tfile=os.fdopen(tfilehd,'w')
- logging.error("import %s"%uploadfile)
+ logging.info("import %s"%uploadfile)
for c in uploadfile.read():
tfile.write(c)
tfile.close()
@@ -433,28 +397,65 @@ class ZSQLExtendFolder(Folder,Persistent
if not dsn:
dsn=self.getConnectionObj().connection_string
+
+ tablelist=table.split(',')
+ logging.debug("tablelist: %s" %tablelist)
+ #table=tables
+
+ for t in tablelist :
+ logging.debug("table: %s" %table)
+ options=Options()
+ options.dsn=dsn
+ options.table=t
+ options.filename=filename
+ options.update_fields=update_fields
+ options.id_field=id_field
+ options.sync_mode=sync_mode
+ options.lc_names=lc_names
+ options.replace_table=replace
+ options.keep_fields=keep_fields
+ options.ascii_db=ascii_db
+ options.replace_table=replace
+ options.backup_table=backup
+ options.debug=debug
+
+ if RESPONSE and log_to_response:
+ # set up logging to response as plain text
+ RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
+ RESPONSE.write("Import FMPXML file...\n\n")
+ RESPONSE.flush()
+ loghandler = logging.StreamHandler(RESPONSE)
+ if debug:
+ loghandler.setLevel(logging.DEBUG)
+ else:
+ loghandler.setLevel(logging.INFO)
+ logger = logging.getLogger('db.import.fmpxml')
+ logger.addHandler(loghandler)
+ options.use_logger_instance = logger
+
+ importFMPXML(options)
+
- options=Options()
- options.dsn=dsn
- options.table=table
- options.filename=filename
- options.update_fields=update_fields
- options.id_field=id_field
- options.sync_mode=sync_mode
- options.replace_table=replace
- options.lc_names=True
- options.ascii_db=ascii_db
- importFMPXML(options)
+ if RESPONSE and log_to_response:
+ loghandler.flush()
+ RESPONSE.write("\n\n DONE!")
+
+ elif RESPONSE and redirect_url:
+ RESPONSE.redirect(redirect_url)
+
os.remove(filename)
-
- if RESPONSE and redirect_url:
- RESPONSE.redirect(redirect_url)
+
def generateIndex(self,field,index_name,table,RESPONSE=None):
- """erzeuge index aus feld"""
+ """erzeuge ein Index Objekt einem Feld (experimental)
+ @param field: Feldname zu dem ein Index erzeugt werden soll
+ @param index_name: Name des Index
+ @param table: Tabellen name"""
+
+
index={}
- founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table))
+ founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s """%(field,table))
for found in founds:
tmp=getattr(found,field,None)
@@ -474,26 +475,44 @@ class ZSQLExtendFolder(Folder,Persistent
self._getOb(index_name).setIndex(index)
def getIndex(self,index_name):
- """getIndex"""
+ """getIndex from index_name
+ return an indexObject with index_name
+ """
+
founds=self.ZopeFind(self,obj_ids=[index_name])
return founds[0][1].getIndex()
- def testneu(self):
- """test"""
- relStatement="""period like '%s%%'"""
- statement="select * from cdli_cat"
- wherePart="museum_no like 'VAT%'"
- classes=['Uruk III','Uruk IV']
- return self.searchRel(relStatement,statement,wherePart,classes)
-
def URLquote(self,txt):
- """urlquote"""
+ """urlquote"
+ @param txt: text der urlgequoted werden soll.
+ """
return urllib.quote(txt)
+
+ def createIdSet(self, resultset, idField=None):
+ """returns a (frozen)set of IDs from a SQL-resultset (using idField) or a list (if idField=None)"""
+ logging.debug("createidset for idfield %s"%idField)
+ if idField is None:
+ return frozenset(resultset)
+ else:
+ idlist = [r[idField] for r in resultset]
+ return frozenset(idlist)
+
+ def opIdSet(self, a, b, op):
+ """operate on sets a and b"""
+ logging.debug("opidset with op %s"%op)
+ if (op == 'intersect'):
+ return a.intersection(b)
+ elif (op == 'union'):
+ return a.union(b)
+ elif (op == 'diff'):
+ return a.difference(b)
+
+
def searchRel(self,relStatement,statement,wherePart,classes):
- """suche relative haufigkeiten"""
+ """suche relative haufigkeiten (experimental)"""
ret={}
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
@@ -503,7 +522,7 @@ class ZSQLExtendFolder(Folder,Persistent
return (ret,allRecords)
def content_html(self):
- """template fuer content"""
+ """template fuer content_html Aufruf, notwendig fuer Kompatibiliaet bei gemeinsamem Einsatz mich ECHO-Produkt"""
try:
obj=getattr(self,"ZSQLBibliography_template")
@@ -516,21 +535,21 @@ class ZSQLExtendFolder(Folder,Persistent
def getWeight(self):
- """getLabe"""
+ """getWeight, gewicht notwendig fuer Kompatibiliaet bei gemeinsamem Einsatz mich ECHO-Produkt"""
try:
return self.weight
except:
return ""
def getLabel(self):
- """getLabe"""
+ """getLabel notwendig fuer Kompatibiliaet bei gemeinsamem Einsatz mich ECHO-Produkt"""
try:
return self.label
except:
return ""
def getDescription(self):
- """getLabe"""
+ """getDEscription: notwendig fuer Kompatibiliaet bei gemeinsamem Einsatz mich ECHO-Produkt"""
try:
return self.description
except:
@@ -546,19 +565,26 @@ class ZSQLExtendFolder(Folder,Persistent
return pt()
- def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None):
- """change it"""
+ def changeZSQLExtend(self,label,description,weight=0,connection_id=None,REQUEST=None,):
+ """change the Konfiguration"""
self.connection_id=connection_id
self.weight=weight
self.label=label
self.description=description
-
+
if REQUEST is not None:
return self.manage_main(self, REQUEST)
def formatAscii(self,str,url=None):
- """ersetze ascii umbrueche durch """
- #url=None
+ """ersetze ascii umbrueche durch
+ @param str: string der Formatiert werden soll.
+ @param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url
+ """
+ #logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url)))
+
+ if not str:
+ return ""
+
str=str.rstrip().lstrip()
if url and str:
@@ -572,7 +598,9 @@ class ZSQLExtendFolder(Folder,Persistent
retStr+="""%s """%(strUrl,word)
str=retStr
if str:
- return re.sub(r"[\n]"," ",str)
+ retStr = re.sub(r"[\n]"," ",str)
+ #logging.debug("formatascii out=%s"%(repr(retStr)))
+ return retStr
else:
return ""
@@ -614,15 +642,81 @@ class ZSQLExtendFolder(Folder,Persistent
"""oinly for demo"""
return os.path.splitext(path)[0]+".jpg"
- def ZSQLisEmpty(self,field):
- """Teste ob Treffer leer"""
+ def ZSQLisEmpty(self,str):
+ """Teste ob String leer bzw. none ist.
+ """
#print "field",field
- if not field:
+ if not str:
return 1
- if field.strip()=="":
+ if str.strip()=="":
return 1
return 0
+ def ZSQLMultiSearch(self,_table,_searchField,_value,_idField,_additionalStatement="",_select=None,_subselectAddition="",_storename=None):
+ """
+ Durchsucht in einer Tabelle "table" die Spalte "searchfield" nach dem allen Vorkommnissen
+ von Worten in value und gibt alle Werte mit gleichem id field zurŸck, d.h. es wird die "und" suche Ÿber mehrere Eintrsege in einer
+ Tabelle mit gleichem idField werd realisiert,
+ z.B. fŸr simplesearch ueber mehrere Felder
+ @param _table: Tabelle, die durchsucht werden soll.
+ @param _searchField: Feld, das durchsucht wird
+ @param _value: String der gesucht werden soll, gesucht wird nach allen Worten des Strings, die durch " "-getrennt sind.
+ @param _idField: Feld mit id fŸr die identifikation gleicher EintrŠge
+ @param _additionalStatement: (optional) Zusaetzliches SQL Statement, dass zwischen dem ersten "select from" und dem ersten "where" eingegefŸgt wird.
+ @param _subselectAddition: (optiona) Zusaetliche SQL Statement die hinter das select statement der subselects eingefuegt werde.
+ @param _select: (optional) Alternativer Wert fŸr den ersten SELECT Aufruf.
+ @param _storename: (optional) Name fuer die Zwischenspeicherung von Werten in der Session
+ """
+ if _storename:
+ """store"""
+ else:
+ _storename="foundCount"
+
+ queries=[]
+ #baue jede einzelne abfrage
+ splitted=_value.split(" ")
+ if not _select:
+ _select=_idField
+
+ query="select %s from %s %s where lower(%s) like '%%%s%%'"%(_select,_table,_additionalStatement,_searchField,splitted[0].lower())
+
+ if len(splitted)>1: # mehr als ein Wort
+ query+=" and %s in"%_idField # dann einschraenken
+ for v in splitted[1:]:
+ queries.append("select %s from %s %s where lower(%s) like '%%%s%%'"%(_idField,_table,_subselectAddition,_searchField,v.lower()))
+
+
+ intersect=" intersect ".join(queries) # nun baue sie zusammen
+ query+="(%s)"%intersect
+
+
+ logging.info("ZSQLSimple: %s"%query)
+ retT=self.ZSQLSimpleSearch(query)
+ logging.info("ZSQLSimple: %s"%retT)
+
+ #das Ergebis enthaelt unter u.U. eine id mehrfach, dieses wir jetzt vereinheitlicht.
+
+ retFinalT={}
+ for x in retT:
+ split=_idField.split(".")
+ if len(split)>1:
+ f=split[1]
+ else:
+ f=_idField
+
+ retFinalT[getattr(x,f)]=x
+
+ ret=list(retFinalT.values())
+
+
+ #aus Kompatibilaetsgruenen mit ZSQLSearch / ZSQLInlineSeach noch einzelne Felder in der SESSION belegen.
+ if not self.REQUEST.SESSION.has_key(_storename):
+ self.REQUEST.SESSION[_storename]={}
+
+ self.REQUEST.SESSION[_storename]['searchFieldsOnly']={}
+ self.REQUEST.SESSION[_storename]['qs']=query
+ return ret
+
def ZSQLsearchOptions(self,fieldname=""):
"""return HTML Fragment with search options"""
@@ -635,7 +729,12 @@ class ZSQLExtendFolder(Folder,Persistent
return ret
def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None):
- """generate select options from a cr seperated list"""
+ """generate selection HTML Fragemnt from a cr seperated list
+ @param fieldname: Wert fuer das "name"-Attribute der erzeugten input-Tags
+ @param listField: "cr" (\n) getrennte Liste der Werte
+ @param boxType: (optional) default ist "checkbox", moegliche Werte "checkbox" und "radio"
+ @param checked: "cr" getrennt Liste von Werten aus listField, die als ausgewahlt markiert werden sollen.
+ """
fields=listField.split("\n")
ret=""
for field in fields:
@@ -646,7 +745,14 @@ class ZSQLExtendFolder(Folder,Persistent
return ret
def ZSQLSelectionFromSearchList(self,fieldname,results,fieldnameResult,boxType="checkbox",checked=None):
- """generate select options from a cr seperated list"""
+ """generate select options from research-results Objekt
+ generate selection HTML Fragemnt from a cr seperated list
+ @param fieldname: Wert fuer das "name"-Attribute der erzeugten input-Tags
+ @param results: result Object einer SQL-suche
+ @param fieldNameResult: Feldname des Resultobjekts, das angezeigt werden soll.
+ @param boxType: (optional) default ist "checkbox", moegliche Werte "checkbox" und "radio"
+ @param checked: "cr" getrennt Liste von Werten aus results.fieldNameResult, die als ausgewahlt markiert werden sollen.
+ """
ret=""
if not results: return ""
@@ -691,7 +797,8 @@ class ZSQLExtendFolder(Folder,Persistent
valueName=None,start=None,
multiple='',startValue=None,
additionalSelect="",size=None,
- linelen=None,selected=None):
+ linelen=None,selected=None,
+ clear=False):
"""generate select options form a search list
es wird
"""
return ret
@@ -764,7 +875,7 @@ class ZSQLExtendFolder(Folder,Persistent
#print "INLINE:",argv
for a in argTmp.keys():
- aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_"
+ 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)
@@ -824,6 +935,7 @@ class ZSQLExtendFolder(Folder,Persistent
if x:
value=x
else:
+
value=str(argTmp[a])
qs.append(aFiltered+"="+urllib.quote(value))
@@ -853,7 +965,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""
- logging.error(query)
+ logging.error("ZSQLSimpleSearch X %s"%query)
#print query
if not query:
query=self.query
@@ -862,25 +974,33 @@ class ZSQLExtendFolder(Folder,Persistent
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","")
+ #self._v_searchSQL=self.getConnectionObj()()
self._v_searchSQL.max_rows_=max_rows
+ #self._v_searchSQL.set_client_encoding('UNICODE')
try:
- return self._v_searchSQL.__call__(var=query)
+ logging.error("I am here")
+ t=self._v_searchSQL.__call__(var=query)
+ #t=self._v_searchSQL.query(query)
+ logging.error("I am here %s"%t)
+ return t
except :
-
+ logger("ZSQLSimpleSearch ERROR1",logging.ERROR, '%s %s'%sys.exc_info()[:2])
if sys.exc_info()[0]=="Database Error":
try:
self.getConnectionObj().manage_open_connection()
except:
- logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])
+ logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2])
else:
try:
self._v_searchSQL.max_rows_=max_rows
-
+ #self._v_searchSQL.set_client_encoding('UNICODE')
+
return self._v_searchSQL.__call__(var=query)
+ #return self._v_searchSQL.query(query)
except :
-
+ logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2])
if sys.exc_info()[0]=="Database Error":
try:
self.getConnectionObj().manage_open_connection()
@@ -918,18 +1038,19 @@ class ZSQLExtendFolder(Folder,Persistent
- def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv):
+ def ZSQLAdd(self,format=None,RESPONSE=None,args=None,_useRequest=True,**argv):
"""Neuer Eintrag"""
- if args:
+ if args:
argTmp=args
else:
argTmp=argv
qs_temp=[]
- for a in self.REQUEST.form.keys():
- qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
+ if _useRequest:
+ for a in self.REQUEST.form.keys():
+ qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
qs=string.join(qs_temp,",")
@@ -944,7 +1065,10 @@ class ZSQLExtendFolder(Folder,Persistent
addList={}
for q in qs.split(","):
+ if len(q.split("="))<2:
+ continue
name=re.sub("r'+'"," ",q.split("=")[0].lower())
+
value=q.split("=")[1]
value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)
@@ -1013,16 +1137,17 @@ class ZSQLExtendFolder(Folder,Persistent
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
- identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
+ # old code did identify with lower() which doesn't work for oids
+ #identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower())
elif name=="-format":
format=urllib.unquote(value)
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
elif (not (name[0]=="-" or name[0]=="_")):
- if value=="":
- changeList.append("\""+name+"\"=null")
- else:
- 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,",")
@@ -1124,9 +1249,11 @@ class ZSQLExtendFolder(Folder,Persistent
#print "calling Query with",repr(NoQuery)
+
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)
#print self.REQUEST.SESSION["foundCount"]
+
return ret
@@ -1163,28 +1290,25 @@ class ZSQLExtendFolder(Folder,Persistent
"""suche mit alten parametern bis auf die in argv getauschten"""
if args:
argv=args
-
+
#get the old queries
qs=self.REQUEST.SESSION[storename]['qs']
querys=qs.split(",")
#which arguments are in the old query string
-
queryList={}
for query in querys:
arg=query.split("=")[0]
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_"
- queryList[arg]=query.split("=")[1]
-
-
+ try:
+ queryList[arg]=urllib.unquote_plus(query.split("=")[1])
+ except:
+ queryList[arg]=''
+
argList=[]
arg=""
-
-
-
#gehe durch die zu aendernden Argumente
for argTmp in argv.keys():
-
arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_"
@@ -1196,6 +1320,7 @@ class ZSQLExtendFolder(Folder,Persistent
str="ZSQLSearch?"+urllib.urlencode(queryList)
return str
+
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
"""analysieren den QueryString"""
@@ -1350,6 +1475,7 @@ class ZSQLExtendFolder(Folder,Persistent
#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):
op=opfields[name]
else:
@@ -1378,7 +1504,7 @@ class ZSQLExtendFolder(Folder,Persistent
elif op=="numerical":
term=analyseIntSearch(value)
- tmp=(name+" "+term)
+ tmp=(namealt+" "+term) # take namealt without LOWER
elif op=="grep":
tmp=(name+" ~* "+sql_quote(value))
elif op=="one":
@@ -1390,10 +1516,10 @@ class ZSQLExtendFolder(Folder,Persistent
op="all"
+ if value!='': #lehre Werte werde nicht hinzugefuegt
+ searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
- searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
-
- queryTemplate.append(searchTmp)
+ queryTemplate.append(searchTmp)
elif (not name[0]==iCT) and (not len(value)==0):
@@ -1428,7 +1554,7 @@ class ZSQLExtendFolder(Folder,Persistent
elif op=="numerical":
term=analyseIntSearch(value)
- tmp=(name+" "+term)
+ tmp=(namealt+" "+term) # take namealt without LOWER
elif op=="grep":
tmp=(name+" ~* "+sql_quote(value))
elif op=="one":
@@ -1440,7 +1566,7 @@ class ZSQLExtendFolder(Folder,Persistent
op="all"
- if (not tableExt) or (namealt.split('.')[0]==tableExt):
+ if (value!='') and ((not tableExt) or (namealt.split('.')[0]==tableExt)): #keine leeren werde und keine auschluss
if searchFields.has_key(namealt):
searchFields[namealt]+=lopfields.get(name,'OR')+" "+tmp
searchFieldsOnly[namealt]+=lopfields.get(name,'OR')+" "+value
@@ -2023,4 +2149,4 @@ def manage_addZSQLBibliography(self, id,
-
\ No newline at end of file
+