--- ZSQLExtend/ZSQLExtend.py 2005/12/22 21:10:34 1.77
+++ ZSQLExtend/ZSQLExtend.py 2006/07/27 17:31:50 1.87
@@ -448,7 +448,7 @@ class ZSQLExtendFolder(Folder,Persistent
if not query:
query=self.query
-
+
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):
@@ -533,7 +533,7 @@ class ZSQLExtendFolder(Folder,Persistent
name=re.sub("r'+'"," ",q.split("=")[0].lower())
value=q.split("=")[1]
value=re.sub(r'\+'," ",value)
- value=urllib.unquote(value)
+ value=urllib.unquote(value)
if name=="-table":
table=urllib.unquote(value)
elif name=="-format":
@@ -567,6 +567,7 @@ class ZSQLExtendFolder(Folder,Persistent
qs_temp=[]
if USE_FORM or RESPONSE:
for a in self.REQUEST.form.keys():
+
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
@@ -584,12 +585,12 @@ class ZSQLExtendFolder(Folder,Persistent
changeList=[]
for q in qs_temp:
-
+
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
value="=".join(q.split("=")[1:])
value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)
-
+
if name=="-table":
table=urllib.unquote(value)
elif name=="-identify":
@@ -597,13 +598,15 @@ class ZSQLExtendFolder(Folder,Persistent
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":
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)))
changeString=string.join(changeList,",")
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
+ zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString)
self.ZSQLSimpleSearch(queryString)
@@ -980,7 +983,7 @@ class ZSQLExtendFolder(Folder,Persistent
elif (not name[0]==iCT) and (not len(value)==0):
- #print "OP",op,name
+ #print "OP",op,name
value=value.lower()
tmp=""
if opfields.has_key(name):
@@ -1223,7 +1226,7 @@ class ZSQLExtendFolder(Folder,Persistent
newquery.append(query)
newquerystring=string.join(newquery,"&")
- return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html)
+ return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html)
@@ -1467,16 +1470,16 @@ class ZSQLBibliography(Folder,ZSQLExtend
retdata={}
fieldlist=self.standardMD.fieldList
- for referenceTypeF in self.referencetypes:
- #print referenceType,referenceTypeF[1].title
- if referenceTypeF[1].title == referenceType:
- bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
- bibdata['data']=referenceTypeF[1]
- self.fields=bibdata[referenceType]
+ for referenceTypeF in self.referencetypes:
+ #print referenceType,referenceTypeF[1].title
+ if referenceTypeF[1].title == referenceType:
+ bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+ bibdata['data']=referenceTypeF[1]
+ self.fields=bibdata[referenceType]
for field in fieldlist:
- if referenceTypeF[1].getValue(field)[0]==None:
- retdata[field]=field
- else:
+ if referenceTypeF[1].getValue(field)[0]==None:
+ retdata[field]=field
+ else:
retdata[field]=referenceTypeF[1].getValue(field)[0]
return retdata,fieldlist
@@ -1488,12 +1491,12 @@ class ZSQLBibliography(Folder,ZSQLExtend
retdata={}
fieldlist=self.standardMD.fieldList
- for referenceTypeF in self.referencetypes:
- #print referenceType,referenceTypeF[1].title
- if referenceTypeF[1].title == referenceType:
- bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
- bibdata['data']=referenceTypeF[1]
- self.fields=bibdata[referenceType]
+ for referenceTypeF in self.referencetypes:
+ #print referenceType,referenceTypeF[1].title
+ if referenceTypeF[1].title == referenceType:
+ bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
+ bibdata['data']=referenceTypeF[1]
+ self.fields=bibdata[referenceType]
for field in fieldlist:
retdata[field]=referenceTypeF[1].getValue(field)[1]
@@ -1592,7 +1595,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
fix_host = http_host + ":" + host_port
ret="""
- """
+ """
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):
base_url = self.absolute_url()
if fix_host: