--- ZSQLExtend/ZSQLExtend.py 2005/01/31 11:16:22 1.57 +++ ZSQLExtend/ZSQLExtend.py 2005/10/10 15:34:50 1.64 @@ -7,15 +7,18 @@ import string import sys #from pyPgSQL import libpq from AccessControl import getSecurityManager - +from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate 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,14 +891,19 @@ 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: self.REQUEST.SESSION[storename]['queryString2']=query2 - self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count + if self.ZSQLSimpleSearch(query2): + self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count + else: + self.REQUEST.SESSION[storename]['count']=0 #print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] @@ -1175,8 +1238,9 @@ class ZSQLBibliography(Folder,ZSQLExtend pt.content_type="text/html" return pt() - def changeZSQLBibliography(self,tableName,label,description,REQUEST=None): + def changeZSQLBibliography(self,tableName,label,description,connection_id=None,REQUEST=None): """change it""" + self.connection_id=connection_id self.tableName=tableName self.label=label self.description=description @@ -1186,6 +1250,8 @@ class ZSQLBibliography(Folder,ZSQLExtend manage_options=Folder.manage_options+( {'label':'Main Config','action':'changeZSQLBibliographyForm'}, + {'label':'Generate RDF Template','action':'generateRDFTemplate'}, + {'label':'Generate XML Template','action':'generateXMLTemplate'}, ) @@ -1250,19 +1316,28 @@ class ZSQLBibliography(Folder,ZSQLExtend return retdata,fieldlist - def createRDFTag(self,tag,content): + def createRDFTag(self,tag,content,namespace="cdli"): """create RDF""" if content: - ret=""" %s"""%(tag,content,tag) + tag=namespace+":"+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 "" @@ -1276,11 +1351,41 @@ class ZSQLBibliography(Folder,ZSQLExtend pt.content_type="text/xml" return pt() + + def generateRDFTemplate(self,REQUEST=None): + """generateRDFtemplate""" + zt=ZopePageTemplate('record.rdf') + self._setObject('record.rdf',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt','record.rdf') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/xml') + + + if REQUEST is not None: + return self.manage_main(self, REQUEST) + + def generateXMLTemplate(self,REQUEST=None): + """generateXMLtemplate""" + zt=ZopePageTemplate('record.xml') + self._setObject('record.xml',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt','record.xml') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/xml') + + + if REQUEST is not None: + return self.manage_main(self, REQUEST) def getMetaDataRDF(self): """crate index meta""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.rdf')).__of__(self) - pt.content_type="text/xml" - return pt() + find=self.ZopeFind(self,obj_ids=["record.rdf"]) + if not find: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.rdf')).__of__(self) + pt.content_type="text/xml" + return pt() + else: + return find[0][1]() def getMetaDataXML(self): """crate index meta""" @@ -1292,45 +1397,6 @@ class ZSQLBibliography(Folder,ZSQLExtend else: return find[0][1]() - def createVLMAtripels(self): - """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="" - for found in self.ZSQLSimpleSearch("select id_text from %s limit ALL"%'cdli_cat'): - base_url = self.absolute_url() - if fix_host: - #print "replacing ", http_host, " by ", fix_host - base_url = string.replace(base_url, http_host, fix_host, 1) - - #found2=self.ZSQLInlineSearchU(_table="cdli_imglist",id_text=found.id_text) - #create collectionobject info - subject="http://xserve02.mpiwg-berlin.mpg.de:8880/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text - object="http://xserve02:8880/cdlidata/images/getMetaDataRDF?id_text=%s"%found.id_text - predicate="metadata" - ret+="%s\t%s\t%s\n"%(subject,object,predicate) - #create image - subject="http://xserve02.mpiwg-berlin.mpg.de:8880/cdlineu/cdli_coll/cdli2/cdli_templates/cdli_templates/textdisplay.html?-table=cdli_cat&id_text=%s"%found.id_text - object="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn=/experimental/cdli/dl/photo/%s&mo=rawfile"%found.id_text - predicate="image" - - ret+="%s\t%s\t%s\n"%(subject,object,predicate) - - #create thumb - subject="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn=/experimental/cdli/dl/photo/%s&mo=rawfile"%found.id_text - object="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?fn=/experimental/cdli/dl/photo/%s&dw=100&dh=100"%found.id_text - predicate="thumb" - - ret+="%s\t%s\t%s\n"%(subject,object,predicate) - - return ret - def getMetaDatasXML(self): """index""" @@ -1363,6 +1429,7 @@ manage_addZSQLBibliographyForm=DTMLFile( def manage_addZSQLBibliography(self, id, tableName,label,description,title='', createPublic=0, createUserF=0, + connection_id=None, REQUEST=None): """Add a new Folder object with id *id*. @@ -1380,6 +1447,7 @@ def manage_addZSQLBibliography(self, id, setattr(ob,'tableName',tableName) setattr(ob,'label',label) setattr(ob,'description',description) + setattr(ob,'connection_id',connection_id) checkPermission=getSecurityManager().checkPermission