--- ZSQLExtend/ZSQLExtend.py 2005/01/12 19:13:34 1.53 +++ ZSQLExtend/ZSQLExtend.py 2005/10/11 20:05:06 1.67 @@ -1,17 +1,23 @@ from OFS.Folder import Folder -from Globals import Persistent from Acquisition import Implicit -from Globals import DTMLFile,package_home +from Globals import DTMLFile,package_home,Persistent import urllib import re import string +import sys #from pyPgSQL import libpq from AccessControl import getSecurityManager -import os.path +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 @@ -36,7 +42,7 @@ def sql_quote(v): quote_dict = {"\'": "''", "\\": "\\\\"} for dkey in quote_dict.keys(): if string.find(v, dkey) >= 0: - v=join(split(v,dkey),quote_dict[dkey]) + v=string.join(string.split(v,dkey),quote_dict[dkey]) return "'%s'" % v def showSQLConnectionIDs(self): @@ -46,6 +52,7 @@ class ZSQLExtendFolder(Folder,Persistent """Folder""" meta_type="ZSQLExtendFolder" + def testneu(self): """test""" relStatement="""period like '%s%%'""" @@ -198,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: @@ -208,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==' ': @@ -250,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 @@ -302,15 +345,45 @@ class ZSQLExtendFolder(Folder,Persistent """inlinesearch""" qs=[] - - #print "INLINE:",query return self.ZSQLSimpleSearch(query) + + + def ZSQLSimpleSearch(self,query=None,max_rows=1000000): + """simple search""" + + if not query: + query=self.query + 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": + try: + getattr(self,self.connection_id).manage_open_connection() + except: + zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + else: + try: + self._v_searchSQL.max_rows_=max_rows + + return self._v_searchSQL.__call__(var=query) + except : + if sys.exc_info()[0]=="Database Error": + try: + getattr(self,self.connection_id).manage_open_connection() + except: + zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) - def ZSQLSimpleSearch(self,query=None): + + def ZSQLSimpleSearch2(self,query=None): """ returrn SQLSearch""" - #print "hi",query + if not query: query=self.query if getattr(self,'_v_search',None): @@ -334,20 +407,36 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLAdd(self): + def ZSQLAdd(self,format=None,RESPONSE=None,**argv): """Neuer Eintrag""" - qs=self.REQUEST['QUERY_STRING'] + + 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,",") + + for field in argv.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) + + addList={} - for q in qs.split("&"): + for q in qs.split(","): name=re.sub("r'+'"," ",q.split("=")[0].lower()) value=q.split("=")[1] - value=re.sub(r'\+'," ",value) - value=urllib.unquote(value) + value=re.sub(r'\+'," ",value) + value=urllib.unquote(value) if name=="-table": table=urllib.unquote(value) elif name=="-format": format=urllib.unquote(value) - elif (not name[0]=="-") and (not len(value)==0): + elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): addList[urllib.unquote(name)]=urllib.unquote(value) keyList=[] @@ -360,43 +449,64 @@ class ZSQLExtendFolder(Folder,Persistent valueString=string.join(valueList,",") queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString) + self.ZSQLSimpleSearch(queryString) - return self.REQUEST.RESPONSE.redirect(format) - def ZSQLChange(self,**argv): + if RESPONSE and format: + return RESPONSE.redirect(format) + else: + return True + + 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,"&") +# for a in self.REQUEST.form.keys(): +# qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - - #print "CHANGE QS",self.REQUEST - #return self.REQUEST + + + for field in argv.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs_temp.append("%s=%s"%(fieldTmp,argv[field])) + + qs=string.join(qs_temp,",") changeList=[] - for q in qs.split("&"): + + for q in qs.split(","): + 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]) elif name=="-format": format=urllib.unquote(value) - elif (not name[0]=="-") and (not len(value)==0): + elif (not (name[0]=="-" or 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) + self.ZSQLSimpleSearch(queryString) + + + 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): @@ -793,7 +903,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]={} @@ -805,14 +915,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'] @@ -1147,8 +1262,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 @@ -1158,6 +1274,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'}, ) @@ -1222,23 +1340,32 @@ 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 "" - def getMetaDataXML2(self): + def getXML2(self): """crate index meta""" fn=os.path.splitext(self.REQUEST['fn'])[0]+"." @@ -1248,56 +1375,51 @@ 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""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) - pt.content_type="text/xml" - return pt() - - 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 + find=self.ZopeFind(self,obj_ids=["record.xml"]) + if not find: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) + pt.content_type="text/xml" + return pt() + else: + return find[0][1]() def getMetaDatasXML(self): @@ -1331,6 +1453,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*. @@ -1348,6 +1471,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