--- ZSQLExtend/ZSQLExtend.py 2005/01/31 11:16:22 1.57 +++ ZSQLExtend/ZSQLExtend.py 2006/12/14 17:10:23 1.99 @@ -7,14 +7,31 @@ 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 +import copy +import unicodedata + +from OFS.SimpleItem import SimpleItem + +def getTextFromNode(nodename): + """get the cdata content of a node""" + if nodename is None: + return "" + nodelist=nodename.childNodes + rc = "" + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc = rc + node.data + return rc def analyseIntSearch(word): #analyse integer searches @@ -39,16 +56,520 @@ 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): return SQLConnectionIDs(self) +class ZSQLIndex(SimpleItem): + """index""" + meta_type="ZSQLIndex" + + def __init__(self,index,id,table=''): + self.index=[x for x in index] + self.id=id + self.table=table + + def setIndex(self,index): + self.index=[x for x in index] + + def getIndex(self): + return self.index + class ZSQLExtendFolder(Folder,Persistent, Implicit): """Folder""" meta_type="ZSQLExtendFolder" + + def ZSQLQuote(self,str): + """quote str for sql""" + return sql_quote(str) + + + def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None): + """normalize a field""" + import unicodedata + + if not newFieldName: + newFieldName=fieldname+"_normal" + + def normal(str): + if str: + return unicodedata.normalize('NFKD', str.decode('utf-8')).encode('ASCII', 'ignore') + else: + return "" + if mode=="create": # create the field + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text')) + + qstr="select oid,%s from %s"%(fieldname,table) + for result in self.ZSQLSimpleSearch(qstr): + qstr="update %s set %s = %s where oid = %s" + + self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid)) + + def importAccessModell(self,configFileName,RESPONSE=None): + """import tables from access + @param configFileName: xml-configfile + """ + from Ft.Xml import Parse + fh=file(configFileName) + + doc=Parse(fh) + + x=doc.xpath("//pathToFolder/@path") + + + if not (len(x)==1): # tag ist nich eineindeutig + return False + + pathToFolder=x[0].value + + for db in doc.xpath("//db"): + + containers=db.xpath("./@container") + identifiers=db.xpath("./@identify") + + + if not (len(containers)==1): + return False + else: + container=containers[0].value + + if not (len(identifiers)==1): + identifier=None + else: + identifier=identifiers[0].value + + self.xsdToTable(container.lower(),container,modus="drop",filename=os.path.join(pathToFolder,container.lower()+".xsd")) + self.importXMLFileAccess(container.lower(),container,filename=os.path.join(pathToFolder,container.lower()+".xml"),identify=identifier) + + return "DONE" + + def xsdToTable(self,table,elementNameForTable,modus="update", filename=None,data=None,RESPONSE=None): + """reads an xsd file an creates the columns of a table out of its structure + @param table: name of the table the xml shall be imported into + @param elementNameForTable: must be a element of type complex type. the element of the sequence in the complex type + define the columns of the table >table< + @param data (optional): data to be imported + + @param filename (optional) or filename + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + + """ + #from xml.dom.minidom import parseString,parse + + from Ft.Xml import Parse + zLOG.LOG("import xsd",zLOG.INFO,"called") + #fh=file("/tmp/fmpxml.xml") + import bz2 + import base64 + + + ret="" + if data: + data=bz2.decompress(base64.decodestring(data)) + + #zLOG.LOG("import xsd",zLOG.INFO,"received file") + doc=Parse(data) + #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + txt=fh.read() + + doc=Parse(txt) + #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + + + Nss={'xsd':'http://www.w3.org/2001/XMLSchema'} + definingSequence=doc.xpath("""//xsd:element[@name='%s']/xsd:complexType/xsd:sequence/xsd:element/@name"""%elementNameForTable,explicitNss=Nss) + + fieldNames=[x.value for x in definingSequence] + + + + #check if table exists + + qstr="""select relname from pg_class where relname = '%s'"""%table + if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table + columns=[] + create=True + else: + create=False + + zLOG.LOG("update xsd: fieldnames",zLOG.INFO,repr(fieldNames)) + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + + if (modus=="drop") and (not create): #table shall be deleted, therefore it should exist (not create) + print "drop" + qstr="""DROP TABLE %s """ + self.ZSQLSimpleSearch(qstr%table) + columns=[] + create=True + + for fieldName in fieldNames: + if type(fieldName) is UnicodeType: + fieldName=fieldName.encode('utf-8') + zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName)) + if fieldName.lower() not in columns: + + if create:# table does not exist therefore create with one column + qstr="""create table %s (%s %s)""" + create=False + else:# otherwise add the field + qstr="""alter table %s add %s %s""" + + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + zLOG.LOG("update xsd: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text')) + + def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None): + ''' + Import XML file in access format into the table + @param table: name of the table the xml shall be imported into + @param containerTagName: XML-Tag which describes a dataset + @param data: data to be imported + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + ''' + from xml.dom.pulldom import parseString,parse + + zLOG.LOG("import xml",zLOG.INFO,"called") + #fh=file("/tmp/fmpxml.xml") + import bz2 + import base64 + + ret="" + if data: + data=bz2.decompress(base64.decodestring(data)) + + zLOG.LOG("import xml",zLOG.INFO,"received file") + doc=parseString(data) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + doc=parse(fh) + zLOG.LOG("import xml",zLOG.INFO,"parsed file") + while 1: + node=doc.getEvent() + + if node is None: + break; + else: + if node[1].nodeName.lower()==container.lower(): # make everything case insensitive + doc.expandNode(node[1]) + + dataSet={} + for col in node[1].childNodes: + if col.nodeType is col.ELEMENT_NODE: + data=col.nodeName + dataSet[data]=getTextFromNode(col) + + update=False + + if identify: + + field=dataSet[identify] + + searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) + zLOG.LOG("import xml",zLOG.INFO,searchStr) + search=self.ZSQLSimpleSearch(searchStr) + if search: + update=True + + if update: + tmp=[] + for fieldName in dataSet.keys(): + tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldName]))) + setStr=",".join(tmp) + + field=dataSet[identify] + + queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + self.ZSQLSimpleSearch(queryStr) + ret+="ud: %s \n"%field + else: + + + fields=",".join(dataSet.keys()) + values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()]) + + + queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(queryStr) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + + + + + return ret + + + def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None): + #TODO: finish importXMLFile + ''' + Import XML file into the table + @param table: name of the table the xml shall be imported into + @param containerTagName: XML-Tag which describes a dataset + @param file: xmlfile handle + @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. + @param RESPONSE: (optional) + ''' + from xml.dom.pulldom import parseString + + doc=parseString(file.read()) + while 1: + node=doc.getEvent() + + if node is None: + break; + else: + if node[1].nodeName==containerTagName: + doc.expandNode(node[1]) + cols=node[1].getElementsByTagName('COL') + dataSet=[] + for col in cols: + data=col.getElementsByTagName('DATA') + dataSet.append(getTextFromNode(data[0])) + update=False + if identify: + + nr=fieldNames.index(identify) + field=dataSet[nr] + + searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) + zLOG.LOG("import xml",zLOG.INFO,searchStr) + search=self.ZSQLSimpleSearch(searchStr) + if search: + update=True + + if update: + tmp=[] + for fieldName in fieldNames: + tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)]))) + setStr=",".join(tmp) + nr=fieldNames.index(identify) + field=dataSet[nr] + + queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + self.ZSQLSimpleSearch(queryStr) + ret+="ud: %s \n"%field + else: + + + fields=",".join(fieldNames) + values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet]) + + + queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(queryStr) + zLOG.LOG("update xml",zLOG.INFO,queryStr) + ret+="ad: %s \n"%field + + elif node[1].nodeName=="METADATA": + fieldNames=[] + doc.expandNode(node[1]) + + names=node[1].getElementsByTagName('FIELD') + + for name in names: + fieldNames.append(name.getAttribute('NAME')) + + zLOG.LOG("update xml: fieldnames",zLOG.INFO,repr(fieldNames)) + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + for fieldName in fieldNames: + zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName)) + if fieldName not in columns: + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + zLOG.LOG("update xml: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text')) + #fn=node[1].getAttribute("xml:id") + #nf=file("xtf/"+fn+".xtf",'w') + #nf.write(""""""+node[1].toxml()+"") + #print "wrote: %s"%fn + + + def importXMLFileFMP(self,table,data=None,filename=None,update_fields=None,id_field=None,sync_mode=False,RESPONSE=None): + ''' + Import FileMaker XML file (FMPXMLRESULT format) into the table. + @param table: name of the table the xml shall be imported into + @param data: xml data as bz2 string + @param filename: xmlfile filename + @param update_fields: (optional) list of fields to update; default is to create all fields + @param id_field: (optional) field which uniquely identifies an entry for updating purposes. + @param sync_mode: (optional) really synchronise, i.e. delete entries not in XML file + @param RESPONSE: (optional) + ''' + from xml.dom.pulldom import parseString,parse + import transaction + + ret = "" + + if data: + data=bz2.decompress(base64.decodestring(data)) + zLOG.LOG("fmpxml",zLOG.INFO,"received file") + doc=parseString(data) + zLOG.LOG("fmpxml",zLOG.INFO,"parsed file") + + elif filename: + fh=file(filename) + zLOG.LOG("fmpxml",zLOG.INFO,"reading file") + doc=parse(fh) + zLOG.LOG("fmpxml",zLOG.INFO,"parsed file") + + dbIDs = {} + rowcnt = 0 + + if id_field is not None: + # prepare a list of ids for sync mode + qstr="select %s from %s"%(id_field,table) + for id in self.ZSQLSimpleSearch(qstr): + # value 0: not updated + dbIDs[id[0]] = 0; + rowcnt += 1 + + zLOG.LOG("fmpxml",zLOG.INFO,"%d entries in DB to sync"%rowcnt) + + fieldNames = [] + rowcnt = 0 + id_val = '' + + while 1: + node=doc.getEvent() + + if node is None: + break; + + # METADATA tag defines number and names of fields in FMPXMLRESULT + if node[1].nodeName == 'METADATA': + doc.expandNode(node[1]) + + names=node[1].getElementsByTagName('FIELD') + + for name in names: + fn = name.getAttribute('NAME') + fieldNames.append(fn) + + if update_fields is None: + # update all fields + update_fields = fieldNames + + zLOG.LOG("fmpxml fieldnames:",zLOG.INFO,repr(fieldNames)) + # get list of fields in db table + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s'""" + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + # adjust db table to fields in XML and fieldlist + for fieldName in fieldNames: + zLOG.LOG("fmpxml fieldname:",zLOG.INFO,repr(fieldName)) + if (fieldName not in columns) and (fieldName in update_fields): + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + zLOG.LOG("fmpxml add field:",zLOG.INFO,qstr%(table,fieldName,'text')) + + # ROW tags (in RESULTSET tag) hold data + elif node[1].nodeName == 'ROW': + rowcnt += 1 + + doc.expandNode(node[1]) + cols=node[1].getElementsByTagName('COL') + dataSet={} + i = 0 + # populate with data + for col in cols: + data=col.getElementsByTagName('DATA') + dataSet[fieldNames[i]] = getTextFromNode(data[0]) + i += 1 + + update=False + + # synchronize by id_field + if id_field: + id_val=dataSet[id_field] + if id_val in dbIDs: + dbIDs[id_val] += 1 + update=True + + if update: + # update existing row (by id_field) + setvals=[] + for fieldName in update_fields: + setvals.append("%s = %s"%(fieldName,self.ZSQLQuote(dataSet[fieldName]))) + setStr=string.join(setvals, ',') + id_val=dataSet[id_field] + qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val) + #zLOG.LOG("fmpxml update:",zLOG.INFO,queryStr) + self.ZSQLSimpleSearch(qstr) + ret+="up: %s \n"%id_val + else: + # create new row + fields=string.join(update_fields, ',') + values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',') + qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(qstr) + #zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr) + ret+="ad: %s \n"%dataSet.get(id_field, rowcnt) + + #zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val)) + if (rowcnt % 10) == 0: + zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val)) + transaction.commit() + + transaction.commit() + if sync_mode: + # delete unmatched entries in db + for id in dbIDs.keys(): + # find all not-updated fields + if dbIDs[id] == 0: + zLOG.LOG("fmpxml delete:",zLOG.INFO,id) + qstr = "DELETE FROM %s WHERE %s = '%s'" + self.ZSQLSimpleSearch(qstr%(table,id_field,id)) + + elif dbIDs[id] > 1: + zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id) + + transaction.commit() + + return ret + + def generateIndex(self,field,index_name,table,RESPONSE=None): + """erzeuge index aus feld""" + index={} + founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table)) + + for found in founds: + tmp=getattr(found,field,None) + if tmp: + strings=tmp.split(" ") + for string in strings: + if index.get(string): + index[string].append(found.oid) + else: + index[string]=[found.oid] + RESPONSE.write(string+"\n") + + if not hasattr(self,index_name): + obj=ZSQLIndex(index,index_name,table) + self._setObject(index_name,obj) + + self._getOb(index_name).setIndex(index) + + def getIndex(self,index_name): + """getIndex""" + founds=self.ZopeFind(self,obj_ids=[index_name]) + + return founds[0][1].getIndex() + + def testneu(self): """test""" relStatement="""period like '%s%%'""" @@ -60,6 +581,7 @@ class ZSQLExtendFolder(Folder,Persistent def URLquote(self,txt): """urlquote""" return urllib.quote(txt) + def searchRel(self,relStatement,statement,wherePart,classes): """suche relative haufigkeiten""" ret={} @@ -127,6 +649,8 @@ class ZSQLExtendFolder(Folder,Persistent def formatAscii(self,str,url=None): """ersetze ascii umbrueche durch
""" #url=None + str=str.rstrip().lstrip() + if url and str: retStr="" @@ -159,22 +683,22 @@ class ZSQLExtendFolder(Folder,Persistent return "" def actualPath(self,url=None): - """path""" + """path""" if self.REQUEST['HTTP_X_FORWARDED_SERVER']=='': host=self.REQUEST['HTTP_HOST'] else: host=self.REQUEST['HTTP_X_FORWARDED_SERVER'] - if not url: - return "http://"+host+self.REQUEST['PATH_TRANSLATED'] - else: - temp=self.REQUEST[url].split("/") - temp[2]=host - return string.join(temp,"/") + if not url: + return "http://"+host+self.REQUEST['PATH_TRANSLATED'] + else: + temp=self.REQUEST[url].split("/") + temp[2]=host + return string.join(temp,"/") def getRequest(self): - """request""" - return self.REQUEST + """request""" + return self.REQUEST def lowerEnd(self,path): """oinly for demo""" @@ -191,17 +715,17 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLsearchOptions(self,fieldname=""): """return HTML Fragment with search options""" - + ret=""""""%fieldname 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 +735,48 @@ 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,selected=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,selected=None): """generate select options form a search list es wird + if size: + ret=""" """%(fieldname,multiple,additionalSelect) if start: - if start==' ': - start='' - if not startValue: + if start==' ': + start='' + + if not startValue: startValue=start - + ret+=""""""%(startValue,start) for result in results: field=getattr(result,fieldName) fieldValue=getattr(result,valueName) if fieldValue: - ret+=""""""%(field,fieldValue) + + if not linelen: + + + if field == selected: + + ret+=""""""%(field,fieldValue) + else: + ret+=""""""%(field,fieldValue) + + else: + mist = """%s"""%(fieldValue) + if len(mist) > string.atoi(linelen): + mist = mist[:string.atoi(linelen)] + ret+=""""""%(field,mist) ret+="""""" return ret - def ZSQLInlineSearchU(self,storename=None,**argv): + def ZSQLInlineSearchU(self,storename=None,args=None,**argv): """one element if exists""" qs=[] if storename: """store""" + storename=storename else: storename="foundCount" - + if args: + argTmp=args + else: + argTmp=argv + #print "INLINE:",argv - for a in argv.keys(): - qs.append(a+"="+urllib.quote(str(argv[a]))) + for a in argTmp.keys(): + aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" + qs.append(aFiltered+"="+urllib.quote(str(argTmp[a]))) #return [] ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -278,8 +856,30 @@ class ZSQLExtendFolder(Folder,Persistent return ret[0] except: return None + + + def ZSQLSequentialSearch(self,_fieldlist,_searchTerm,storename=None,args=None,**argv): + """get a list of tuples (fields,searchoptions,table) to search the searchTerm in, returns dictionary. """ + #print "do search with:",_fieldlist,_searchTerm,storename,args,argv + ret={} + if args: + argTmp=args + else: + argTmp=argv + + for field in _fieldlist: + + argTmp2=copy.deepcopy(argTmp) + argTmp2[field[0]]=_searchTerm + argTmp2['_op_'+field[0]]=field[1] + argTmp2['_table']=field[2] + + ret[field[0]]=(self.ZSQLInlineSearch(storename=storename,args=argTmp2),field[3],field[4],field[5],field[6]) - def ZSQLInlineSearch(self,storename=None,**argv): + return ret + + + def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" qs=[] @@ -290,55 +890,85 @@ class ZSQLExtendFolder(Folder,Persistent + if args: + argTmp=args + else: + argTmp=argv + + #print "INLINE:",argv - for a in argv.keys(): - try: - qs.append(a+"="+urllib.quote(str(argv[a]))) - except: - import urllib - qs.append(a+"="+urllib.quote(str(argv[a]))) + for a in argTmp.keys(): + aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" + qs.append(aFiltered+"="+urllib.quote(str(argTmp[a]))) + #return [] + return self.parseQueryString(string.join(qs,","),"_",storename=storename) def ZSQLInlineSearch2(self,query): """inlinesearch""" qs=[] - - #print "INLINE:",query return self.ZSQLSimpleSearch(query) - + + + def ZSQLResetConnection(self): + """reset the connectione""" + try: + self.getConnectionObj().manage_close_connection() + except: + zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + try: + self.getConnectionObj().manage_open_connection() + except: + zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """simple search""" - + + #print query 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=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"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: pass + self.getConnectionObj().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: pass + self.getConnectionObj().manage_open_connection() + except: + zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + + def getConnectionObj(self): + if hasattr(self,'connection_id'): + return getattr(self,self.connection_id) + def ZSQLSimpleSearch2(self,query=None): """ returrn SQLSearch""" - #print "hi",query + if not query: query=self.query if getattr(self,'_v_search',None): @@ -362,20 +992,41 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLAdd(self): + def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): """Neuer Eintrag""" - qs=self.REQUEST['QUERY_STRING'] + + if args: + argTmp=args + else: + argTmp=argv + + 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 argTmp.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argTmp[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=[] @@ -388,48 +1039,91 @@ 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,USE_FORM=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,"&") + 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]))) - - #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])) + + changeList=[] - for q in qs.split("&"): + + for q in qs_temp: + 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): - changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) + #elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): + elif (not (name[0]=="-" or name[0]=="_")): + + if value=="": + changeList.append("\""+name+"\"=null") + else: + 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) + zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString) + self.ZSQLSimpleSearch(queryString) + + + if RESPONSE and format: + return RESPONSE.redirect(format) + else: + return True + def ZSQLFindIndexed(self,qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv): + """find2""" + + for index in self.ZopeFind(self,obj_ids=indexedFields): + txt=argv.get(index[0],None) + if txt: + oids=index[1].getIndex()[txt] + + search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv) + + search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv) + return search2 + def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): """find2""" - + search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv) search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv) @@ -438,9 +1132,10 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): - """Find""" + """search in database""" def delEmpty(list): + """"loesche leere elemente aus der liste""" ret=[] for x in list: splitted=x.split("=") @@ -448,15 +1143,11 @@ class ZSQLExtendFolder(Folder,Persistent ret.append(x) return ret - - - #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen if qs=="": - + #kein querystring ubergeben if self.REQUEST['QUERY_STRING']: qs=self.REQUEST['QUERY_STRING'] - qs=string.join(qs.split("&"),",") for field in argv.keys(): @@ -488,7 +1179,7 @@ class ZSQLExtendFolder(Folder,Persistent - qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular. + qs=re.sub("\\+"," ",qs)#TODO: Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular. qs=string.join(delEmpty(qs.split(",")),",") @@ -567,7 +1258,13 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv): """suche mit alten parametern bis auf die in argv getauschten""" + str = self.ZSQLNewSearchURL(storename, url, args, **argv) + return """ %s"""%(str,linkText) + + def ZSQLNewSearchURL(self, storename=None,url=None,args=None,**argv): + """suche mit alten parametern bis auf die in argv getauschten""" + if storename: """store""" else: @@ -610,12 +1307,14 @@ class ZSQLExtendFolder(Folder,Persistent else: str="ZSQLSearch?"+"&".join(newquery) - return """ %s"""%(str,linkText) + return str def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None): """analysieren den QueryString""" + #setzte generische werte + lop="AND" # standardsuche mit and max="ALL" #standard alle auswaehlen maxstr="" @@ -625,27 +1324,29 @@ class ZSQLExtendFolder(Folder,Persistent opfields={} lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld sortfields={} #order of sortfields + diacritics={} #diacritische zeichen, falls "no", dann werden diese fuer das feld gefiltert. sortAllFields=None skip="" rangeStart=0 limit=0 searchFields={} searchFieldsOnly={} + queryTemplate=[] + if not select: select="oid,*" - #print "Q",nostore,qs - #check for op - + #check for op + splitted=qs.split(",") - - splitted=qs.split(",") if tableExt: table=tableExt if restrictField: select=restrictField - + + + #erster durchgang suche operatoren for q in splitted: name=re.sub("r'+'"," ",q.split("=")[0].lower()) @@ -666,6 +1367,10 @@ class ZSQLExtendFolder(Folder,Persistent field=name[5:] lopfields[field]=lop + if name[0:11]==iCT+"diacritics": + field=name[12:] + diacritics[field]=value + if name[0:10]==iCT+"sortorder": #sort=value @@ -676,25 +1381,26 @@ class ZSQLExtendFolder(Folder,Persistent sortAllFields=value else: sortfields[field]=value - - #print "HI",op,field - #print opfieldsa - #now analyse the querystring - + + #zweiter durchgang analysiere felder for q in qs.split(","): - #try: - + name=re.sub("r'+'"," ",q.split("=")[0].lower()) try: value=urllib.unquote(q.split("=",1)[1]) except: value="" - #value=sql_quote(value) + punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle: + + #analysiere alle anderen faelle - + if diacritics.get(name,'yes')=='no': + """filter diacritische zeichen""" + value=unicodedata.normalize('NFKD', value.decode('utf-8')).encode('ASCII', 'ignore') + if name==iCT+"lop": lop=value elif name==iCT+"table": @@ -735,10 +1441,63 @@ class ZSQLExtendFolder(Folder,Persistent op=value + #sonderfall Name hat das Format: + #TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table + #i.e. erzeugt wird + #das Statement + #WHERE IDENTIFIER_IN_TABELLE in (select * from SELECT_FIELD + #where LOWER(SUCHFELD_IN_DIESER_TABELLE) something value) + #something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE + + elif (not name[0]==iCT) and len(punktsplit)==4: + if opfields.has_key(name): + op=opfields[name] + else: + op="ct" + namealt=name + name="LOWER("+punktsplit[1]+")" + value=value.lower() + if op=="ct": + tmp=(name+" LIKE "+sql_quote("%"+value+"%")) + elif op=="gt": + tmp=(name+">"+sql_quote(value)) + elif op=="lt": + tmp=(name+"<"+sql_quote(value)) + elif op=="eq": + tmp=(name+"="+sql_quote(value)) + elif op=="bw": + tmp=(name+" LIKE "+sql_quote(value+"%")) + elif op=="ew": + tmp=(name+" LIKE "+sql_quote("%"+value)) + elif op=="all": + tmps=[] + for word in value.split(" "): + tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) + + tmp=string.join(tmps,' AND ') + + elif op=="numerical": + term=analyseIntSearch(value) + tmp=(name+" "+term) + elif op=="grep": + tmp=(name+" ~* "+sql_quote(value)) + elif op=="one": + tmps=[] + for word in value.split(" "): + tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) + + tmp=string.join(tmps,' OR ') + + op="all" + + searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp) + + queryTemplate.append(searchTmp) + 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): @@ -790,6 +1549,7 @@ class ZSQLExtendFolder(Folder,Persistent whereList=["("+searchFields[x]+")" for x in searchFields.keys()] + whereList+=queryTemplate if len(whereList)>0: if filter: @@ -813,15 +1573,16 @@ class ZSQLExtendFolder(Folder,Persistent #print "QE",table #print (select,table,where,sort,maxstr,skip) query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip) - + if not nostore=="yes": self.REQUEST.SESSION['qs']=opfields #print "IAMHERE again:", query if storename and (not NoQuery): - query2="SELECT count(*) FROM %s %s"%(table,where) + 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 +1594,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'] @@ -851,10 +1617,11 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields - self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + if not NoQuery: - + return self.ZSQLQuery(query) else: @@ -872,37 +1639,34 @@ class ZSQLExtendFolder(Folder,Persistent else: return value - def ZSQLQuery(self,query): + def ZSQLQuery(self,query,debug=None): """query""" - + if debug: + zLOG.LOG("ZSQLQuery", zLOG.INFO, query) + return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): """To be done""" - rq=self.REQUEST['QUERY_STRING'] - - querys=rq.split("&") - - + formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url + + #zerlege querystring in key value paare + #TODO: check if this is really necessary, use argv** - for querytemp in querys: + rq=self.REQUEST['QUERY_STRING'] + querys=rq.split("&") + for querytemp in querys: #zerg query=querytemp.split("=") - - - try: if query[0].lower()=="-format": formatfile=query[1] except: - """nothing""" + pass - - #print formatfile - - + #sichern self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") self.REQUEST.SESSION['come_from_search']="yes" @@ -977,7 +1741,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) @@ -1175,8 +1939,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 +1951,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'}, ) @@ -1218,16 +1985,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 @@ -1239,34 +2006,43 @@ 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] 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]+"." @@ -1276,11 +2052,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 +2098,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""" @@ -1339,11 +2106,11 @@ class ZSQLBibliography(Folder,ZSQLExtend host_port = self.REQUEST['SERVER_PORT'] fix_host = None if http_host and http_host.rfind(host_port) == -1: - print "HTTP_HOST needs fixing!" + #print "HTTP_HOST needs fixing!" 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: @@ -1363,6 +2130,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 +2148,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 @@ -1403,4 +2172,4 @@ def manage_addZSQLBibliography(self, id, - + \ No newline at end of file