version 1.116, 2007/05/25 15:01:32
|
version 1.129, 2009/02/04 09:10:45
|
Line 56 def analyseIntSearch(word):
|
Line 56 def analyseIntSearch(word):
|
else: |
else: |
return "BETWEEN "+splitted[0]+" AND "+splitted[1] |
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): |
def sql_quote(v): |
Line 97 class ZSQLExtendFolder(Folder,Persistent
|
Line 127 class ZSQLExtendFolder(Folder,Persistent
|
"""quote str for sql""" |
"""quote str for sql""" |
return sql_quote(str) |
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): |
def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None): |
"""normalize a field, d.h. entfernt alle diakritischen Zeichen und ersetzt diese |
"""normalize a field, d.h. entfernt alle diakritischen Zeichen und ersetzt diese |
Line 328 class ZSQLExtendFolder(Folder,Persistent
|
Line 366 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False, |
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, |
lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False, |
|
debug=False,log_to_response=False, |
redirect_url=None,RESPONSE=None): |
redirect_url=None,RESPONSE=None): |
''' |
''' |
Import FileMaker XML file (FMPXMLRESULT format) into the table. |
Import FileMaker XML file (FMPXMLRESULT format) into the table. |
@param dsn: database connection string |
@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 uploadfile: xmlfile file |
@param update_fields: (optional) list of fields to update; default is to create all fields |
@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 id_field: (optional) field which uniquely identifies an entry for updating purposes. |
Line 342 class ZSQLExtendFolder(Folder,Persistent
|
Line 381 class ZSQLExtendFolder(Folder,Persistent
|
@param keep_fields: (optional) don't add fields to SQL database |
@param keep_fields: (optional) don't add fields to SQL database |
@param ascii_db: (optional) assume ascii encoding in db |
@param ascii_db: (optional) assume ascii encoding in db |
@param replace: (optional) delete and re-insert data |
@param replace: (optional) delete and re-insert data |
|
@param backup: (optional) create backup of old table (breaks indices) |
@param RESPONSE: (optional) |
@param RESPONSE: (optional) |
@param redirect_url: (optional) url for redirecting after the upload is done |
@param redirect_url: (optional) url for redirecting after the upload is done |
''' |
''' |
Line 358 class ZSQLExtendFolder(Folder,Persistent
|
Line 398 class ZSQLExtendFolder(Folder,Persistent
|
if not dsn: |
if not dsn: |
dsn=self.getConnectionObj().connection_string |
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=Options() |
options.dsn=dsn |
options.dsn=dsn |
options.table=table |
options.table=t |
options.filename=filename |
options.filename=filename |
options.update_fields=update_fields |
options.update_fields=update_fields |
options.id_field=id_field |
options.id_field=id_field |
Line 370 class ZSQLExtendFolder(Folder,Persistent
|
Line 416 class ZSQLExtendFolder(Folder,Persistent
|
options.keep_fields=keep_fields |
options.keep_fields=keep_fields |
options.ascii_db=ascii_db |
options.ascii_db=ascii_db |
options.replace_table=replace |
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) |
importFMPXML(options) |
|
|
os.remove(filename) |
|
|
|
if RESPONSE and redirect_url: |
|
|
if RESPONSE and log_to_response: |
|
loghandler.flush() |
|
RESPONSE.write("\n\n DONE!") |
|
|
|
elif RESPONSE and redirect_url: |
RESPONSE.redirect(redirect_url) |
RESPONSE.redirect(redirect_url) |
|
|
|
os.remove(filename) |
|
|
|
|
def generateIndex(self,field,index_name,table,RESPONSE=None): |
def generateIndex(self,field,index_name,table,RESPONSE=None): |
"""erzeuge ein Index Objekt einem Feld (experimental) |
"""erzeuge ein Index Objekt einem Feld (experimental) |
Line 422 class ZSQLExtendFolder(Folder,Persistent
|
Line 490 class ZSQLExtendFolder(Folder,Persistent
|
""" |
""" |
return urllib.quote(txt) |
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): |
def searchRel(self,relStatement,statement,wherePart,classes): |
"""suche relative haufigkeiten (experimental)""" |
"""suche relative haufigkeiten (experimental)""" |
ret={} |
ret={} |
Line 476 class ZSQLExtendFolder(Folder,Persistent
|
Line 565 class ZSQLExtendFolder(Folder,Persistent
|
return pt() |
return pt() |
|
|
|
|
def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None): |
def changeZSQLExtend(self,label,description,weight=0,connection_id=None,REQUEST=None,): |
"""change the Konfiguration""" |
"""change the Konfiguration""" |
self.connection_id=connection_id |
self.connection_id=connection_id |
self.weight=weight |
self.weight=weight |
Line 491 class ZSQLExtendFolder(Folder,Persistent
|
Line 580 class ZSQLExtendFolder(Folder,Persistent
|
@param str: string der Formatiert werden soll. |
@param str: string der Formatiert werden soll. |
@param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url |
@param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url |
""" |
""" |
#url=None |
#logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url))) |
|
|
|
if not str: |
|
return "" |
|
|
str=str.rstrip().lstrip() |
str=str.rstrip().lstrip() |
|
|
if url and str: |
if url and str: |
Line 505 class ZSQLExtendFolder(Folder,Persistent
|
Line 598 class ZSQLExtendFolder(Folder,Persistent
|
retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word) |
retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word) |
str=retStr |
str=retStr |
if str: |
if str: |
return re.sub(r"[\n]","<br/>",str) |
retStr = re.sub(r"[\n]","<br/>",str) |
|
#logging.debug("formatascii out=%s"%(repr(retStr))) |
|
return retStr |
else: |
else: |
return "" |
return "" |
|
|
Line 568 class ZSQLExtendFolder(Folder,Persistent
|
Line 663 class ZSQLExtendFolder(Folder,Persistent
|
@param _value: String der gesucht werden soll, gesucht wird nach allen Worten des Strings, die durch " "-getrennt sind. |
@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 _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 _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 _select: (optional) Alternativer Wert fŸr den ersten SELECT Aufruf. |
@param _storename: (optional) Name fuer die Zwischenspeicherung von Werten in der Session |
@param _storename: (optional) Name fuer die Zwischenspeicherung von Werten in der Session |
""" |
""" |
Line 878 class ZSQLExtendFolder(Folder,Persistent
|
Line 974 class ZSQLExtendFolder(Folder,Persistent
|
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): |
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","<dtml-var var>") |
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","<dtml-var var>") |
|
#self._v_searchSQL=self.getConnectionObj()() |
|
|
self._v_searchSQL.max_rows_=max_rows |
self._v_searchSQL.max_rows_=max_rows |
|
#self._v_searchSQL.set_client_encoding('UNICODE') |
try: |
try: |
logging.error("I am here") |
logging.error("I am here") |
t=self._v_searchSQL.__call__(var=query) |
t=self._v_searchSQL.__call__(var=query) |
|
#t=self._v_searchSQL.query(query) |
logging.error("I am here %s"%t) |
logging.error("I am here %s"%t) |
return t |
return t |
except : |
except : |
Line 896 class ZSQLExtendFolder(Folder,Persistent
|
Line 995 class ZSQLExtendFolder(Folder,Persistent
|
try: |
try: |
|
|
self._v_searchSQL.max_rows_=max_rows |
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.__call__(var=query) |
|
#return self._v_searchSQL.query(query) |
except : |
except : |
logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
logger("ZSQLSimpleSearch ERROR2",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
if sys.exc_info()[0]=="Database Error": |
if sys.exc_info()[0]=="Database Error": |
Line 937 class ZSQLExtendFolder(Folder,Persistent
|
Line 1038 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""" |
"""Neuer Eintrag""" |
|
|
if args: |
if args: |
Line 947 class ZSQLExtendFolder(Folder,Persistent
|
Line 1048 class ZSQLExtendFolder(Folder,Persistent
|
|
|
qs_temp=[] |
qs_temp=[] |
|
|
|
if _useRequest: |
for a in self.REQUEST.form.keys(): |
for a in self.REQUEST.form.keys(): |
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) |
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) |
|
|
Line 963 class ZSQLExtendFolder(Folder,Persistent
|
Line 1065 class ZSQLExtendFolder(Folder,Persistent
|
|
|
addList={} |
addList={} |
for q in qs.split(","): |
for q in qs.split(","): |
|
if len(q.split("="))<2: |
|
continue |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
|
|
value=q.split("=")[1] |
value=q.split("=")[1] |
value=re.sub(r'\+'," ",value) |
value=re.sub(r'\+'," ",value) |
value=urllib.unquote(value) |
value=urllib.unquote(value) |
Line 1190 class ZSQLExtendFolder(Folder,Persistent
|
Line 1295 class ZSQLExtendFolder(Folder,Persistent
|
querys=qs.split(",") |
querys=qs.split(",") |
|
|
#which arguments are in the old query string |
#which arguments are in the old query string |
|
|
queryList={} |
queryList={} |
for query in querys: |
for query in querys: |
arg=query.split("=")[0] |
arg=query.split("=")[0] |
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" |
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" |
try: |
try: |
queryList[arg]=query.split("=")[1] |
queryList[arg]=urllib.unquote_plus(query.split("=")[1]) |
except: |
except: |
queryList[arg]='' |
queryList[arg]='' |
|
|
argList=[] |
argList=[] |
arg="" |
arg="" |
|
|
|
|
|
|
#gehe durch die zu aendernden Argumente |
#gehe durch die zu aendernden Argumente |
for argTmp in argv.keys(): |
for argTmp in argv.keys(): |
|
|
arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird |
arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird |
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" |
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" |
|
|
Line 1220 class ZSQLExtendFolder(Folder,Persistent
|
Line 1320 class ZSQLExtendFolder(Folder,Persistent
|
|
|
return str |
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): |
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""" |
"""analysieren den QueryString""" |
|
|
Line 1402 class ZSQLExtendFolder(Folder,Persistent
|
Line 1503 class ZSQLExtendFolder(Folder,Persistent
|
|
|
elif op=="numerical": |
elif op=="numerical": |
term=analyseIntSearch(value) |
term=analyseIntSearch(value) |
tmp=(name+" "+term) |
tmp=(namealt+" "+term) # take namealt without LOWER |
elif op=="grep": |
elif op=="grep": |
tmp=(name+" ~* "+sql_quote(value)) |
tmp=(name+" ~* "+sql_quote(value)) |
elif op=="one": |
elif op=="one": |
Line 1452 class ZSQLExtendFolder(Folder,Persistent
|
Line 1553 class ZSQLExtendFolder(Folder,Persistent
|
|
|
elif op=="numerical": |
elif op=="numerical": |
term=analyseIntSearch(value) |
term=analyseIntSearch(value) |
tmp=(name+" "+term) |
tmp=(namealt+" "+term) # take namealt without LOWER |
elif op=="grep": |
elif op=="grep": |
tmp=(name+" ~* "+sql_quote(value)) |
tmp=(name+" ~* "+sql_quote(value)) |
elif op=="one": |
elif op=="one": |