ChinaGisRestApi: RestDbInterface.py annotate

annotate RestDbInterface.py @ 70:9ec7e32e8ad3

working on maps nicer HTML (with xhtml DTD) better unicode handling for psycopg

author	casties
date	Tue, 23 Nov 2010 17:16:25 +0100
parents	e81d034b28a5
children	6f7f8dee6cd2

rev	line source
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	1 '''
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	2 Created on 19.5.2010
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	3
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	4 @author: casties
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	5 '''
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	6
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	7 from OFS.Folder import Folder
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	8 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
60 9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	9 from AccessControl import getSecurityManager, Unauthorized
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	10 from Products.ZSQLExtend import ZSQLExtend
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	11 import logging
15 5e3edf980813 more work on xml import casties parents: 14 diff changeset	12 import re
18 060797795a4d work on json return values casties parents: 17 diff changeset	13 import json
36 b915bce65372 added kml url option fknauft parents: 9 diff changeset	14 import time
70 9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	15 import psycopg2
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	16 # make psycopg use unicode objects
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	17 import psycopg2.extensions
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	18 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	19 psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	20
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	21 from zope.interface import implements
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	22 from zope.publisher.interfaces import IPublishTraverse
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	23 from ZPublisher.BaseRequest import DefaultPublishTraverse
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	24 #from zope.publisher.interfaces import NotFound
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	25 #from zope.app import zapi
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	26 #from zope.component import queryMultiAdapter
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	27 import Shared.DC.ZRDB.DA
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	28 from Products.ZSQLMethods.SQL import SQLConnectionIDs
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	29
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	30
70 9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	31 def unicodify(s,alternate='latin-1'):
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	32 """decode str (utf-8 or latin-1 representation) into unicode object"""
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	33 if not s:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	34 return u""
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	35 if isinstance(s, str):
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	36 try:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	37 return s.decode('utf-8')
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	38 except:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	39 return s.decode(alternate)
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	40 else:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	41 return s
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	42
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	43 def utf8ify(s):
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	44 """encode unicode object or string into byte string in utf-8 representation.
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	45 assumes string objects to be utf-8"""
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	46 if not s:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	47 return ""
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	48 if isinstance(s, str):
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	49 return s
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	50 else:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	51 return s.encode('utf-8')
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	52
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	53 def getTextFromNode(node):
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	54 """get the cdata content of a XML node"""
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	55 if node is None:
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	56 return ""
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	57
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	58 if isinstance(node, list):
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	59 nodelist = node
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	60 else:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	61 nodelist=node.childNodes
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	62
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	63 rc = ""
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	64 for node in nodelist:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	65 if node.nodeType == node.TEXT_NODE:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	66 rc = rc + node.data
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	67 return rc
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	68
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	69 def sqlName(s,lc=True):
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	70 """returns restricted ASCII-only version of string"""
15 5e3edf980813 more work on xml import casties parents: 14 diff changeset	71 if s is None:
5e3edf980813 more work on xml import casties parents: 14 diff changeset	72 return ""
5e3edf980813 more work on xml import casties parents: 14 diff changeset	73
5e3edf980813 more work on xml import casties parents: 14 diff changeset	74 # all else -> "_"
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	75 s = re.sub(r'[^A-Za-z0-9_]','_',s)
15 5e3edf980813 more work on xml import casties parents: 14 diff changeset	76 if lc:
5e3edf980813 more work on xml import casties parents: 14 diff changeset	77 return s.lower()
5e3edf980813 more work on xml import casties parents: 14 diff changeset	78
5e3edf980813 more work on xml import casties parents: 14 diff changeset	79 return s
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	80
31 6d2055f1b4fa more work on types casties parents: 30 diff changeset	81
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	82 class RestDbInterface(Folder):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	83 """Object for RESTful database queries
7 bd52d9445a41 trying to rework casties parents: 5 diff changeset	84 path schema: /db/{schema}/{table}/
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	85 omitting table gives a list of schemas
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	86 omitting table and schema gives a list of schemas
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	87 """
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	88 implements(IPublishTraverse)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	89
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	90 meta_type="RESTdb"
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	91 manage_options=Folder.manage_options+(
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	92 {'label':'Config','action':'manage_editRestDbInterfaceForm'},
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	93 )
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	94
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	95 # management templates
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	96 manage_editRestDbInterfaceForm=PageTemplateFile('zpt/editRestDbInterface',globals())
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	97
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	98 # data templates
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	99 XML_index = PageTemplateFile('zpt/XML_index', globals())
a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	100 XML_schema = PageTemplateFile('zpt/XML_schema', globals())
a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	101 XML_schema_table = PageTemplateFile('zpt/XML_schema_table', globals())
a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	102 HTML_index = PageTemplateFile('zpt/HTML_index', globals())
a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	103 HTML_schema = PageTemplateFile('zpt/HTML_schema', globals())
a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	104 HTML_schema_table = PageTemplateFile('zpt/HTML_schema_table', globals())
22 1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	105 JSONHTML_index = PageTemplateFile('zpt/JSONHTML_index', globals())
1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	106 JSONHTML_schema = PageTemplateFile('zpt/JSONHTML_schema', globals())
1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	107 JSONHTML_schema_table = PageTemplateFile('zpt/JSONHTML_schema_table', globals())
24 f3811d9a36da start adding checkuploadtable casties parents: 23 diff changeset	108 # JSON_* templates are scripts
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	109 def JSON_index(self):
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	110 """JSON index function"""
51db9e78bf98 working on field types casties parents: 29 diff changeset	111 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	112 json.dump(self.getListOfSchemas(), self.REQUEST.RESPONSE)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	113
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	114 def JSON_schema(self,schema):
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	115 """JSON index function"""
51db9e78bf98 working on field types casties parents: 29 diff changeset	116 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	117 json.dump(self.getListOfTables(schema), self.REQUEST.RESPONSE)
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	118
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	119 def JSON_schema_table(self,schema,table):
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	120 """JSON index function"""
51db9e78bf98 working on field types casties parents: 29 diff changeset	121 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	122 json.dump(self.getTable(schema, table), self.REQUEST.RESPONSE)
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	123
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	124
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	125 def __init__(self, id, title, connection_id=None):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	126 """init"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	127 self.id = id
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	128 self.title = title
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	129 # database connection id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	130 self.connection_id = connection_id
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	131 # create template folder
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	132 self.manage_addFolder('template')
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	133
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	134
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	135 def getRestDbUrl(self):
c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	136 """returns url to the RestDb instance"""
c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	137 return self.absolute_url()
c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	138
22 1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	139 def getJsonString(self,object):
1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	140 """returns a JSON formatted string from object"""
1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	141 return json.dumps(object)
1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	142
17 ed997e639cfd more upload table casties parents: 16 diff changeset	143 def getCursor(self,autocommit=True):
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	144 """returns fresh DB cursor"""
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	145 conn = getattr(self,"_v_database_connection",None)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	146 if conn is None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	147 # create a new connection object
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	148 try:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	149 if self.connection_id is None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	150 # try to take the first existing ID
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	151 connids = SQLConnectionIDs(self)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	152 if len(connids) > 0:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	153 connection_id = connids[0][0]
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	154 self.connection_id = connection_id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	155 logging.debug("connection_id: %s"%repr(connection_id))
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	156
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	157 da = getattr(self, self.connection_id)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	158 da.connect('')
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	159 # we copy the DAs database connection
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	160 conn = da._v_database_connection
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	161 #conn._register() # register with the Zope transaction system
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	162 self._v_database_connection = conn
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	163 except Exception, e:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	164 raise IOError("No database connection! (%s)"%str(e))
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	165
5 7539a9e69365 small fix casties parents: 4 diff changeset	166 cursor = conn.getcursor()
17 ed997e639cfd more upload table casties parents: 16 diff changeset	167 if autocommit:
ed997e639cfd more upload table casties parents: 16 diff changeset	168 # is there a better version to get to the connection?
ed997e639cfd more upload table casties parents: 16 diff changeset	169 cursor.connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
ed997e639cfd more upload table casties parents: 16 diff changeset	170
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	171 return cursor
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	172
55 2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	173 def getFieldNameMap(self,fields):
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	174 """returns a dict mapping field names to row indexes"""
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	175 map = {}
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	176 i = 0
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	177 for f in fields:
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	178 map[f[0]] = i
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	179 i += 1
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	180
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	181 return map
2f4c427dec44 wrangled kml construction into template and method casties parents: 53 diff changeset	182
17 ed997e639cfd more upload table casties parents: 16 diff changeset	183 def executeSQL(self, query, args=None, hasResult=True, autocommit=True):
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	184 """execute query with args on database and return all results.
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	185 result format: {"fields":fields, "rows":data}"""
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	186 logging.debug("executeSQL query=%s args=%s"%(query,args))
17 ed997e639cfd more upload table casties parents: 16 diff changeset	187 cur = self.getCursor(autocommit=autocommit)
53 f5bfcfa97e7e more JSON store casties parents: 45 diff changeset	188 if args is not None:
f5bfcfa97e7e more JSON store casties parents: 45 diff changeset	189 # make sure args is a list
f5bfcfa97e7e more JSON store casties parents: 45 diff changeset	190 if isinstance(args,basestring):
f5bfcfa97e7e more JSON store casties parents: 45 diff changeset	191 args = (args,)
f5bfcfa97e7e more JSON store casties parents: 45 diff changeset	192
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	193 cur.execute(query, args)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	194 # description of returned fields
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	195 fields = cur.description
17 ed997e639cfd more upload table casties parents: 16 diff changeset	196 if hasResult:
ed997e639cfd more upload table casties parents: 16 diff changeset	197 # get all data in an array
ed997e639cfd more upload table casties parents: 16 diff changeset	198 data = cur.fetchall()
ed997e639cfd more upload table casties parents: 16 diff changeset	199 cur.close()
70 9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	200 logging.debug("fields: %s"%repr(fields))
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	201 logging.debug("rows: %s"%repr(data))
17 ed997e639cfd more upload table casties parents: 16 diff changeset	202 return {"fields":fields, "rows":data}
ed997e639cfd more upload table casties parents: 16 diff changeset	203 else:
ed997e639cfd more upload table casties parents: 16 diff changeset	204 cur.close()
ed997e639cfd more upload table casties parents: 16 diff changeset	205 return None
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	206
60 9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	207 def isAllowed(self,action,schema,table,user=None):
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	208 """returns if the requested action on the table is allowed"""
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	209 if user is None:
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	210 user = self.REQUEST.get('AUTHENTICATED_USER',None)
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	211 logging.debug("isAllowed action=%s schema=%s table=%s user=%s"%(action,schema,table,user))
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	212 # no default policy!
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	213 return True
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	214
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	215
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	216 def publishTraverse(self,request,name):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	217 """change the traversal"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	218 # get stored path
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	219 path = request.get('restdb_path', [])
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	220 logging.debug("publishtraverse: name=%s restdb_path=%s"%(name,path))
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	221
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	222 if name in ("index_html", "PUT"):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	223 # end of traversal
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	224 if request.get("method") == "POST" and request.get("action",None) == "PUT":
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	225 # fake PUT by POST with action=PUT
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	226 name = "PUT"
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	227
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	228 return getattr(self, name)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	229 #TODO: should we check more?
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	230 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	231 # traverse
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	232 if len(path) == 0:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	233 # first segment
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	234 if name == 'db':
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	235 # virtual path -- continue traversing
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	236 path = [name]
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	237 request['restdb_path'] = path
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	238 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	239 # try real path
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	240 tr = DefaultPublishTraverse(self, request)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	241 ob = tr.publishTraverse(request, name)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	242 return ob
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	243 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	244 path.append(name)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	245
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	246 # continue traversing
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	247 return self
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	248
c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	249
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	250 def index_html(self,REQUEST,RESPONSE):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	251 """index method"""
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	252 # ReST path was stored in request
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	253 path = REQUEST.get('restdb_path',[])
36 b915bce65372 added kml url option fknauft parents: 9 diff changeset	254
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	255 # type and format are real parameter
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	256 resultFormat = REQUEST.get('format','HTML').upper()
27 a2e4ca3f1cff NEW - # 12: create table and upload data casties parents: 26 diff changeset	257 queryType = REQUEST.get('type',None)
36 b915bce65372 added kml url option fknauft parents: 9 diff changeset	258
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	259 logging.debug("index_html path=%s resultFormat=%s queryType=%s"%(path,resultFormat,queryType))
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	260
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	261 if queryType is not None:
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	262 # non-empty queryType -- look for template
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	263 pt = getattr(self.template, "%s_%s"%(resultFormat,queryType), None)
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	264 if pt is not None:
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	265 return pt(format=resultFormat,type=queryType,path=path)
8 a9a49f5765c9 reworking templates and schema casties parents: 7 diff changeset	266
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	267 if len(path) == 1:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	268 # list of schemas
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	269 return self.showListOfSchemas(format=resultFormat)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	270 elif len(path) == 2:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	271 # list of tables
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	272 return self.showListOfTables(format=resultFormat,schema=path[1])
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	273 elif len(path) == 3:
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	274 # table
25 cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	275 if REQUEST.get("method") == "POST" and REQUEST.get("create_table_file",None) is not None:
24 f3811d9a36da start adding checkuploadtable casties parents: 23 diff changeset	276 # POST to table to check
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	277 return self.checkTable(format=resultFormat,schema=path[1],table=path[2])
24 f3811d9a36da start adding checkuploadtable casties parents: 23 diff changeset	278 # else show table
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	279 return self.showTable(format=resultFormat,schema=path[1],table=path[2])
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	280
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	281 # don't know what to do
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	282 return str(REQUEST)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	283
12 0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	284 def PUT(self, REQUEST, RESPONSE):
0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	285 """
0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	286 Implement WebDAV/HTTP PUT/FTP put method for this object.
0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	287 """
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	288 logging.debug("RestDbInterface PUT")
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	289 #logging.debug("req=%s"%REQUEST)
12 0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	290 #self.dav__init(REQUEST, RESPONSE)
0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	291 #self.dav__simpleifhandler(REQUEST, RESPONSE)
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	292 # ReST path was stored in request
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	293 path = REQUEST.get('restdb_path',[])
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	294 if len(path) == 3:
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	295 schema = path[1]
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	296 tablename = path[2]
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	297 file = REQUEST.get("create_table_file",None)
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	298 if file is None:
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	299 RESPONSE.setStatus(400)
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	300 return
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	301
30 51db9e78bf98 working on field types casties parents: 29 diff changeset	302 fields = None
51db9e78bf98 working on field types casties parents: 29 diff changeset	303 fieldsStr = REQUEST.get("create_table_fields",None)
51db9e78bf98 working on field types casties parents: 29 diff changeset	304 logging.debug("put with schema=%s table=%s file=%s fields=%s"%(schema,tablename,file,repr(fieldsStr)))
51db9e78bf98 working on field types casties parents: 29 diff changeset	305 if fieldsStr is not None:
51db9e78bf98 working on field types casties parents: 29 diff changeset	306 # unpack fields
51db9e78bf98 working on field types casties parents: 29 diff changeset	307 fields = [{"name":n, "type": t} for (n,t) in [f.split(":") for f in fieldsStr.split(",")]]
31 6d2055f1b4fa more work on types casties parents: 30 diff changeset	308
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	309 ret = self.createTableFromXML(schema, tablename, file, fields)
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	310 # return the result as JSON
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	311 format = REQUEST.get("format","JSON")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	312 if format == "JSON":
20 67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	313 RESPONSE.setHeader("Content-Type", "application/json")
67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	314 json.dump(ret, RESPONSE)
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	315
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	316 elif format == "JSONHTML":
20 67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	317 RESPONSE.setHeader("Content-Type", "text/html")
67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	318 RESPONSE.write("<html>\n<body>\n<pre>")
67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	319 json.dump(ret, RESPONSE)
67ca17753cd5 NEW - # 12: create table and upload data casties parents: 18 diff changeset	320 RESPONSE.write("</pre>\n</body>\n</html>")
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	321
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	322 else:
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	323 # 400 Bad Request
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	324 RESPONSE.setStatus(400)
e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	325 return
12 0fa22c291ff1 NEW - # 12: create table and upload data casties parents: 9 diff changeset	326
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	327 def showTable(self,format='XML',schema='public',table=None,REQUEST=None,RESPONSE=None):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	328 """returns PageTemplate with tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	329 logging.debug("showtable")
38 f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	330 if REQUEST is None:
f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	331 REQUEST = self.REQUEST
f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	332
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	333 # should be cross-site accessible
25 cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	334 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	335 RESPONSE = self.REQUEST.RESPONSE
38 f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	336
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	337 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
38 f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	338
22 1a4b56716902 NEW - # 12: create table and upload data casties parents: 21 diff changeset	339 # everything else has its own template
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	340 pt = getattr(self.template, '%s_schema_table'%format, None)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	341 if pt is None:
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	342 return "ERROR!! template %s_schema_table not found"%format
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	343
44 c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	344 #data = self.getTable(schema,table)
c6c47034d2a4 more refactoring of templates casties parents: 43 diff changeset	345 return pt(schema=schema,table=table)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	346
58 5ed0769f5ad3 more cleanup in kml generation casties parents: 55 diff changeset	347 def getTable(self,schema='public',table=None,sortBy=1,username='guest'):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	348 """return table data"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	349 logging.debug("gettable")
58 5ed0769f5ad3 more cleanup in kml generation casties parents: 55 diff changeset	350 if sortBy:
5ed0769f5ad3 more cleanup in kml generation casties parents: 55 diff changeset	351 data = self.executeSQL('select * from "%s"."%s" order by %s'%(schema,table,sortBy))
5ed0769f5ad3 more cleanup in kml generation casties parents: 55 diff changeset	352 else:
5ed0769f5ad3 more cleanup in kml generation casties parents: 55 diff changeset	353 data = self.executeSQL('select * from "%s"."%s"'%(schema,table))
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	354 return data
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	355
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	356 def hasTable(self,schema='public',table=None,username='guest'):
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	357 """return if table exists"""
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	358 logging.debug("hastable")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	359 data = self.executeSQL('select 1 from information_schema.tables where table_schema=%s and table_name=%s',(schema,table))
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	360 ret = bool(data['rows'])
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	361 return ret
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	362
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	363 def showListOfTables(self,format='XML',schema='public',REQUEST=None,RESPONSE=None):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	364 """returns PageTemplate with list of tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	365 logging.debug("showlistoftables")
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	366 # should be cross-site accessible
25 cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	367 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	368 RESPONSE = self.REQUEST.RESPONSE
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	369 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
24 f3811d9a36da start adding checkuploadtable casties parents: 23 diff changeset	370
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	371 pt = getattr(self.template, '%s_schema'%format, None)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	372 if pt is None:
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	373 return "ERROR!! template %s_schema not found"%format
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	374
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	375 #data = self.getListOfTables(schema)
ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	376 return pt(schema=schema)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	377
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	378 def getListOfTables(self,schema='public',username='guest'):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	379 """return list of tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	380 logging.debug("getlistoftables")
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	381 # get list of fields and types of db table
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	382 #qstr="""SELECT c.relname AS tablename FROM pg_catalog.pg_class c
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	383 # LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	384 # WHERE c.relkind IN ('r','') AND n.nspname NOT IN ('pg_catalog', 'pg_toast')
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	385 # AND pg_catalog.pg_table_is_visible(c.oid)
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	386 # AND c.relname ORDER BY 1"""
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	387 qstr = """SELECT table_name FROM information_schema.tables WHERE table_type = 'BASE TABLE'
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	388 AND table_schema = %s ORDER BY 1"""
e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	389 data=self.executeSQL(qstr,(schema,))
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	390 return data
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	391
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	392 def showListOfSchemas(self,format='XML',REQUEST=None,RESPONSE=None):
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	393 """returns PageTemplate with list of schemas"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	394 logging.debug("showlistofschemas")
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	395 # should be cross-site accessible
25 cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	396 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request casties parents: 24 diff changeset	397 RESPONSE = self.REQUEST.RESPONSE
23 860ec92f99df added cross-site access header (for GET) casties parents: 22 diff changeset	398 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
24 f3811d9a36da start adding checkuploadtable casties parents: 23 diff changeset	399
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	400 pt = getattr(self.template, '%s_index'%format, None)
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	401 if pt is None:
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	402 return "ERROR!! template %s_index not found"%format
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	403
45 ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	404 #data = self.getListOfSchemas()
ed8db63fab4f more refactoring of templates casties parents: 44 diff changeset	405 return pt()
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	406
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	407 def getListOfSchemas(self,username='guest'):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	408 """return list of schemas"""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	409 logging.debug("getlistofschemas")
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	410 # TODO: really look up schemas
9 76ac7a721273 more rework of templates casties parents: 8 diff changeset	411 data={'fields': (('schemas',),), 'rows': [('public',),]}
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	412 return data
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	413
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	414 def checkTable(self,format,schema,table,REQUEST=None,RESPONSE=None):
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	415 """check the table.
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	416 returns valid data fields and table name."""
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	417 if REQUEST is None:
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	418 REQUEST = self.REQUEST
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	419 RESPONSE = REQUEST.RESPONSE
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	420
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	421 file = REQUEST.get("create_table_file",None)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	422 res = self.checkTableFromXML(schema, table, file)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	423 logging.debug("checkTable result=%s"%repr(res))
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	424 # return the result as JSON
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	425 if format == "JSON":
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	426 RESPONSE.setHeader("Content-Type", "application/json")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	427 json.dump(res, RESPONSE)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	428
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	429 elif format == "JSONHTML":
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	430 RESPONSE.setHeader("Content-Type", "text/html")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	431 RESPONSE.write("<html>\n<body>\n<pre>")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	432 json.dump(res, RESPONSE)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	433 RESPONSE.write("</pre>\n</body>\n</html>")
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	434
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	435 else:
61 e81d034b28a5 more permission handling and table metadata casties parents: 60 diff changeset	436 return "ERROR: invalid format"
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	437
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	438 def checkTableFromXML(self,schema,table,data,REQUEST=None,RESPONSE=None):
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	439 """check the table with the given XML data.
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	440 returns valid data fields and table name."""
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	441 logging.debug("checkTableFromXML schema=%s table=%s"%(schema,table))
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	442 # clean table name
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	443 tablename = sqlName(table)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	444 tableExists = self.hasTable(schema, table)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	445 if data is None:
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	446 fieldNames = []
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	447 else:
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	448 # get list of field names from upload file
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	449 fields = self.importExcelXML(schema,tablename,data,fieldsOnly=True)
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	450
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	451 res = {'tablename': tablename, 'table_exists': tableExists}
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	452 res['fields'] = fields
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	453 return res
2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	454
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	455 def createEmptyTable(self,schema,table,fields):
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	456 """create a table with the given fields
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	457 returns list of created fields"""
15 5e3edf980813 more work on xml import casties parents: 14 diff changeset	458 logging.debug("createEmptyTable")
60 9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	459
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	460 sqlFields = []
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	461 for f in fields:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	462 if isinstance(f,dict):
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	463 # {name: XX, type: YY}
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	464 name = sqlName(f['name'])
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	465 type = f['type']
70 9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	466 if hasattr(self, 'toSqlTypeMap'):
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	467 sqltype = self.toSqlTypeMap[type]
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	468 else:
9ec7e32e8ad3 working on maps casties parents: 61 diff changeset	469 sqltype = 'text'
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	470
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	471 else:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	472 # name only
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	473 name = sqlName(f)
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	474 type = 'text'
31 6d2055f1b4fa more work on types casties parents: 30 diff changeset	475 sqltype = 'text'
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	476
31 6d2055f1b4fa more work on types casties parents: 30 diff changeset	477 sqlFields.append({'name':name, 'type':type, 'sqltype':sqltype})
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	478
60 9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	479 if self.hasTable(schema,table):
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	480 # TODO: find owner
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	481 if not self.isAllowed("update", schema, table):
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	482 raise Unauthorized
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	483 self.executeSQL('drop table "%s"."%s"'%(schema,table),hasResult=False)
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	484 else:
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	485 if not self.isAllowed("create", schema, table):
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	486 raise Unauthorized
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	487
43 562717546168 refactoring... casties parents: 41 diff changeset	488 fieldString = ", ".join(['"%s" %s'%(f['name'],f['sqltype']) for f in sqlFields])
562717546168 refactoring... casties parents: 41 diff changeset	489 sqlString = 'create table "%s"."%s" (%s)'%(schema,table,fieldString)
562717546168 refactoring... casties parents: 41 diff changeset	490 logging.debug("createemptytable: SQL=%s"%sqlString)
562717546168 refactoring... casties parents: 41 diff changeset	491 self.executeSQL(sqlString,hasResult=False)
562717546168 refactoring... casties parents: 41 diff changeset	492 self.setTableMetaTypes(schema,table,sqlFields)
562717546168 refactoring... casties parents: 41 diff changeset	493 return sqlFields
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	494
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	495 def createTableFromXML(self,schema,table,data, fields=None):
13 e2c73c077533 NEW - # 12: create table and upload data casties parents: 12 diff changeset	496 """create or replace a table with the given XML data"""
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	497 logging.debug("createTableFromXML schema=%s table=%s data=%s fields=%s"%(schema,table,data,fields))
17 ed997e639cfd more upload table casties parents: 16 diff changeset	498 tablename = sqlName(table)
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	499 self.importExcelXML(schema, tablename, data, fields)
17 ed997e639cfd more upload table casties parents: 16 diff changeset	500 return {"tablename": tablename}
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	501
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	502 def importExcelXML(self,schema,table,xmldata,fields=None,fieldsOnly=False):
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	503 '''
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	504 Import XML file in Excel format into the table
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	505 @param table: name of the table the xml shall be imported into
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	506 '''
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	507 from xml.dom.pulldom import parseString,parse
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	508
60 9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	509 if not (fieldsOnly or self.isAllowed("create", schema, table)):
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	510 raise Unauthorized
9fdadb60529f working on authentication and authorization casties parents: 58 diff changeset	511
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	512 namespace = "urn:schemas-microsoft-com:office:spreadsheet"
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	513 containerTagName = "Table"
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	514 rowTagName = "Row"
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	515 colTagName = "Cell"
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	516 dataTagName = "Data"
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	517 xmlFields = []
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	518 sqlFields = []
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	519 numFields = 0
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	520 sqlInsert = None
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	521
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	522 logging.debug("import excel xml")
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	523
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	524 ret=""
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	525 if isinstance(xmldata, str):
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	526 logging.debug("importXML reading string data")
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	527 doc=parseString(xmldata)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	528 else:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	529 logging.debug("importXML reading file data")
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	530 doc=parse(xmldata)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	531
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	532 cnt = 0
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	533 while True:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	534 node=doc.getEvent()
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	535
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	536 if node is None:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	537 break
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	538
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	539 else:
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	540 #logging.debug("tag=%s"%node[1].localName)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	541 if node[1].localName is not None:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	542 tagName = node[1].localName.lower()
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	543 else:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	544 # ignore non-tag nodes
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	545 continue
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	546
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	547 if tagName == rowTagName.lower():
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	548 # start of row
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	549 doc.expandNode(node[1])
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	550 cnt += 1
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	551 if cnt == 1:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	552 # first row -- field names
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	553 names=node[1].getElementsByTagNameNS(namespace, dataTagName)
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	554 for name in names:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	555 fn = getTextFromNode(name)
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	556 xmlFields.append({'name':sqlName(fn),'type':'text'})
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	557
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	558 if fieldsOnly:
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	559 # return just field names
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	560 return xmlFields
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	561
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	562 # create table
28 9e4f9cfd1edc start adding field structure to xml upload casties parents: 27 diff changeset	563 if fields is None:
31 6d2055f1b4fa more work on types casties parents: 30 diff changeset	564 fields = xmlFields
6d2055f1b4fa more work on types casties parents: 30 diff changeset	565
6d2055f1b4fa more work on types casties parents: 30 diff changeset	566 sqlFields = self.createEmptyTable(schema, table, fields)
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	567 numFields = len(sqlFields)
15 5e3edf980813 more work on xml import casties parents: 14 diff changeset	568 fieldString = ", ".join(['"%s"'%f['name'] for f in sqlFields])
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	569 valString = ", ".join(["%s" for f in sqlFields])
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	570 sqlInsert = 'insert into "%s"."%s" (%s) values (%s)'%(schema,table,fieldString,valString)
26 2b73f868d34f NEW - # 12: create table and upload data casties parents: 25 diff changeset	571 #logging.debug("importexcelsql: sqlInsert=%s"%sqlInsert)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	572
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	573 else:
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	574 # following rows are data
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	575 colNodes=node[1].getElementsByTagNameNS(namespace, colTagName)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	576 data = []
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	577 hasData = False
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	578 for colNode in colNodes:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	579 dataNodes=colNode.getElementsByTagNameNS(namespace, dataTagName)
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	580 if len(dataNodes) > 0:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	581 val = getTextFromNode(dataNodes[0])
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	582 hasData = True
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	583 else:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	584 val = None
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	585
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	586 data.append(val)
05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	587
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	588 if not hasData:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	589 # ignore empty rows
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	590 continue
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	591
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	592 # fix number of data fields
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	593 if len(data) > numFields:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	594 del data[numFields:]
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	595 elif len(data) < numFields:
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	596 missFields = numFields - len(data)
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	597 data.extend(missFields * [None,])
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	598
cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	599 logging.debug("importexcel sqlinsert=%s data=%s"%(sqlInsert,data))
17 ed997e639cfd more upload table casties parents: 16 diff changeset	600 self.executeSQL(sqlInsert, data, hasResult=False)
14 05933707897f NEW - # 12: create table and upload data casties parents: 13 diff changeset	601
16 cbb73d103152 NEW - # 12: create table and upload data casties parents: 15 diff changeset	602 return cnt
38 f6d9a3caf986 fixed errors from merging casties parents: 37 diff changeset	603
4 e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	604 def manage_editRestDbInterface(self, title=None, connection_id=None,
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	605 REQUEST=None):
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	606 """Change the object"""
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	607 if title is not None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	608 self.title = title
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	609
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	610 if connection_id is not None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	611 self.connection_id = connection_id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	612
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	613 #checkPermission=getSecurityManager().checkPermission
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	614 REQUEST.RESPONSE.redirect('manage_main')
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly. casties parents: 2 diff changeset	615
2 61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	616
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	617 manage_addRestDbInterfaceForm=PageTemplateFile('zpt/addRestDbInterface',globals())
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	618
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	619 def manage_addRestDbInterface(self, id, title='', label='', description='',
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	620 createPublic=0,
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	621 createUserF=0,
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	622 REQUEST=None):
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	623 """Add a new object with id id."""
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	624
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	625 ob=RestDbInterface(str(id),title)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	626 self._setObject(id, ob)
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	627
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	628 #checkPermission=getSecurityManager().checkPermission
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	629 REQUEST.RESPONSE.redirect('manage_main')
61a3764cd5fb new version RestDbInterface with working traversal and templates casties parents: diff changeset	630
5 7539a9e69365 small fix casties parents: 4 diff changeset	631

Mercurial > hg > ChinaGisRestApi

annotate RestDbInterface.py @ 70:9ec7e32e8ad3