--- ZSQLExtend/ZSQLExtend.py 2005/02/10 16:18:15 1.60 +++ ZSQLExtend/ZSQLExtend.py 2005/10/10 15:34:50 1.64 @@ -11,11 +11,14 @@ from Products.PageTemplates.ZopePageTemp from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.ZSQLMethods.SQL import SQLConnectionIDs +from xml.sax.saxutils import escape +from types import * import Shared.DC.ZRDB.DA import zLOG import os.path import os + def analyseIntSearch(word): #analyse integer searches @@ -49,6 +52,7 @@ class ZSQLExtendFolder(Folder,Persistent """Folder""" meta_type="ZSQLExtendFolder" + def testneu(self): """test""" relStatement="""period like '%s%%'""" @@ -201,7 +205,7 @@ class ZSQLExtendFolder(Folder,Persistent return ret def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None): - """generate select oprions form a cr seperated list""" + """generate select options from a cr seperated list""" fields=listField.split("\n") ret="" for field in fields: @@ -211,18 +215,45 @@ class ZSQLExtendFolder(Folder,Persistent ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8')) return ret + def ZSQLSelectionFromSearchList(self,fieldname,results,fieldnameResult,boxType="checkbox",checked=None): + """generate select options from a cr seperated list""" + + ret="" + if not results: return "" + + for result in results: + field=getattr(result,fieldnameResult) + if field: + if checked and (getattr(result,fieldnameResult) in checked.split("\n")): + ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8')) + else: + ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8')) + return ret + - def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''): + def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None): """generate select oprions form a cr seperated list""" fields=listField.split("\n") - ret=""" + """%(fieldname,multiple,size) + + else: + ret="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect=""): + def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None): """generate select options form a search list es wird + if size: + ret=""" """%(fieldname,multiple,additionalSelect) if start: if start==' ': @@ -253,7 +287,13 @@ class ZSQLExtendFolder(Folder,Persistent field=getattr(result,fieldName) fieldValue=getattr(result,valueName) if fieldValue: - ret+=""""""%(field,fieldValue) + if not linelen: + ret+=""""""%(field,fieldValue) + else: + mist = """%s"""%(fieldValue) + if len(mist) > string.atoi(linelen): + mist = mist[:string.atoi(linelen)] + ret+=""""""%(field,mist) ret+="""""" return ret @@ -309,7 +349,8 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",query return self.ZSQLSimpleSearch(query) - + + def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """simple search""" @@ -318,8 +359,10 @@ class ZSQLExtendFolder(Folder,Persistent 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.connection_id,"var","") + self._v_searchSQL.max_rows_=max_rows try: + return self._v_searchSQL.__call__(var=query) except : if sys.exc_info()[0]=="Database Error": @@ -329,6 +372,7 @@ class ZSQLExtendFolder(Folder,Persistent else: try: self._v_searchSQL.max_rows_=max_rows + return self._v_searchSQL.__call__(var=query) except : if sys.exc_info()[0]=="Database Error": @@ -391,28 +435,37 @@ class ZSQLExtendFolder(Folder,Persistent self.ZSQLSimpleSearch(queryString) return self.REQUEST.RESPONSE.redirect(format) - def ZSQLChange(self,**argv): + def ZSQLChange(self,format=None,RESPONSE=None,**argv): """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack + qs_temp=[] for a in self.REQUEST.form.keys(): qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - qs=string.join(qs_temp,"&") - - - #print "CHANGE QS",self.REQUEST - #return self.REQUEST + qs=string.join(qs_temp,",") + + for field in argv.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) + + changeList=[] - for q in qs.split("&"): + for q in qs.split(","): + print q name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) - value=q.split("=")[1] + value="=".join(q.split("=")[1:]) value=re.sub(r'\+'," ",value) - value=urllib.unquote(value) - if name=="-table": - table=urllib.unquote(value) + value=urllib.unquote(value) + + if name=="-table": + table=urllib.unquote(value) elif name=="-identify": identify=urllib.unquote(value) identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1]) @@ -420,11 +473,16 @@ class ZSQLExtendFolder(Folder,Persistent format=urllib.unquote(value) elif (not name[0]=="-") and (not len(value)==0): changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) + changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) self.ZSQLSimpleSearch(queryString) - return self.REQUEST.RESPONSE.redirect(format) - + + + if RESPONSE and format: + return RESPONSE.redirect(format) + else: + return True def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): @@ -821,7 +879,7 @@ class ZSQLExtendFolder(Folder,Persistent if storename and (not NoQuery): query2="SELECT count(*) FROM %s %s"%(table,where) - + #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] if not self.REQUEST.SESSION.has_key(storename): self.REQUEST.SESSION[storename]={} @@ -833,8 +891,10 @@ class ZSQLExtendFolder(Folder,Persistent if not self.REQUEST.SESSION[storename]['queryString2']==query2: #print "HOOOOO",storename self.REQUEST.SESSION[storename]['queryString2']=query2 - self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count - + try: + self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count + except: + self.REQUEST.SESSION[storename]['count']=0 #print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] else: @@ -1256,20 +1316,28 @@ class ZSQLBibliography(Folder,ZSQLExtend return retdata,fieldlist - def createRDFTag(self,tag,content,namespace="ns"): + def createRDFTag(self,tag,content,namespace="cdli"): """create RDF""" if content: tag=namespace+":"+tag - ret=""" <%s>%s"""%(tag,content,tag) + if (type(content) is StringType) or (type(content) is UnicodeType): + ret=""" <%s>%s"""%(tag,escape(content),tag) + else: + ret=""" <%s>%s"""%(tag,content,tag) return ret.decode('latin-1') else: return "" def createIndexTag(self,tag,content): """create tag""" + if content: - ret="""<%s>%s"""%(tag,content,tag) - return ret + if (type(content) is StringType) or (type(content) is UnicodeType): + ret=""" <%s>%s"""%(tag,escape(content),tag) + else: + ret=""" <%s>%s"""%(tag,content,tag) + return ret.decode('latin-1') + else: return ""