version 1.28, 2004/07/26 15:43:26
|
version 1.30, 2004/08/04 11:02:39
|
Line 162 class ZSQLExtendFolder(Folder,Persistent
|
Line 162 class ZSQLExtendFolder(Folder,Persistent
|
return ret |
return ret |
|
|
|
|
def ZSQLOptionsFromCRList(self,fieldname,listField): |
def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''): |
"""generate select oprions form a cr seperated list""" |
"""generate select oprions form a cr seperated list""" |
fields=listField.split("\n") |
fields=listField.split("\n") |
ret="""<select name="%s"> |
ret="""<select name="%s" %s> |
"""%fieldname |
"""%(fieldname,multiple) |
for field in fields: |
for field in fields: |
ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8')) |
ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8')) |
ret+="""</select>""" |
ret+="""</select>""" |
return ret |
return ret |
|
|
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None): |
def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple=''): |
"""generate select oprions form a cr seperated list""" |
"""generate select oprions form a cr seperated list""" |
if not valueName: |
if not valueName: |
valueName=fieldName |
valueName=fieldName |
|
|
ret="""<select name="%s"> |
ret="""<select name="%s" %s> |
"""%fieldname |
"""%(fieldname,multiple) |
if start: |
if start: |
if start==' ': |
if start==' ': |
start='' |
start='' |
Line 235 class ZSQLExtendFolder(Folder,Persistent
|
Line 235 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
#print "INLINE:",query |
#print "INLINE:",query |
return self.ZSQLSimpleSearch(var=query) |
return self.ZSQLSimpleSearch(query) |
|
|
|
|
def ZSQLSimpleSearch(self,query=None): |
def ZSQLSimpleSearch(self,query=None): |
Line 279 class ZSQLExtendFolder(Folder,Persistent
|
Line 279 class ZSQLExtendFolder(Folder,Persistent
|
valueString=string.join(valueList,",") |
valueString=string.join(valueList,",") |
|
|
queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString) |
queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString) |
self.ZSQLSimpleSearch(var=queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange(self,**argv): |
def ZSQLChange(self,**argv): |
Line 313 class ZSQLExtendFolder(Folder,Persistent
|
Line 313 class ZSQLExtendFolder(Folder,Persistent
|
changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(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(var=queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLChange_old(self): |
def ZSQLChange_old(self): |
Line 338 class ZSQLExtendFolder(Folder,Persistent
|
Line 338 class ZSQLExtendFolder(Folder,Persistent
|
changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) |
changeList.append("\""+name+"\"="+libpq.PgQuoteString(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(var=queryString) |
self.ZSQLSimpleSearch(queryString) |
return self.REQUEST.RESPONSE.redirect(format) |
return self.REQUEST.RESPONSE.redirect(format) |
|
|
def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv): |
def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv): |
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
ret.append(x) |
ret.append(x) |
return ret |
return ret |
|
|
|
self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
if qs=="": |
if qs=="": |
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
Line 362 class ZSQLExtendFolder(Folder,Persistent
|
Line 363 class ZSQLExtendFolder(Folder,Persistent
|
for field in argv.keys(): |
for field in argv.keys(): |
|
|
qs+=",-%s=%s"%(field,argv[field]) |
qs+=",-%s=%s"%(field,argv[field]) |
#print qs |
|
else: |
else: |
|
|
qs=self.REQUEST.SESSION['query'] |
qs=self.REQUEST.SESSION.get('query','') |
|
|
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 457 class ZSQLExtendFolder(Folder,Persistent
|
Line 459 class ZSQLExtendFolder(Folder,Persistent
|
sort="" |
sort="" |
op="bw" |
op="bw" |
opfields={} |
opfields={} |
|
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld |
skip="" |
skip="" |
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
Line 465 class ZSQLExtendFolder(Folder,Persistent
|
Line 468 class ZSQLExtendFolder(Folder,Persistent
|
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
#print "Q",nostore,qs |
#print "Q",nostore,qs |
#check for op in the case of inline search |
#check for op |
|
|
splitted=qs.split(",") |
splitted=qs.split(",") |
|
|
Line 483 class ZSQLExtendFolder(Folder,Persistent
|
Line 486 class ZSQLExtendFolder(Folder,Persistent
|
|
|
field=name[4:] |
field=name[4:] |
opfields[field]=op |
opfields[field]=op |
|
|
|
if name[0:4]==iCT+"lop": |
|
lop=value |
|
|
|
field=name[5:] |
|
lopfields[field]=lop |
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
#now analyse the querystring |
#now analyse the querystring |
Line 515 class ZSQLExtendFolder(Folder,Persistent
|
Line 524 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 |
sort="ORDER BY "+value.replace(' AND ',',') |
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 529 class ZSQLExtendFolder(Folder,Persistent
|
Line 538 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#print "OP",op,name |
#print "OP",op,name |
value=value.lower() |
value=value.lower() |
|
tmp="" |
searchFields[name]=value |
|
|
|
if opfields.has_key(name): |
if opfields.has_key(name): |
op=opfields[name] |
op=opfields[name] |
else: |
else: |
op="ct" |
op="ct" |
name="LOWER("+name+")" |
name="LOWER("+name+")" |
if op=="ct": |
if op=="ct": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
elif op=="gt": |
elif op=="gt": |
whereList.append(name+">"+libpq.PgQuoteString(value)) |
tmp=(name+">"+libpq.PgQuoteString(value)) |
elif op=="lt": |
elif op=="lt": |
whereList.append(name+"<"+libpq.PgQuoteString(value)) |
tmp=(name+"<"+libpq.PgQuoteString(value)) |
elif op=="eq": |
elif op=="eq": |
whereList.append(name+"="+libpq.PgQuoteString(value)) |
tmp=(name+"="+libpq.PgQuoteString(value)) |
elif op=="bw": |
elif op=="bw": |
whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
elif op=="ew": |
elif op=="ew": |
whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
op="ct" |
op="ct" |
|
|
#except: |
if searchFields.has_key(name): |
# print "END",value,name,Exception |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
|
else: |
|
searchFields[name]=tmp |
|
|
|
|
|
## for name in searchFields.keys(): |
|
## value=searchFields[name] |
|
|
|
## if opfields.has_key(name): |
|
## op=opfields[name] |
|
## else: |
|
## op="ct" |
|
## name="LOWER("+name+")" |
|
## if op=="ct": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) |
|
## elif op=="gt": |
|
## whereList.append(name+">"+libpq.PgQuoteString(value)) |
|
## elif op=="lt": |
|
## whereList.append(name+"<"+libpq.PgQuoteString(value)) |
|
## elif op=="eq": |
|
## whereList.append(name+"="+libpq.PgQuoteString(value)) |
|
## elif op=="bw": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) |
|
## elif op=="ew": |
|
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) |
|
## op="ct" |
|
|
|
## #except: |
|
## # print "END",value,name,Exception |
|
|
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
where="WHERE "+string.join(whereList," "+lop+" ") |
where="WHERE "+string.join(whereList," "+lop+" ") |
else: |
else: |
Line 577 class ZSQLExtendFolder(Folder,Persistent
|
Line 615 class ZSQLExtendFolder(Folder,Persistent
|
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 |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=query2)[0].count |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] |
|
|
else: |
else: |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=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 594 class ZSQLExtendFolder(Folder,Persistent
|
Line 632 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
|
|
#print "Q",query |
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
|
|
def ZSQLQuery(self,query): |
def ZSQLQuery(self,query): |
"""query""" |
"""query""" |
return self.ZSQLSimpleSearch(var=query) |
return self.ZSQLSimpleSearch(query) |
|
|
def ZSQLSearch(self): |
def ZSQLSearch(self): |
"""To be done""" |
"""To be done""" |
Line 615 class ZSQLExtendFolder(Folder,Persistent
|
Line 653 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
"""nothing""" |
"""nothing""" |
#print formatfile |
#print formatfile |
|
|
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") |
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)) |
|
|
|
|
Line 986 class ZSQLBibliography(Folder,ZSQLExtend
|
Line 1027 class ZSQLBibliography(Folder,ZSQLExtend
|
"""index""" |
"""index""" |
ret="""<?xml version="1.0" ?> |
ret="""<?xml version="1.0" ?> |
<index>""" |
<index>""" |
for found in self.ZSQLSimpleSearch(var="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 |
link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid |
metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid |
metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid |
|
|