version 1.119, 2007/08/09 15:09:27
|
version 1.138, 2011/02/14 22:00:50
|
Line 127 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 361 class ZSQLExtendFolder(Folder,Persistent
|
Line 369 class ZSQLExtendFolder(Folder,Persistent
|
lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False, |
lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False, |
debug=False,log_to_response=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 376 class ZSQLExtendFolder(Folder,Persistent
|
Line 384 class ZSQLExtendFolder(Folder,Persistent
|
@param backup: (optional) create backup of old table (breaks indices) |
@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 |
''' |
""" |
|
|
tfilehd,filename=tempfile.mkstemp() |
tfilehd,filename=tempfile.mkstemp() |
tfile=os.fdopen(tfilehd,'w') |
tfile=os.fdopen(tfilehd,'w') |
logging.info("import %s"%uploadfile) |
logging.info("importXMLFileFMP: importing %s"%uploadfile) |
for c in uploadfile.read(): |
for c in uploadfile.read(): |
tfile.write(c) |
tfile.write(c) |
tfile.close() |
tfile.close() |
Line 390 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 |
|
|
|
logging.debug("dsn: %s"%dsn) |
|
logging.debug("table: %s"%table) |
|
logging.debug("update_fields: %s"%update_fields) |
|
logging.debug("id_field: %s"%id_field) |
|
logging.debug("sync_mode: %s"%sync_mode) |
|
logging.debug("lc_names: %s"%lc_names) |
|
logging.debug("keep_fields: %s"%keep_fields) |
|
logging.debug("ascii_db: %s"%ascii_db) |
|
logging.debug("replace: %s"%replace) |
|
logging.debug("backup: %s"%backup) |
|
logging.debug("debug: %s"%debug) |
|
logging.debug("log_to_response: %s"%log_to_response) |
|
logging.debug("RESPONSE: %s"%repr(RESPONSE)) |
|
|
|
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 407 class ZSQLExtendFolder(Folder,Persistent
|
Line 435 class ZSQLExtendFolder(Folder,Persistent
|
|
|
if RESPONSE and log_to_response: |
if RESPONSE and log_to_response: |
# set up logging to response as plain text |
# set up logging to response as plain text |
|
logging.debug("Setting up logging to RESPONSE") |
RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8") |
RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8") |
RESPONSE.write("Import FMPXML file...\n\n") |
RESPONSE.write("Import FMPXML file...\n\n") |
|
RESPONSE.flush() |
loghandler = logging.StreamHandler(RESPONSE) |
loghandler = logging.StreamHandler(RESPONSE) |
if debug: |
if debug: |
loghandler.setLevel(logging.DEBUG) |
loghandler.setLevel(logging.DEBUG) |
Line 418 class ZSQLExtendFolder(Folder,Persistent
|
Line 448 class ZSQLExtendFolder(Folder,Persistent
|
logger.addHandler(loghandler) |
logger.addHandler(loghandler) |
options.use_logger_instance = logger |
options.use_logger_instance = logger |
|
|
|
try: |
|
err = None |
importFMPXML(options) |
importFMPXML(options) |
|
logging.info("importXMLFileFMP: done") |
os.remove(filename) |
except Exception, err: |
|
logging.error("Error importing: %s"%err) |
|
|
if RESPONSE and log_to_response: |
if RESPONSE and log_to_response: |
loghandler.flush() |
loghandler.flush() |
|
if err is not None: |
|
RESPONSE.write("\n\nERROR while importing: %s"%err) |
|
else: |
RESPONSE.write("\n\n DONE!") |
RESPONSE.write("\n\n DONE!") |
return |
|
|
|
if RESPONSE and redirect_url: |
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 469 class ZSQLExtendFolder(Folder,Persistent
|
Line 506 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
def URLquote(self,txt): |
def URLquote(self,txt): |
"""urlquote" |
"""urlquote |
@param txt: text der urlgequoted werden soll. |
@param txt: text der urlgequoted werden soll. |
""" |
""" |
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 618 class ZSQLExtendFolder(Folder,Persistent
|
Line 676 class ZSQLExtendFolder(Folder,Persistent
|
def ZSQLMultiSearch(self,_table,_searchField,_value,_idField,_additionalStatement="",_select=None,_subselectAddition="",_storename=None): |
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 |
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 |
von Worten in value und gibt alle Werte mit gleichem id field zurueck, d.h. es wird die "und" suche ueber mehrere Eintrsege in einer |
Tabelle mit gleichem idField werd realisiert, |
Tabelle mit gleichem idField werd realisiert, |
z.B. fŸr simplesearch ueber mehrere Felder |
z.B. fuer simplesearch ueber mehrere Felder |
@param _table: Tabelle, die durchsucht werden soll. |
@param _table: Tabelle, die durchsucht werden soll. |
@param _searchField: Feld, das durchsucht wird |
@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 _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 fuer die identifikation gleicher Eintraege |
@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" eingegefuegt wird. |
@param _select: (optional) Alternativer Wert fŸr den ersten SELECT Aufruf. |
@param _subselectAddition: (optiona) Zusaetliche SQL Statement die hinter das select statement der subselects eingefuegt werde. |
|
@param _select: (optional) Alternativer Wert fuer 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 |
""" |
""" |
if _storename: |
if _storename: |
Line 871 class ZSQLExtendFolder(Folder,Persistent
|
Line 930 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def ZSQLInlineSearch(self,storename=None,args=None,**argv): |
def ZSQLInlineSearch(self,storename=None,args=None,**argv): |
"""inlinesearch""" |
"""inlinesearch""" |
|
#logging.debug("ZSQLInlineSearch args=%s argv=%s"%(args,argv)) |
qs=[] |
qs=[] |
if storename: |
if storename: |
"""store""" |
"""store""" |
else: |
else: |
storename="foundCount" |
storename="foundCount" |
|
|
|
|
|
|
if args: |
if args: |
argTmp=args |
argTmp=args |
else: |
else: |
Line 893 class ZSQLExtendFolder(Folder,Persistent
|
Line 950 class ZSQLExtendFolder(Folder,Persistent
|
if type(argTmp[a]) is ListType: # ein parameter zweimal |
if type(argTmp[a]) is ListType: # ein parameter zweimal |
value="" |
value="" |
#TODO find a better solution, currently only the last non empty entry is used. |
#TODO find a better solution, currently only the last non empty entry is used. |
for x in argTmp[a]: |
#for x in argTmp[a]: |
if x: |
# if x: |
value=x |
# value=x |
|
# version: join with spaces (makes sense with checkbox and -op=all) |
|
value = " ".join(argTmp[a]) |
else: |
else: |
|
try: |
value=str(argTmp[a]) |
value=str(argTmp[a]) |
qs.append(aFiltered+"="+urllib.quote(value)) |
except: |
|
value=utf8ify(argTmp[a]) |
|
|
|
qs.append(aFiltered+"="+urllib.quote(value)) |
|
#logging.debug("InlineSearch:"+string.join(qs,",")) |
|
|
#return [] |
#return [] |
|
|
Line 925 class ZSQLExtendFolder(Folder,Persistent
|
Line 987 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
logger("ZSQLResetConnection",logging.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): |
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
|
"""new simple search""" |
|
logging.debug("new ZSQLSimpleSearch X %s"%query) |
|
# get Connection instance |
|
con = self.getConnectionObj() |
|
# call to get db object |
|
dbc = con() |
|
res = dbc.query(query, max_rows=max_rows) |
|
# return result set as Result object with Brains |
|
return Results(res) |
|
|
|
def oldZSQLSimpleSearch(self,query=None,max_rows=1000000): |
"""simple search""" |
"""simple search""" |
logging.error("ZSQLSimpleSearch X %s"%query) |
logging.error("ZSQLSimpleSearch X %s"%query) |
#print query |
#print query |
Line 1000 class ZSQLExtendFolder(Folder,Persistent
|
Line 1074 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 1010 class ZSQLExtendFolder(Folder,Persistent
|
Line 1084 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 1026 class ZSQLExtendFolder(Folder,Persistent
|
Line 1101 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 1095 class ZSQLExtendFolder(Folder,Persistent
|
Line 1173 class ZSQLExtendFolder(Folder,Persistent
|
table=urllib.unquote(value) |
table=urllib.unquote(value) |
elif name=="-identify": |
elif name=="-identify": |
identify=urllib.unquote(value) |
identify=urllib.unquote(value) |
identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower()) |
# old code did identify with lower() which doesn't work for oids |
|
#identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower()) |
|
(k,v) = identify.split("=") |
|
identify="%s=%s"%(k,sql_quote(v)) |
elif name=="-format": |
elif name=="-format": |
format=urllib.unquote(value) |
format=urllib.unquote(value) |
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): |
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): |
Line 1147 class ZSQLExtendFolder(Folder,Persistent
|
Line 1228 class ZSQLExtendFolder(Folder,Persistent
|
"""search in database""" |
"""search in database""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
""""loesche leere elemente aus der liste""" |
"""loesche leere elemente aus der liste""" |
ret=[] |
ret=[] |
for x in list: |
for x in list: |
splitted=x.split("=") |
splitted=x.split("=") |
Line 1253 class ZSQLExtendFolder(Folder,Persistent
|
Line 1334 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 1283 class ZSQLExtendFolder(Folder,Persistent
|
Line 1359 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""" |
|
logging.debug("parseQueryString qs=%s"%qs) |
|
|
#setzte generische werte |
#setzte generische werte |
|
|
Line 1441 class ZSQLExtendFolder(Folder,Persistent
|
Line 1518 class ZSQLExtendFolder(Folder,Persistent
|
op=opfields[name] |
op=opfields[name] |
else: |
else: |
op="ct" |
op="ct" |
|
|
namealt=name |
namealt=name |
name="LOWER("+punktsplit[1]+")" |
name="LOWER("+punktsplit[1]+")" |
value=value.lower() |
value=value.lower() |
Line 1465 class ZSQLExtendFolder(Folder,Persistent
|
Line 1543 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 1515 class ZSQLExtendFolder(Folder,Persistent
|
Line 1593 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 1797 class ZSQLExtendFolder(Folder,Persistent
|
Line 1875 class ZSQLExtendFolder(Folder,Persistent
|
return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html) |
return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html) |
|
|
|
|
|
def pydev_settrace(self): |
|
"""do settrace to start debugging""" |
|
import pydevd |
|
pydevd.settrace() |
|
|
|
|
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) |
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) |
Line 2110 def manage_addZSQLBibliography(self, id,
|
Line 2192 def manage_addZSQLBibliography(self, id,
|
|
|
|
|
|
|
|
|