version 1.32, 2004/08/27 23:03:48
|
version 1.36, 2004/09/27 20:43:58
|
Line 5 from Globals import DTMLFile
|
Line 5 from Globals import DTMLFile
|
import urllib |
import urllib |
import re |
import re |
import string |
import string |
from pyPgSQL import libpq |
#from pyPgSQL import libpq |
from AccessControl import getSecurityManager |
from AccessControl import getSecurityManager |
import os.path |
import os.path |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
Line 13 from Products.PageTemplates.PageTemplate
|
Line 13 from Products.PageTemplates.PageTemplate
|
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
import Shared.DC.ZRDB.DA |
import Shared.DC.ZRDB.DA |
|
|
|
def sql_quote(self, v): |
|
# quote dictionary |
|
quote_dict = {"\'": "''", "\\": "\\\\"} |
|
for dkey in quote_dict.keys(): |
|
if find(v, dkey) >= 0: |
|
v=join(split(v,dkey),quote_dict[dkey]) |
|
return "'%s'" % v |
|
|
def showSQLConnectionIDs(self): |
def showSQLConnectionIDs(self): |
return SQLConnectionIDs(self) |
return SQLConnectionIDs(self) |
|
|
Line 20 class ZSQLExtendFolder(Folder,Persistent
|
Line 28 class ZSQLExtendFolder(Folder,Persistent
|
"""Folder""" |
"""Folder""" |
meta_type="ZSQLExtendFolder" |
meta_type="ZSQLExtendFolder" |
|
|
|
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 searchRel(self,relStatement,statement,wherePart,classes): |
|
"""suche relative haufigkeiten""" |
|
ret={} |
|
allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart)) |
|
print statement + " where "+wherePart |
|
for oneclass in classes: |
|
ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass)) |
|
print statement + " where ("+wherePart+") and "+ relStatement%oneclass |
|
return (ret,allRecords) |
|
|
def content_html(self): |
def content_html(self): |
"""template fuer content""" |
"""template fuer content""" |
|
|
Line 276 class ZSQLExtendFolder(Folder,Persistent
|
Line 302 class ZSQLExtendFolder(Folder,Persistent
|
valueList=[] |
valueList=[] |
for x in addList.keys(): |
for x in addList.keys(): |
keyList.append("\""+x+"\"") |
keyList.append("\""+x+"\"") |
valueList.append(libpq.PgQuoteString(addList[x])) |
valueList.append(sql_quote(addList[x])) |
|
|
keyString=string.join(keyList,",") |
keyString=string.join(keyList,",") |
valueString=string.join(valueList,",") |
valueString=string.join(valueList,",") |
Line 286 class ZSQLExtendFolder(Folder,Persistent
|
Line 312 class ZSQLExtendFolder(Folder,Persistent
|
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange(self,**argv): |
def ZSQLChange(self,**argv): |
"""Ändern von Einträgen""" |
"""change entries""" |
#qs=self.REQUEST['QUERY_STRING'] |
#qs=self.REQUEST['QUERY_STRING'] |
# very bad hack |
# very bad hack |
qs_temp=[] |
qs_temp=[] |
Line 309 class ZSQLExtendFolder(Folder,Persistent
|
Line 335 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=identify.split("=")[0]+"="+libpq.PgQuoteString(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]=="-") and (not len(value)==0): |
elif (not name[0]=="-") and (not len(value)==0): |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(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) |
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange_old(self): |
def ZSQLChange_old(self): |
"""Ändern von Einträgen""" |
"""change entries""" |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
#print "CHANGE QS",self.REQUEST |
#print "CHANGE QS",self.REQUEST |
#return self.REQUEST |
#return self.REQUEST |
Line 334 class ZSQLExtendFolder(Folder,Persistent
|
Line 360 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=identify.split("=")[0]+"="+libpq.PgQuoteString(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]=="-") and (not len(value)==0): |
elif (not name[0]=="-") and (not len(value)==0): |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(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) |
self.ZSQLSimpleSearch(queryString) |
self.ZSQLSimpleSearch(queryString) |
Line 360 class ZSQLExtendFolder(Folder,Persistent
|
Line 386 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv) |
#return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv) |
|
|
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,**argv): |
def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): |
"""Find""" |
"""Find""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
Line 373 class ZSQLExtendFolder(Folder,Persistent
|
Line 399 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
#self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
if qs=="": |
if qs=="": |
print "HI" |
|
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
|
|
Line 387 class ZSQLExtendFolder(Folder,Persistent
|
Line 413 class ZSQLExtendFolder(Folder,Persistent
|
else: |
else: |
|
|
qs=self.REQUEST.SESSION.get('query','') |
qs=self.REQUEST.SESSION.get('query','') |
print "QS:",qs |
|
for field in argv.keys(): |
for field in argv.keys(): |
#print field |
#print field |
qs+=",-%s=%s"%(field,argv[field]) |
qs+=",-%s=%s"%(field,argv[field]) |
Line 409 class ZSQLExtendFolder(Folder,Persistent
|
Line 435 class ZSQLExtendFolder(Folder,Persistent
|
storename="foundCount" |
storename="foundCount" |
|
|
|
|
print "calling Query with",repr(NoQuery) |
#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) |
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"] |
#print self.REQUEST.SESSION["foundCount"] |
|
|
print "called query" |
|
return ret |
return ret |
|
|
def ZSQLFoundCountLen(self,var): |
def ZSQLFoundCountLen(self,var): |
Line 469 class ZSQLExtendFolder(Folder,Persistent
|
Line 495 class ZSQLExtendFolder(Folder,Persistent
|
|
|
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) |
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) |
|
|
def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None): |
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): |
"""analysieren den QueryString""" |
"""analysieren den QueryString""" |
#print "NO",nostore |
#print "NO",nostore |
lop="AND" # standardsuche mit and |
lop="AND" # standardsuche mit and |
Line 480 class ZSQLExtendFolder(Folder,Persistent
|
Line 506 class ZSQLExtendFolder(Folder,Persistent
|
op="bw" |
op="bw" |
opfields={} |
opfields={} |
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
|
sortfields={} #order of sortfields |
skip="" |
skip="" |
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
Line 516 class ZSQLExtendFolder(Folder,Persistent
|
Line 543 class ZSQLExtendFolder(Folder,Persistent
|
|
|
field=name[5:] |
field=name[5:] |
lopfields[field]=lop |
lopfields[field]=lop |
|
|
|
if name[0:10]==iCT+"sortorder": |
|
sort=value |
|
|
|
field=name[11:] |
|
sortfields[field]=sort |
|
|
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
#now analyse the querystring |
#now analyse the querystring |
Line 530 class ZSQLExtendFolder(Folder,Persistent
|
Line 564 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
value="" |
value="" |
|
|
#value=libpq.PgQuoteString(value) |
#value=sql_quote(value) |
|
|
|
|
if name==iCT+"lop": |
if name==iCT+"lop": |
Line 551 class ZSQLExtendFolder(Folder,Persistent
|
Line 585 class ZSQLExtendFolder(Folder,Persistent
|
elif name==iCT+"join": |
elif name==iCT+"join": |
whereList.append(value) |
whereList.append(value) |
elif name==iCT+"sort": |
elif name==iCT+"sort": |
sort="ORDER BY "+value.replace(' AND ',',') |
sortstrs=[] |
|
for word in value.split(','): |
|
wordstr=word.lstrip().rstrip() |
|
order=sortfields.get(wordstr,'ASC') |
|
sortstrs.append(wordstr+" "+order) |
|
if len(sortstrs)>0: |
|
sort="ORDER BY "+string.join(sortstrs,',') |
|
|
elif name==iCT+"token": |
elif name==iCT+"token": |
if not nostore=="yes": |
if not nostore=="yes": |
self.REQUEST.SESSION['token']=value |
self.REQUEST.SESSION['token']=value |
Line 573 class ZSQLExtendFolder(Folder,Persistent
|
Line 614 class ZSQLExtendFolder(Folder,Persistent
|
namealt=name |
namealt=name |
name="LOWER("+name+")" |
name="LOWER("+name+")" |
if op=="ct": |
if op=="ct": |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
tmp=(name+" LIKE "+sql_quote("%"+value+"%")) |
elif op=="gt": |
elif op=="gt": |
tmp=(name+">"+libpq.PgQuoteString(value)) |
tmp=(name+">"+sql_quote(value)) |
elif op=="lt": |
elif op=="lt": |
tmp=(name+"<"+libpq.PgQuoteString(value)) |
tmp=(name+"<"+sql_quote(value)) |
elif op=="eq": |
elif op=="eq": |
tmp=(name+"="+libpq.PgQuoteString(value)) |
tmp=(name+"="+sql_quote(value)) |
elif op=="bw": |
elif op=="bw": |
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
tmp=(name+" LIKE "+sql_quote(value+"%")) |
elif op=="ew": |
elif op=="ew": |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+sql_quote("%"+value)) |
|
elif op=="all": |
|
tmps=[] |
|
for word in value.split(" "): |
|
tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) |
|
|
|
tmp=string.join(tmps,' AND ') |
|
|
op="ct" |
op="ct" |
print "TTT",tableExt |
|
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
if searchFields.has_key(name): |
if searchFields.has_key(name): |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
Line 604 class ZSQLExtendFolder(Folder,Persistent
|
Line 652 class ZSQLExtendFolder(Folder,Persistent
|
## op="ct" |
## op="ct" |
## name="LOWER("+name+")" |
## name="LOWER("+name+")" |
## if op=="ct": |
## if op=="ct": |
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
## whereList.append(name+" LIKE "+sql_quote("%"+value+"%")) |
## elif op=="gt": |
## elif op=="gt": |
## whereList.append(name+">"+libpq.PgQuoteString(value)) |
## whereList.append(name+">"+sql_quote(value)) |
## elif op=="lt": |
## elif op=="lt": |
## whereList.append(name+"<"+libpq.PgQuoteString(value)) |
## whereList.append(name+"<"+sql_quote(value)) |
## elif op=="eq": |
## elif op=="eq": |
## whereList.append(name+"="+libpq.PgQuoteString(value)) |
## whereList.append(name+"="+sql_quote(value)) |
## elif op=="bw": |
## elif op=="bw": |
## whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
## whereList.append(name+" LIKE "+sql_quote(value+"%")) |
## elif op=="ew": |
## elif op=="ew": |
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
## whereList.append(name+" LIKE "+sql_quote("%"+value)) |
## op="ct" |
## op="ct" |
|
|
## #except: |
## #except: |
Line 623 class ZSQLExtendFolder(Folder,Persistent
|
Line 671 class ZSQLExtendFolder(Folder,Persistent
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
|
if filter: |
where="WHERE "+string.join(whereList," "+lop+" ") |
whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter |
|
else: |
|
whereStr=string.join(whereList," "+lop+" ") |
|
where="WHERE "+whereStr |
|
else: |
|
if filter: |
|
where="WHERE "+filter |
else: |
else: |
where="" |
where="" |
|
|
if restrictConnect: |
if restrictConnect: |
print "resticted" |
|
if len(where)==0: |
if len(where)==0: |
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
else: |
else: |
Line 646 class ZSQLExtendFolder(Folder,Persistent
|
Line 700 class ZSQLExtendFolder(Folder,Persistent
|
|
|
if storename and (not NoQuery): |
if storename and (not NoQuery): |
query2="SELECT count(*) FROM %s %s"%(table,where) |
query2="SELECT count(*) FROM %s %s"%(table,where) |
print "storing",query2 |
|
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] |
if not self.REQUEST.SESSION.has_key(storename): |
if not self.REQUEST.SESSION.has_key(storename): |
self.REQUEST.SESSION[storename]={} |
self.REQUEST.SESSION[storename]={} |
if self.REQUEST.SESSION[storename].has_key('queryString2'): |
if self.REQUEST.SESSION[storename].has_key('queryString2'): |
print "HI",storename |
|
if not self.REQUEST.SESSION[storename]['queryString2']==query2: |
if not self.REQUEST.SESSION[storename]['queryString2']==query2: |
#print "HOOOOO",storename |
#print "HOOOOO",storename |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
Line 660 class ZSQLExtendFolder(Folder,Persistent
|
Line 714 class ZSQLExtendFolder(Folder,Persistent
|
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
|
|
else: |
else: |
print "go" |
|
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] |
Line 676 class ZSQLExtendFolder(Folder,Persistent
|
Line 730 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
if not NoQuery: |
if not NoQuery: |
print "noquery",query |
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
else: |
else: |
print "query" |
|
return query |
return query |
|
|
def ZSQLQuery(self,query): |
def ZSQLQuery(self,query): |
Line 1073 class ZSQLBibliography(Folder,ZSQLExtend
|
Line 1127 class ZSQLBibliography(Folder,ZSQLExtend
|
|
|
def getMetaDatasXML(self): |
def getMetaDatasXML(self): |
"""index""" |
"""index""" |
|
# check if the request's host part was OK |
|
http_host = self.REQUEST['HTTP_HOST'] |
|
host_port = self.REQUEST['SERVER_PORT'] |
|
fix_host = None |
|
if http_host and http_host.rfind(host_port) == -1: |
|
print "HTTP_HOST needs fixing!" |
|
fix_host = http_host + ":" + host_port |
|
|
ret="""<?xml version="1.0" ?> |
ret="""<?xml version="1.0" ?> |
<index>""" |
<index>""" |
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): |
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): |
link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid |
base_url = self.absolute_url() |
metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid |
if fix_host: |
|
#print "replacing ", http_host, " by ", fix_host |
|
base_url = string.replace(base_url, http_host, fix_host, 1) |
|
|
|
link=base_url+"/"+"record.html?oid=%i"%found.oid |
|
metalink=base_url+"/"+"getMetaDataXML?oid=%i"%found.oid |
|
|
ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink) |
ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink) |
|
|