version 1.79, 2006/03/28 19:54:41
|
version 1.89, 2006/08/29 17:37:17
|
Line 19 import os.path
|
Line 19 import os.path
|
import os |
import os |
from OFS.SimpleItem import SimpleItem |
from OFS.SimpleItem import SimpleItem |
|
|
def getTextFromNode(nodename): |
|
nodelist=nodename.childNodes |
|
rc = "" |
|
for node in nodelist: |
|
if node.nodeType == node.TEXT_NODE: |
|
rc = rc + node.data |
|
return rc |
|
|
|
|
|
def analyseIntSearch(word): |
def analyseIntSearch(word): |
#analyse integer searches |
#analyse integer searches |
|
|
Line 81 class ZSQLExtendFolder(Folder,Persistent
|
Line 72 class ZSQLExtendFolder(Folder,Persistent
|
return sql_quote(str) |
return sql_quote(str) |
|
|
|
|
|
def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None): |
def importXMLFile(self,table,data,identify=None,RESPONSE=None): |
|
#TODO: finish importXMLFile |
#TODO: finish importXMLFile |
''' |
''' |
Import XML file into the table |
Import XML file into the table |
@param table: name of the table the xml shall be imported into |
@param table: name of the table the xml shall be imported into |
@param containerTagName: XML-Tag which describes a dataset |
@param containerTagName: XML-Tag which describes a dataset |
@param data: data to be imported |
@param file: xmlfile handle |
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. |
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. |
@param RESPONSE: (optional) |
@param RESPONSE: (optional) |
''' |
''' |
from xml.dom.pulldom import parseString |
from xml.dom.pulldom import parseString |
|
|
|
doc=parseString(file.read()) |
#fh=file("/tmp/fmpxml.xml") |
|
import bz2 |
|
import base64 |
|
|
|
ret="" |
|
data=bz2.decompress(base64.decodestring(data)) |
|
#data=fh.read() |
|
|
|
doc=parseString(data) |
|
while 1: |
while 1: |
node=doc.getEvent() |
node=doc.getEvent() |
|
|
if node is None: |
if node is None: |
break; |
break; |
else: |
else: |
if node[1].nodeName=='ROW': |
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) |
|
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) |
|
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) |
|
ret+="ad: %s \n"%field |
|
|
|
elif node[1].nodeName=="METADATA": |
|
fieldNames=[] |
|
doc.expandNode(node[1]) |
doc.expandNode(node[1]) |
|
|
names=node[1].getElementsByTagName('FIELD') |
|
|
|
for name in names: |
|
fieldNames.append(name.getAttribute('NAME')) |
|
|
|
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: |
|
if fieldName not in columns: |
|
qstr="""alter table %s add %s %s""" |
|
self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) |
|
|
|
#fn=node[1].getAttribute("xml:id") |
#fn=node[1].getAttribute("xml:id") |
#nf=file("xtf/"+fn+".xtf",'w') |
#nf=file("xtf/"+fn+".xtf",'w') |
#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>") |
#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>") |
#print "wrote: %s"%fn |
#print "wrote: %s"%fn |
return ret |
|
|
|
def generateIndex(self,field,index_name,table,RESPONSE=None): |
def generateIndex(self,field,index_name,table,RESPONSE=None): |
"""erzeuge index aus feld""" |
"""erzeuge index aus feld""" |
Line 245 class ZSQLExtendFolder(Folder,Persistent
|
Line 171 class ZSQLExtendFolder(Folder,Persistent
|
return "" |
return "" |
|
|
def getLabel(self): |
def getLabel(self): |
"""getLabel""" |
"""getLabe""" |
try: |
try: |
return self.label |
return self.label |
except: |
except: |
return "" |
return "" |
|
|
def getTitle(self): |
|
"""getTitle""" |
|
try: |
|
return self.title |
|
except: |
|
return "" |
|
|
|
|
|
def getDescription(self): |
def getDescription(self): |
"""getDescription""" |
"""getLabe""" |
try: |
try: |
return self.description |
return self.description |
except: |
except: |
Line 289 class ZSQLExtendFolder(Folder,Persistent
|
Line 207 class ZSQLExtendFolder(Folder,Persistent
|
def formatAscii(self,str,url=None): |
def formatAscii(self,str,url=None): |
"""ersetze ascii umbrueche durch <br>""" |
"""ersetze ascii umbrueche durch <br>""" |
#url=None |
#url=None |
|
|
if not str: |
|
return "" |
|
|
|
str=str.rstrip().lstrip() |
str=str.rstrip().lstrip() |
|
|
if url and str: |
if url and str: |
Line 455 class ZSQLExtendFolder(Folder,Persistent
|
Line 369 class ZSQLExtendFolder(Folder,Persistent
|
field=getattr(result,fieldName) |
field=getattr(result,fieldName) |
fieldValue=getattr(result,valueName) |
fieldValue=getattr(result,valueName) |
if fieldValue: |
if fieldValue: |
|
|
if not linelen: |
if not linelen: |
|
|
|
|
|
if field == selected: |
|
|
|
ret+="""<option value="%s" selected>%s</option>"""%(field,fieldValue) |
|
else: |
ret+="""<option value="%s">%s</option>"""%(field,fieldValue) |
ret+="""<option value="%s">%s</option>"""%(field,fieldValue) |
|
|
else: |
else: |
mist = """%s"""%(fieldValue) |
mist = """%s"""%(fieldValue) |
if len(mist) > string.atoi(linelen): |
if len(mist) > string.atoi(linelen): |
Line 466 class ZSQLExtendFolder(Folder,Persistent
|
Line 388 class ZSQLExtendFolder(Folder,Persistent
|
return ret |
return ret |
|
|
|
|
def ZSQLInlineSearchU(self,storename=None,**argv): |
def ZSQLInlineSearchU(self,storename=None,args=None,**argv): |
"""one element if exists""" |
"""one element if exists""" |
qs=[] |
qs=[] |
if storename: |
if storename: |
Line 475 class ZSQLExtendFolder(Folder,Persistent
|
Line 397 class ZSQLExtendFolder(Folder,Persistent
|
else: |
else: |
storename="foundCount" |
storename="foundCount" |
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
|
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argv.keys(): |
for a in argTmp.keys(): |
qs.append(a+"="+urllib.quote(str(argv[a]))) |
qs.append(a+"="+urllib.quote(str(argTmp[a]))) |
#return [] |
#return [] |
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) |
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) |
|
|
Line 488 class ZSQLExtendFolder(Folder,Persistent
|
Line 414 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
return None |
return None |
|
|
def ZSQLInlineSearch(self,storename=None,**argv): |
def ZSQLInlineSearch(self,storename=None,args=None,**argv): |
"""inlinesearch""" |
"""inlinesearch""" |
|
|
qs=[] |
qs=[] |
Line 499 class ZSQLExtendFolder(Folder,Persistent
|
Line 425 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
|
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argv.keys(): |
for a in argv.keys(): |
try: |
try: |
Line 508 class ZSQLExtendFolder(Folder,Persistent
|
Line 440 class ZSQLExtendFolder(Folder,Persistent
|
qs.append(a+"="+urllib.quote(str(argv[a]))) |
qs.append(a+"="+urllib.quote(str(argv[a]))) |
|
|
#return [] |
#return [] |
|
|
return self.parseQueryString(string.join(qs,","),"_",storename=storename) |
return self.parseQueryString(string.join(qs,","),"_",storename=storename) |
|
|
def ZSQLInlineSearch2(self,query): |
def ZSQLInlineSearch2(self,query): |
Line 529 class ZSQLExtendFolder(Folder,Persistent
|
Line 462 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) |
|
|
def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None): |
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
"""simple search""" |
"""simple search""" |
|
|
|
|
if not query: |
if not query: |
query=self.query |
query=self.query |
|
|
if debug: |
|
print "DEBUG: ZSQLSimpleSearch:", query |
|
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>") |
Line 597 class ZSQLExtendFolder(Folder,Persistent
|
Line 529 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
|
|
def ZSQLAdd(self,format=None,RESPONSE=None,**argv): |
def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): |
"""Neuer Eintrag""" |
"""Neuer Eintrag""" |
|
|
|
if args: |
|
argTmp=args |
|
else: |
|
argTmp=argv |
|
|
qs_temp=[] |
qs_temp=[] |
|
|
for a in self.REQUEST.form.keys(): |
for a in self.REQUEST.form.keys(): |
Line 607 class ZSQLExtendFolder(Folder,Persistent
|
Line 544 class ZSQLExtendFolder(Folder,Persistent
|
|
|
qs=string.join(qs_temp,",") |
qs=string.join(qs_temp,",") |
|
|
for field in argv.keys(): |
for field in argTmp.keys(): |
if field[0]=="_": |
if field[0]=="_": |
fieldTmp="-"+field[1:] |
fieldTmp="-"+field[1:] |
else: |
else: |
fieldTmp=field |
fieldTmp=field |
|
|
qs+=",%s=%s"%(fieldTmp,argv[field]) |
qs+=",%s=%s"%(fieldTmp,argTmp[field]) |
|
|
|
|
addList={} |
addList={} |
Line 655 class ZSQLExtendFolder(Folder,Persistent
|
Line 592 class ZSQLExtendFolder(Folder,Persistent
|
qs_temp=[] |
qs_temp=[] |
if USE_FORM or RESPONSE: |
if USE_FORM or RESPONSE: |
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 685 class ZSQLExtendFolder(Folder,Persistent
|
Line 623 class ZSQLExtendFolder(Folder,Persistent
|
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) |
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) |
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): |
|
elif (not (name[0]=="-" or name[0]=="_")): |
|
|
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) |
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) |
|
|
changeString=string.join(changeList,",") |
changeString=string.join(changeList,",") |
|
|
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) |
|
zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString) |
|
|
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
|
|
Line 748 class ZSQLExtendFolder(Folder,Persistent
|
Line 688 class ZSQLExtendFolder(Folder,Persistent
|
if field[0]=="_": |
if field[0]=="_": |
fieldTmp="-"+field[1:] |
fieldTmp="-"+field[1:] |
else: |
else: |
fieldTmp=urllib.unqoute(field) |
fieldTmp=field |
|
|
qs+=",%s=%s"%(fieldTmp,argv[field]) |
qs+=",%s=%s"%(fieldTmp,argv[field]) |
|
|
Line 1188 class ZSQLExtendFolder(Folder,Persistent
|
Line 1128 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
|
|
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
if not NoQuery: |
if not NoQuery: |
|
|