--- ZSQLExtend/ZSQLExtend.py 2006/11/07 11:15:04 1.96
+++ ZSQLExtend/ZSQLExtend.py 2007/07/24 09:22:14 1.117
@@ -1,13 +1,11 @@
-
from OFS.Folder import Folder
from Acquisition import Implicit
from Globals import DTMLFile,package_home,Persistent
import urllib
import re
import string
-import sys
#from pyPgSQL import libpq
-from AccessControl import getSecurityManager
+from AccessControl import getSecurityManager,Unauthorized
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -15,11 +13,19 @@ from Products.ZSQLMethods.SQL import SQL
from xml.sax.saxutils import escape
from types import *
import Shared.DC.ZRDB.DA
-import zLOG
+import logging
import os.path
import os
import copy
import unicodedata
+import tempfile
+import sys
+
+#ersetzt logging
+def logger(txt,method,txt2):
+ """logging"""
+ logging.info(txt+ txt2)
+
from OFS.SimpleItem import SimpleItem
@@ -50,6 +56,27 @@ 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 sql_quote(v):
@@ -63,6 +90,9 @@ def sql_quote(v):
def showSQLConnectionIDs(self):
return SQLConnectionIDs(self)
+class Options:
+ """options class"""
+
class ZSQLIndex(SimpleItem):
"""index"""
meta_type="ZSQLIndex"
@@ -79,7 +109,9 @@ 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):
@@ -88,17 +120,25 @@ class ZSQLExtendFolder(Folder,Persistent
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'))
@@ -162,7 +202,7 @@ class ZSQLExtendFolder(Folder,Persistent
#from xml.dom.minidom import parseString,parse
from Ft.Xml import Parse
- zLOG.LOG("import xsd",zLOG.INFO,"called")
+ logger("import xsd",logging.INFO,"called")
#fh=file("/tmp/fmpxml.xml")
import bz2
import base64
@@ -172,16 +212,16 @@ class ZSQLExtendFolder(Folder,Persistent
if data:
data=bz2.decompress(base64.decodestring(data))
- #zLOG.LOG("import xsd",zLOG.INFO,"received file")
+ #logger("import xsd",logging.INFO,"received file")
doc=Parse(data)
- #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
+ #logger("import xsd",logging.INFO,"parsed file")
elif filename:
fh=file(filename)
txt=fh.read()
doc=Parse(txt)
- #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
+ #logger("import xsd",logging.INFO,"parsed file")
Nss={'xsd':'http://www.w3.org/2001/XMLSchema'}
@@ -200,7 +240,7 @@ class ZSQLExtendFolder(Folder,Persistent
else:
create=False
- zLOG.LOG("update xsd: fieldnames",zLOG.INFO,repr(fieldNames))
+ logger("update xsd: 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)]
@@ -215,7 +255,7 @@ class ZSQLExtendFolder(Folder,Persistent
for fieldName in fieldNames:
if type(fieldName) is UnicodeType:
fieldName=fieldName.encode('utf-8')
- zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
+ logging.info("update xml: fieldname",logging.INFO,repr(fieldName))
if fieldName.lower() not in columns:
if create:# table does not exist therefore create with one column
@@ -225,7 +265,7 @@ class ZSQLExtendFolder(Folder,Persistent
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'))
+ logger("update xsd: fieldname add",logging.INFO,qstr%(table,fieldName,'text'))
def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None):
@@ -239,7 +279,7 @@ class ZSQLExtendFolder(Folder,Persistent
'''
from xml.dom.pulldom import parseString,parse
- zLOG.LOG("import xml",zLOG.INFO,"called")
+ logger("import xml",logging.INFO,"called")
#fh=file("/tmp/fmpxml.xml")
import bz2
import base64
@@ -248,14 +288,14 @@ class ZSQLExtendFolder(Folder,Persistent
if data:
data=bz2.decompress(base64.decodestring(data))
- zLOG.LOG("import xml",zLOG.INFO,"received file")
+ logger("import xml",logging.INFO,"received file")
doc=parseString(data)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ logger("import xml",logging.INFO,"parsed file")
elif filename:
fh=file(filename)
doc=parse(fh)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ logger("import xml",logging.INFO,"parsed file")
while 1:
node=doc.getEvent()
@@ -278,7 +318,7 @@ class ZSQLExtendFolder(Folder,Persistent
field=dataSet[identify]
searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)
- zLOG.LOG("import xml",zLOG.INFO,searchStr)
+ logger("import xml",logging.INFO,searchStr)
search=self.ZSQLSimpleSearch(searchStr)
if search:
update=True
@@ -292,117 +332,83 @@ class ZSQLExtendFolder(Folder,Persistent
field=dataSet[identify]
queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)
- zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ 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()])
queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
self.ZSQLSimpleSearch(queryStr)
- zLOG.LOG("update xml",zLOG.INFO,queryStr)
-
+ logger("update xml",logging.INFO,queryStr)
-
-
return ret
- def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None):
- #TODO: finish importXMLFile
+ def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,
+ lc_names=True,keep_fields=False,replace=False,ascii_db=False,
+ redirect_url=None,RESPONSE=None):
'''
- Import XML file into the table
+ 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 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 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 RESPONSE: (optional)
+ @param redirect_url: (optional) url for redirecting after the upload is done
'''
- 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)
- 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')
+ tfilehd,filename=tempfile.mkstemp()
+ tfile=os.fdopen(tfilehd,'w')
+ logging.info("import %s"%uploadfile)
+ for c in uploadfile.read():
+ tfile.write(c)
+ tfile.close()
+
+ from importFMPXML import importFMPXML
+
+ if not dsn:
+ dsn=self.getConnectionObj().connection_string
+
+ 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.lc_names=lc_names
+ options.replace_table=replace
+ options.keep_fields=keep_fields
+ options.ascii_db=ascii_db
+ options.replace_table=replace
- 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
-
+ importFMPXML(options)
+
+ 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)
@@ -422,26 +428,23 @@ 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 searchRel(self,relStatement,statement,wherePart,classes):
- """suche relative haufigkeiten"""
+ """suche relative haufigkeiten (experimental)"""
ret={}
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
@@ -451,7 +454,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")
@@ -464,21 +467,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:
@@ -495,7 +498,7 @@ class ZSQLExtendFolder(Folder,Persistent
def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None):
- """change it"""
+ """change the Konfiguration"""
self.connection_id=connection_id
self.weight=weight
self.label=label
@@ -505,8 +508,15 @@ class ZSQLExtendFolder(Folder,Persistent
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:
@@ -520,7 +530,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 ""
@@ -562,15 +574,80 @@ 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=="":
+ 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 _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"""
@@ -583,7 +660,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:
@@ -594,7 +676,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 ""
@@ -634,7 +723,13 @@ class ZSQLExtendFolder(Folder,Persistent
ret+=""""""
return ret
- def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None,selected=None):
+ def ZSQLOptionsFromSearchList(self,fieldname,
+ results,fieldName,
+ valueName=None,start=None,
+ multiple='',startValue=None,
+ additionalSelect="",size=None,
+ linelen=None,selected=None,
+ clear=False):
"""generate select options form a search list
es wird
"""
return ret
@@ -705,7 +806,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)
@@ -734,9 +836,11 @@ class ZSQLExtendFolder(Folder,Persistent
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"""
-
+
qs=[]
if storename:
"""store"""
@@ -753,11 +857,19 @@ 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 "_"
+
+ if type(argTmp[a]) is ListType: # ein parameter zweimal
+ value=""
+ #TODO find a better solution, currently only the last non empty entry is used.
+ for x in argTmp[a]:
+ if x:
+ value=x
+ else:
+
+ value=str(argTmp[a])
+ qs.append(aFiltered+"="+urllib.quote(value))
+
#return []
@@ -776,15 +888,15 @@ class ZSQLExtendFolder(Folder,Persistent
try:
self.getConnectionObj().manage_close_connection()
except:
- zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2])
try:
self.getConnectionObj().manage_open_connection()
except:
- zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2])
def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""
-
+ logging.error("ZSQLSimpleSearch X %s"%query)
#print query
if not query:
query=self.query
@@ -793,30 +905,38 @@ 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:
- zLOG.LOG("ZSQLSimpleSearch",zLOG.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()
except:
- zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])
def getConnectionObj(self):
if hasattr(self,'connection_id'):
@@ -904,7 +1024,7 @@ class ZSQLExtendFolder(Folder,Persistent
else:
return True
- def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
+ def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv):
"""change entries"""
#qs=self.REQUEST['QUERY_STRING']
# very bad hack
@@ -916,19 +1036,23 @@ class ZSQLExtendFolder(Folder,Persistent
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
-
- for field in argv.keys():
+ if args:
+ arg_tmp=args
+ else:
+ arg_tmp=argv
+
+ for field in arg_tmp.keys():
if field[0]=="_":
fieldTmp="-"+field[1:]
else:
fieldTmp=field
- qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
+ qs_temp.append("%s=%s"%(fieldTmp,arg_tmp[field]))
changeList=[]
-
+ logging.info("ZSQLChange qs_temp: %s"%repr(qs_temp))
for q in qs_temp:
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
@@ -940,7 +1064,7 @@ class ZSQLExtendFolder(Folder,Persistent
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
- identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
+ 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):
@@ -954,7 +1078,7 @@ class ZSQLExtendFolder(Folder,Persistent
changeString=string.join(changeList,",")
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
- zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString)
+ logger("ZSQLExtend",logging.INFO,"CHANGE: "+queryString)
self.ZSQLSimpleSearch(queryString)
@@ -965,7 +1089,7 @@ class ZSQLExtendFolder(Folder,Persistent
return True
- def ZSQLFindIndexed(self,qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv):
+ def ZSQLFindIndexed(self,tableList=[],qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv):
"""find2"""
for index in self.ZopeFind(self,obj_ids=indexedFields):
@@ -988,7 +1112,7 @@ 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):
+ def ZSQLFind(self,qs="",select="oid,*",storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv):
"""search in database"""
def delEmpty(list):
@@ -1040,130 +1164,98 @@ class ZSQLExtendFolder(Folder,Persistent
qs=string.join(delEmpty(qs.split(",")),",")
- if storename:
- """store"""
- else:
- storename="foundCount"
#store query for further usage
+ #TODO: erste der beiden ist ueberfluessig
self.REQUEST.SESSION['query']=qs
-
+ if not self.REQUEST.SESSION.has_key(storename):
+ self.REQUEST.SESSION[storename]={}
+
+ self.REQUEST.SESSION[storename]['qs']=qs
+
+
#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
def ZSQLFoundCountLen(self,var):
return len(var)
- def ZSQLFoundCount(self,qs="",select="*",storename=None):
-
- ## if qs=="":
-
-## if self.REQUEST['QUERY_STRING']:
-
-## qs=self.REQUEST['QUERY_STRING']
-## qs=string.join(qs.split("&"),",")
-## else:
-
-## qs=self.REQUEST.SESSION['query']
-## else:
-## qs=string.join(qs.split("&"),",")
-
-
-## temp= self.parseQueryString(qs,"-",select=select,storemax="yes",nostore="yes")
- if storename:
- """store"""
- else:
- storename="foundCount"
-
+ def ZSQLFoundCount(self,qs="",select="*",storename="foundCount"):
+
return self.REQUEST.SESSION[storename]['count']
- def ZSQLRangeStart(self,storename=None):
-
- if storename:
- """store"""
- else:
- storename="foundCount"
-
+ def ZSQLRangeStart(self,storename="foundCount"):
+
return int(self.REQUEST.SESSION[storename]['rangeStart'])+1
- def ZSQLRangeSize(self,storename=None):
+ def ZSQLRangeSize(self,storename="foundCount"):
- if storename:
- """store"""
- else:
- storename="foundCount"
-
return self.REQUEST.SESSION[storename]['rangeSize']
- def ZSQLRangeEnd(self,storename=None):
-
- if storename:
- """store"""
- else:
- storename="foundCount"
-
+ def ZSQLRangeEnd(self,storename="foundCount"):
+
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
- def ZSQLNewQuery(self,linkText,storename=None,**argv):
+ def ZSQLNewQuery(self,linkText,storename="foundCount",**argv):
"""suche neu"""
return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv)
- def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv):
+ def ZSQLNewSearch(self,linkText,storename="foundCount",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)
+
- if storename:
- """store"""
- else:
- storename="foundCount"
- qs=self.REQUEST.SESSION[storename]['qs']
-
+ def ZSQLNewSearchURL(self, storename="foundCount",url=None,args=None,**argv):
+ """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 "_"
+ try:
+ queryList[arg]=query.split("=")[1]
+ except:
+ queryList[arg]=''
+
argList=[]
arg=""
- queryList=[x.split("=")[0] for x in querys]
+
+
+ #gehe durch die zu aendernden Argumente
for argTmp in argv.keys():
-
- arg=argTmp[0:]
- if arg[0]=="_":arg="-"+argTmp[1:] # aender _ in - als standard
-
- if arg not in queryList: # noch nicht drin
- querys.append("%s=%s"%(arg,argv[argTmp]))
- argList.append(arg)
-
+ arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird
+ if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_"
-
- newquery=[]
- for query in querys:
- queryArg=query.split("=")[0]
- qarg=queryArg[0:]
- if qarg[0]=="-":qarg="_"+queryArg[1:] # aender _ in - als standard
-
- if queryArg in argList:
- newquery.append("%s=%s"%(queryArg,argv[qarg]))
- else:
- newquery.append(query)
+ queryList[arg]=argv[argTmp]
if url:
- str=url+"?"+"&".join(newquery)
+ str=url+"?"+urllib.urlencode(queryList)
else:
- str="ZSQLSearch?"+"&".join(newquery)
+ str="ZSQLSearch?"+urllib.urlencode(queryList)
- 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):
+ 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"""
-
-
+
+
#setzte generische werte
lop="AND" # standardsuche mit and
@@ -1183,6 +1275,8 @@ class ZSQLExtendFolder(Folder,Persistent
searchFields={}
searchFieldsOnly={}
queryTemplate=[]
+ outerjoin=""
+ debug=None
if not select:
select="oid,*"
@@ -1199,8 +1293,11 @@ class ZSQLExtendFolder(Folder,Persistent
#erster durchgang suche operatoren
for q in splitted:
-
+
name=re.sub("r'+'"," ",q.split("=")[0].lower())
+ if name=="_debug":
+ debug=True
+
try:
value=urllib.unquote(q.split("=",1)[1])
except:
@@ -1239,8 +1336,10 @@ class ZSQLExtendFolder(Folder,Persistent
name=re.sub("r'+'"," ",q.split("=")[0].lower())
+
try:
value=urllib.unquote(q.split("=",1)[1])
+
except:
value=""
@@ -1268,9 +1367,14 @@ class ZSQLExtendFolder(Folder,Persistent
skip="OFFSET "+str(value)
rangeStart=str(value)
elif name==iCT+"join":
+
whereList.append(value)
+ elif name==iCT+"outerjoin":
+
+ outerjoin=value
elif name==iCT+"sort":
sortstrs=[]
+
for word in value.split(','):
wordstr=word.lstrip().rstrip()
if sortAllFields:
@@ -1296,11 +1400,12 @@ class ZSQLExtendFolder(Folder,Persistent
#TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table
#i.e. erzeugt wird
#das Statement
- #WHERE DENTIFIER_IN_TABELLE_-table in (select from SELECT_FIELD
- #where LOWER(UCHFELD_IN_DIESER_TABELLE) something value)
- #something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table
+ #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):
op=opfields[name]
else:
@@ -1341,15 +1446,16 @@ 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):
#print "OP",op,name
value=value.lower()
+
tmp=""
if opfields.has_key(name):
op=opfields[name]
@@ -1390,7 +1496,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
@@ -1423,14 +1529,14 @@ 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)
+ query="SELECT %s FROM %s %s %s %s %s %s"%(select,table,outerjoin,where,sort,maxstr,skip)
if not nostore=="yes":
self.REQUEST.SESSION['qs']=opfields
#print "IAMHERE again:", query
- if storename and (not NoQuery):
+ if not NoQuery:
query2="SELECT count(*) FROM %s %s"%(table,where)
@@ -1439,9 +1545,9 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]={}
self.REQUEST.SESSION[storename]['qs']=qs #sichere Querystring
-
+
if self.REQUEST.SESSION[storename].has_key('queryString2'):
-
+
if not self.REQUEST.SESSION[storename]['queryString2']==query2:
#print "HOOOOO",storename
self.REQUEST.SESSION[storename]['queryString2']=query2
@@ -1452,9 +1558,10 @@ class ZSQLExtendFolder(Folder,Persistent
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']
else:
-
+
self.REQUEST.SESSION[storename]['queryString2']=query2
if self.ZSQLSimpleSearch(query2):
+
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
else:
self.REQUEST.SESSION[storename]['count']=0
@@ -1462,7 +1569,11 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['rangeStart']=rangeStart
- if limit=="all":
+
+
+ self.REQUEST.SESSION[storename]['rangeEnd']=self.REQUEST.SESSION[storename]['count']
+
+ if (limit=="all") or (limit==int(limit)):
self.REQUEST.SESSION[storename]['rangeEnd']=self.REQUEST.SESSION[storename]['count']
else:
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
@@ -1470,9 +1581,11 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
-
+
+ if debug:
+ logging.error("ZSQLSimpleSearch %s"%query)
if not NoQuery:
-
+
return self.ZSQLQuery(query)
else:
@@ -1493,8 +1606,8 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLQuery(self,query,debug=None):
"""query"""
if debug:
- zLOG.LOG("ZSQLQuery", zLOG.INFO, query)
-
+ logger("ZSQLQuery", logging.INFO, query)
+
return self.ZSQLSimpleSearch(query)
@@ -1521,7 +1634,7 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")
self.REQUEST.SESSION['come_from_search']="yes"
- return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile))
+ return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile)+"?"+rq)
def ZSQLint(self,string):
@@ -1555,7 +1668,7 @@ class ZSQLExtendFolder(Folder,Persistent
limit=1
newRangeStart=0
- if newRangeStart>=self.REQUEST.SESSION[storename]['count']:
+ if (newRangeStart>=self.REQUEST.SESSION[storename]['count']) or (self.REQUEST.SESSION[storename]['count']==self.REQUEST.SESSION[storename]['rangeEnd']):
#newRangeStart=self.REQUEST.SESSION[storename]['count']-1
return ""
@@ -1654,64 +1767,7 @@ class ZSQLExtendFolder(Folder,Persistent
- def prevLink_old(self,html):
- """prev link"""
- if self.REQUEST['QUERY_STRING']=="":
- qs=self.REQUEST.SESSION['query']
- else:
- qs=self.REQUEST['QUERY_STRING']
- max=re.search(r'max\=(.*)\,',qs.lower())
- offset=re.search(r'offset\=(.*)\,',qs.lower())
- if not offset:
- offsetnew=0
- else:
- offsetnew=int(offset)-max
- if offsetnew<0:
- offsetnew=0
- queries=string.split(qs,",")
- newquery=[]
- if offset:
- for query in queries:
- if query.split("=")[0].lower()=="offset":
- query="-offset=%i"%offsetnew
- newquery.append(query)
- newquerystring=string.join(newquery,"&")
- else:
- queries.append("-offset=%i"%offsetnew)
- newquerystring=string.join(queries,"&")
- return "%s"%(self.actualPath()+"?"+newquerystring,html)
-
- def nextLink_old(self,html):
- """prev link"""
- if self.REQUEST['QUERY_STRING']=="":
- qs=self.REQUEST.SESSION['query']
- else:
- qs=self.REQUEST['QUERY_STRING']
- max=re.search(r'max\=(.*)\,',qs.lower())
-
- offset=re.search(r'offset\=(.*)\,',qs.lower())
- if not offset:
- offsetnew=1
- else:
- offsetnew=int(offset)+int(max)
- if offsetnew<0:
- offsetnew=0
- queries=string.split(qs,",")
- newquery=[]
- if offset:
- for query in queries:
-
- if query.split("=")[0].lower()=="-offset":
- query="-offset=%i"%offsetnew
- newquery.append(query)
- newquerystring=string.join(newquery,"&")
- else:
- queries.append("-offset=%i"%offsetnew)
- newquerystring=string.join(queries,"&")
-
- return "%s"%(self.actualPath()+"?"+newquerystring,html)
-
-
+
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals())
def manage_addZSQLExtendFolder(self, id, title='', label='', description='',
@@ -2023,4 +2079,4 @@ def manage_addZSQLBibliography(self, id,
-
\ No newline at end of file
+