annotate RestDbInterface.py @ 33:355b1fa2d78f

added meta permissions check
author casties
date Tue, 31 Aug 2010 14:20:24 +0200
parents c732c2ff61d9
children c237699c4752
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
9 from Products.ZSQLExtend import ZSQLExtend
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
10 import logging
15
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
11 import re
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
12 import psycopg2
18
060797795a4d work on json return values
casties
parents: 17
diff changeset
13 import json
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
14 import time
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
15
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
16 from zope.interface import implements
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
17 from zope.publisher.interfaces import IPublishTraverse
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
18 from ZPublisher.BaseRequest import DefaultPublishTraverse
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
19 #from zope.publisher.interfaces import NotFound
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
20 #from zope.app import zapi
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
21 #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
22 import Shared.DC.ZRDB.DA
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
23 from Products.ZSQLMethods.SQL import SQLConnectionIDs
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
24
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
25
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
26 def getTextFromNode(node):
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
27 """get the cdata content of a XML node"""
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
28 if node is None:
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
29 return ""
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
30
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
31 if isinstance(node, list):
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
32 nodelist = node
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
33 else:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
34 nodelist=node.childNodes
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
35
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
36 rc = ""
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
37 for node in nodelist:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
38 if node.nodeType == node.TEXT_NODE:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
39 rc = rc + node.data
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
40 return rc
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
41
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
42 def sqlName(s,lc=True):
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
43 """returns restricted ASCII-only version of string"""
15
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
44 if s is None:
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
45 return ""
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
46
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
47 # all else -> "_"
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
48 s = re.sub(r'[^A-Za-z0-9_]','_',s)
15
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
49 if lc:
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
50 return s.lower()
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
51
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
52 return s
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
53
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
54 gisToSqlTypeMap = {
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
55 "text": "text",
32
c732c2ff61d9 fixed sql data types
casties
parents: 31
diff changeset
56 "number": "numeric",
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
57 "id": "text",
32
c732c2ff61d9 fixed sql data types
casties
parents: 31
diff changeset
58 "gis_id": "text",
c732c2ff61d9 fixed sql data types
casties
parents: 31
diff changeset
59 "coord_lat": "numeric",
c732c2ff61d9 fixed sql data types
casties
parents: 31
diff changeset
60 "coord_lon": "numeric"
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
61 }
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
62
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
63 class RestDbInterface(Folder):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
64 """Object for RESTful database queries
7
bd52d9445a41 trying to rework
casties
parents: 5
diff changeset
65 path schema: /db/{schema}/{table}/
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
66 omitting table gives a list of schemas
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
67 omitting table and schema gives a list of schemas
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
68 """
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
69 implements(IPublishTraverse)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
70
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
71 meta_type="RESTdb"
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
72 manage_options=Folder.manage_options+(
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
73 {'label':'Config','action':'manage_editRestDbInterfaceForm'},
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
74 )
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
75
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
76 # management templates
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
77 manage_editRestDbInterfaceForm=PageTemplateFile('zpt/editRestDbInterface',globals())
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
78
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
79 # data templates
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
80 XML_index = PageTemplateFile('zpt/XML_index', globals())
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
81 XML_schema = PageTemplateFile('zpt/XML_schema', globals())
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
82 XML_schema_table = PageTemplateFile('zpt/XML_schema_table', globals())
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
83 HTML_index = PageTemplateFile('zpt/HTML_index', globals())
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
84 HTML_schema = PageTemplateFile('zpt/HTML_schema', globals())
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
85 HTML_schema_table = PageTemplateFile('zpt/HTML_schema_table', globals())
22
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
86 JSONHTML_index = PageTemplateFile('zpt/JSONHTML_index', globals())
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
87 JSONHTML_schema = PageTemplateFile('zpt/JSONHTML_schema', globals())
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
88 JSONHTML_schema_table = PageTemplateFile('zpt/JSONHTML_schema_table', globals())
24
f3811d9a36da start adding checkuploadtable
casties
parents: 23
diff changeset
89 # JSON_* templates are scripts
30
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
90 def JSON_index(self,data):
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
91 """JSON index function"""
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
92 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
93 json.dump(data, self.REQUEST.RESPONSE)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
94
30
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
95 def JSON_schema(self,data,schema):
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
96 """JSON index function"""
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
97 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
98 json.dump(data, self.REQUEST.RESPONSE)
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
99
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
100 def JSON_schema_table(self,data,tablename):
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
101 """JSON index function"""
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
102 self.REQUEST.RESPONSE.setHeader("Content-Type", "application/json")
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
103 json.dump(data, self.REQUEST.RESPONSE)
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
104
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
105
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
106 def __init__(self, id, title, connection_id=None):
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
107 """init"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
108 self.id = id
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
109 self.title = title
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
110 # database connection id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
111 self.connection_id = connection_id
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
112 # create template folder
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
113 self.manage_addFolder('template')
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
114
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
115
22
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
116 def getJsonString(self,object):
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
117 """returns a JSON formatted string from object"""
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
118 return json.dumps(object)
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
119
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
120 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
121 """returns fresh DB cursor"""
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
122 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
123 if conn is None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
124 # create a new connection object
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
125 try:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
126 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
127 # 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
128 connids = SQLConnectionIDs(self)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
129 if len(connids) > 0:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
130 connection_id = connids[0][0]
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
131 self.connection_id = connection_id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
132 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
133
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
134 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
135 da.connect('')
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
136 # 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
137 conn = da._v_database_connection
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
138 #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
139 self._v_database_connection = conn
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
140 except Exception, e:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
141 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
142
5
7539a9e69365 small fix
casties
parents: 4
diff changeset
143 cursor = conn.getcursor()
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
144 if autocommit:
ed997e639cfd more upload table
casties
parents: 16
diff changeset
145 # is there a better version to get to the connection?
ed997e639cfd more upload table
casties
parents: 16
diff changeset
146 cursor.connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
ed997e639cfd more upload table
casties
parents: 16
diff changeset
147
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
148 return cursor
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
149
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
150 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
151 """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
152 result format: {"fields":fields, "rows":data}"""
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
153 logging.debug("executeSQL query=%s args=%s"%(query,args))
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
154 cur = self.getCursor(autocommit=autocommit)
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
155 cur.execute(query, args)
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
156 # description of returned fields
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
157 fields = cur.description
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
158 if hasResult:
ed997e639cfd more upload table
casties
parents: 16
diff changeset
159 # get all data in an array
ed997e639cfd more upload table
casties
parents: 16
diff changeset
160 data = cur.fetchall()
ed997e639cfd more upload table
casties
parents: 16
diff changeset
161 cur.close()
ed997e639cfd more upload table
casties
parents: 16
diff changeset
162 return {"fields":fields, "rows":data}
ed997e639cfd more upload table
casties
parents: 16
diff changeset
163 else:
ed997e639cfd more upload table
casties
parents: 16
diff changeset
164 cur.close()
ed997e639cfd more upload table
casties
parents: 16
diff changeset
165 return None
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
166
33
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
167 def checkTableMetaPermission(self,action,schema,table,user=None):
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
168 """returns if the requested action on the table is allowed"""
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
169 logging.debug("checktablemetapermissions action=%s schema=%s table=%s user=%s"%(action,schema,table,user))
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
170 if user is None:
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
171 user = self.REQUEST.get('AUTHENTICATED_USER',None)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
172 logging.debug("user=%s"%user)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
173 # TODO: what now?
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
174 return True
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
175
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
176 def setTableMetaTypes(self,schema,table,fields):
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
177 """sets the GIS meta information for table"""
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
178 logging.debug("settablemetatypes schema=%s, table=%s, fields=%s"%(schema,table,fields))
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
179 # TODO: what now?
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
180
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
181 def publishTraverse(self,request,name):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
182 """change the traversal"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
183 # get stored path
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
184 path = request.get('restdb_path', [])
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
185 logging.debug("publishtraverse: name=%s restdb_path=%s"%(name,path))
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
186
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
187 if name in ("index_html", "PUT"):
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
188 # end of traversal
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
189 if request.get("method") == "POST" and request.get("action",None) == "PUT":
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
190 # fake PUT by POST with action=PUT
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
191 name = "PUT"
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
192
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
193 return getattr(self, name)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
194 #TODO: should we check more?
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
195 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
196 # traverse
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
197 if len(path) == 0:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
198 # first segment
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
199 if name == 'db':
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
200 # virtual path -- continue traversing
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
201 path = [name]
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
202 request['restdb_path'] = path
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
203 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
204 # try real path
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
205 tr = DefaultPublishTraverse(self, request)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
206 ob = tr.publishTraverse(request, name)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
207 return ob
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
208 else:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
209 path.append(name)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
210
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
211 # continue traversing
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
212 return self
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
213
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
214 def index_html(self,REQUEST,RESPONSE):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
215 """index method"""
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
216 # ReST path was stored in request
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
217 path = REQUEST.get('restdb_path',[])
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
218
27
a2e4ca3f1cff NEW - # 12: create table and upload data
casties
parents: 26
diff changeset
219 # type and format are real parameter
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
220 resultFormat = REQUEST.get('format','HTML').upper()
27
a2e4ca3f1cff NEW - # 12: create table and upload data
casties
parents: 26
diff changeset
221 queryType = REQUEST.get('type',None)
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
222
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
223 logging.debug("index_html path=%s resultFormat=%s queryType=%s"%(path,resultFormat,queryType))
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
224
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
225 if queryType is not None:
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
226 # non-empty queryType -- look for template
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
227 pt = getattr(self.template, "%s_%s"%(resultFormat,queryType), None)
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
228 if pt is not None:
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
229 return pt(format=resultFormat,type=queryType,path=path)
8
a9a49f5765c9 reworking templates and schema
casties
parents: 7
diff changeset
230
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
231 if len(path) == 1:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
232 # list of schemas
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
233 return self.showListOfSchemas(resultFormat=resultFormat)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
234 elif len(path) == 2:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
235 # list of tables
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
236 return self.showListOfTables(resultFormat=resultFormat,schema=path[1])
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
237 elif len(path) == 3:
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
238 # table
25
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
239 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
240 # POST to table to check
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
241 return self.checkTable(resultFormat=resultFormat,schema=path[1],table=path[2])
24
f3811d9a36da start adding checkuploadtable
casties
parents: 23
diff changeset
242 # else show table
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
243 return self.showTable(resultFormat=resultFormat,schema=path[1],table=path[2])
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
244
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
245 # don't know what to do
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
246 return str(REQUEST)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
247
12
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
248 def PUT(self, REQUEST, RESPONSE):
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
249 """
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
250 Implement WebDAV/HTTP PUT/FTP put method for this object.
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
251 """
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
252 logging.debug("RestDbInterface PUT")
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
253 #logging.debug("req=%s"%REQUEST)
12
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
254 #self.dav__init(REQUEST, RESPONSE)
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
255 #self.dav__simpleifhandler(REQUEST, RESPONSE)
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
256 # ReST path was stored in request
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
257 path = REQUEST.get('restdb_path',[])
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
258 if len(path) == 3:
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
259 schema = path[1]
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
260 tablename = path[2]
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
261 file = REQUEST.get("create_table_file",None)
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
262 if file is None:
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
263 RESPONSE.setStatus(400)
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
264 return
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
265
30
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
266 fields = None
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
267 fieldsStr = REQUEST.get("create_table_fields",None)
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
268 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
269 if fieldsStr is not None:
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
270 # unpack fields
51db9e78bf98 working on field types
casties
parents: 29
diff changeset
271 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
272
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
273 ret = self.createTableFromXML(schema, tablename, file, fields)
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
274 # return the result as JSON
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
275 format = REQUEST.get("format","JSON")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
276 if format == "JSON":
20
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
277 RESPONSE.setHeader("Content-Type", "application/json")
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
278 json.dump(ret, RESPONSE)
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
279
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
280 elif format == "JSONHTML":
20
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
281 RESPONSE.setHeader("Content-Type", "text/html")
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
282 RESPONSE.write("<html>\n<body>\n<pre>")
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
283 json.dump(ret, RESPONSE)
67ca17753cd5 NEW - # 12: create table and upload data
casties
parents: 18
diff changeset
284 RESPONSE.write("</pre>\n</body>\n</html>")
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
285
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
286 else:
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
287 # 400 Bad Request
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
288 RESPONSE.setStatus(400)
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
289 return
12
0fa22c291ff1 NEW - # 12: create table and upload data
casties
parents: 9
diff changeset
290
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
291 def showTable(self,resultFormat='XML',schema='public',table=None,REQUEST=None,RESPONSE=None):
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
292 """returns PageTemplate with tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
293 logging.debug("showtable")
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
294 # should be cross-site accessible
25
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
295 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
296 RESPONSE = self.REQUEST.RESPONSE
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
297 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
22
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
298 # GIS gets special treatment
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
299 if resultFormat=="GIS":
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
300 id = REQUEST.get('id',[])
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
301 doc = REQUEST.get('doc',None)
22
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
302 return self.showGoogleMap(schema=path[1],table=path[2],id=id,doc=doc)
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
303
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
304 # everything else has its own template
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
305 pt = getattr(self.template, '%s_schema_table'%resultFormat, None)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
306 if pt is None:
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
307 return "ERROR!! template %s_schema_table not found"%resultFormat
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
308
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
309 data = self.getTable(schema,table)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
310 return pt(data=data,tablename=table)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
311
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
312 def getTable(self,schema='public',table=None,username='guest'):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
313 """return table data"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
314 logging.debug("gettable")
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
315 data = self.executeSQL('select * from "%s"."%s"'%(schema,table))
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
316 return data
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
317
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
318 def hasTable(self,schema='public',table=None,username='guest'):
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
319 """return if table exists"""
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
320 logging.debug("hastable")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
321 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
322 ret = bool(data['rows'])
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
323 return ret
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
324
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
325 def showListOfTables(self,resultFormat='XML',schema='public',REQUEST=None,RESPONSE=None):
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
326 """returns PageTemplate with list of tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
327 logging.debug("showlistoftables")
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
328 # should be cross-site accessible
25
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
329 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
330 RESPONSE = self.REQUEST.RESPONSE
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
331 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
24
f3811d9a36da start adding checkuploadtable
casties
parents: 23
diff changeset
332
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
333 pt = getattr(self.template, '%s_schema'%resultFormat, None)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
334 if pt is None:
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
335 return "ERROR!! template %s_schema not found"%resultFormat
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
336
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
337 data = self.getListOfTables(schema)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
338 return pt(data=data,schema=schema)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
339
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
340 def getListOfTables(self,schema='public',username='guest'):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
341 """return list of tables"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
342 logging.debug("getlistoftables")
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
343 # get list of fields and types of db table
22
1a4b56716902 NEW - # 12: create table and upload data
casties
parents: 21
diff changeset
344 qstr="""SELECT c.relname AS tablename FROM pg_catalog.pg_class c
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
345 LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
346 WHERE c.relkind IN ('r','') AND n.nspname NOT IN ('pg_catalog', 'pg_toast')
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
347 AND pg_catalog.pg_table_is_visible(c.oid)"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
348 #qstr="select attname, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) from pg_attribute, pg_class where attrelid = pg_class.oid and pg_attribute.attnum > 0"
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
349 data=self.executeSQL(qstr)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
350 return data
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
351
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
352 def showListOfSchemas(self,resultFormat='XML',REQUEST=None,RESPONSE=None):
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
353 """returns PageTemplate with list of schemas"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
354 logging.debug("showlistofschemas")
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
355 # should be cross-site accessible
25
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
356 if RESPONSE is None:
cef1bfa821cb fixed problem with not passing request
casties
parents: 24
diff changeset
357 RESPONSE = self.REQUEST.RESPONSE
23
860ec92f99df added cross-site access header (for GET)
casties
parents: 22
diff changeset
358 RESPONSE.setHeader('Access-Control-Allow-Origin', '*')
24
f3811d9a36da start adding checkuploadtable
casties
parents: 23
diff changeset
359
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
360 pt = getattr(self.template, '%s_index'%resultFormat, None)
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
361 if pt is None:
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
362 return "ERROR!! template %s_index not found"%resultFormat
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
363
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
364 data = self.getListOfSchemas()
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
365 return pt(data=data)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
366
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
367 def getListOfSchemas(self,username='guest'):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
368 """return list of schemas"""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
369 logging.debug("getlistofschemas")
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
370 # TODO: really look up schemas
9
76ac7a721273 more rework of templates
casties
parents: 8
diff changeset
371 data={'fields': (('schemas',),), 'rows': [('public',),]}
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
372 return data
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
373
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
374 def checkTable(self,resultFormat,schema,table,REQUEST=None,RESPONSE=None):
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
375 """check the table.
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
376 returns valid data fields and table name."""
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
377 if REQUEST is None:
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
378 REQUEST = self.REQUEST
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
379 RESPONSE = REQUEST.RESPONSE
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
380
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
381 file = REQUEST.get("create_table_file",None)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
382 res = self.checkTableFromXML(schema, table, file)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
383 logging.debug("checkTable result=%s"%repr(res))
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
384 # return the result as JSON
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
385 if resultFormat == "JSON":
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
386 RESPONSE.setHeader("Content-Type", "application/json")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
387 json.dump(res, RESPONSE)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
388
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
389 elif resultFormat == "JSONHTML":
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
390 RESPONSE.setHeader("Content-Type", "text/html")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
391 RESPONSE.write("<html>\n<body>\n<pre>")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
392 json.dump(res, RESPONSE)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
393 RESPONSE.write("</pre>\n</body>\n</html>")
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
394
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
395 else:
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
396 return "ERROR: invalid resultFormat"
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
397
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
398 def checkTableFromXML(self,schema,table,data,REQUEST=None,RESPONSE=None):
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
399 """check the table with the given XML data.
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
400 returns valid data fields and table name."""
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
401 logging.debug("checkTableFromXML schema=%s table=%s"%(schema,table))
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
402 # clean table name
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
403 tablename = sqlName(table)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
404 tableExists = self.hasTable(schema, table)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
405 if data is None:
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
406 fieldNames = []
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
407 else:
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
408 # get list of field names from upload file
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
409 fields = self.importExcelXML(schema,tablename,data,fieldsOnly=True)
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
410
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
411 res = {'tablename': tablename, 'table_exists': tableExists}
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
412 res['fields'] = fields
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
413 return res
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
414
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
415 def createEmptyTable(self,schema,table,fields):
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
416 """create a table with the given fields
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
417 returns list of created fields"""
15
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
418 logging.debug("createEmptyTable")
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
419 sqlFields = []
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
420 for f in fields:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
421 if isinstance(f,dict):
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
422 # {name: XX, type: YY}
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
423 name = sqlName(f['name'])
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
424 type = f['type']
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
425 sqltype = gisToSqlTypeMap[type]
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
426
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
427 else:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
428 # name only
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
429 name = sqlName(f)
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
430 type = 'text'
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
431 sqltype = 'text'
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
432
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
433 sqlFields.append({'name':name, 'type':type, 'sqltype':sqltype})
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
434
33
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
435 if self.checkTableMetaPermission("create", schema, table):
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
436 self.executeSQL('drop table if exists "%s"."%s"'%(schema,table),hasResult=False)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
437 fieldString = ", ".join(['"%s" %s'%(f['name'],f['sqltype']) for f in sqlFields])
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
438 sqlString = 'create table "%s"."%s" (%s)'%(schema,table,fieldString)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
439 logging.debug("createemptytable: SQL=%s"%sqlString)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
440 self.executeSQL(sqlString,hasResult=False)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
441 self.setTableMetaTypes(schema,table,sqlFields)
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
442 return sqlFields
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
443 else:
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
444 logging.warning("create table not allowed!")
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
445 # throw exception?
355b1fa2d78f added meta permissions check
casties
parents: 32
diff changeset
446 return None
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
447
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
448 def createTableFromXML(self,schema,table,data, fields=None):
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
449 """create or replace a table with the given XML data"""
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
450 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
451 tablename = sqlName(table)
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
452 self.importExcelXML(schema, tablename, data, fields)
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
453 return {"tablename": tablename}
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
454
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
455 def importExcelXML(self,schema,table,xmldata,fields=None,fieldsOnly=False):
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
456 '''
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
457 Import XML file in Excel format into the table
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
458 @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
459 '''
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
460 from xml.dom.pulldom import parseString,parse
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
461
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
462 namespace = "urn:schemas-microsoft-com:office:spreadsheet"
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
463 containerTagName = "Table"
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
464 rowTagName = "Row"
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
465 colTagName = "Cell"
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
466 dataTagName = "Data"
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
467 xmlFields = []
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
468 sqlFields = []
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
469 numFields = 0
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
470 sqlInsert = None
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
471
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
472 logging.debug("import excel xml")
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
473
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
474 ret=""
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
475 if isinstance(xmldata, str):
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
476 logging.debug("importXML reading string data")
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
477 doc=parseString(xmldata)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
478 else:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
479 logging.debug("importXML reading file data")
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
480 doc=parse(xmldata)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
481
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
482 cnt = 0
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
483 while True:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
484 node=doc.getEvent()
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
485
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
486 if node is None:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
487 break
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
488
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
489 else:
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
490 #logging.debug("tag=%s"%node[1].localName)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
491 if node[1].localName is not None:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
492 tagName = node[1].localName.lower()
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
493 else:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
494 # ignore non-tag nodes
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
495 continue
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
496
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
497 if tagName == rowTagName.lower():
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
498 # start of row
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
499 doc.expandNode(node[1])
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
500 cnt += 1
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
501 if cnt == 1:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
502 # first row -- field names
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
503 names=node[1].getElementsByTagNameNS(namespace, dataTagName)
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
504 for name in names:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
505 fn = getTextFromNode(name)
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
506 xmlFields.append({'name':sqlName(fn),'type':'text'})
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
507
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
508 if fieldsOnly:
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
509 # return just field names
26
2b73f868d34f NEW - # 12: create table and upload data
casties
parents: 25
diff changeset
510 return xmlFields
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
511
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
512 # create table
28
9e4f9cfd1edc start adding field structure to xml upload
casties
parents: 27
diff changeset
513 if fields is None:
31
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
514 fields = xmlFields
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
515
6d2055f1b4fa more work on types
casties
parents: 30
diff changeset
516 sqlFields = self.createEmptyTable(schema, table, fields)
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
517 numFields = len(sqlFields)
15
5e3edf980813 more work on xml import
casties
parents: 14
diff changeset
518 fieldString = ", ".join(['"%s"'%f['name'] for f in sqlFields])
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
519 valString = ", ".join(["%s" for f in sqlFields])
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
520 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
521 #logging.debug("importexcelsql: sqlInsert=%s"%sqlInsert)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
522
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
523 else:
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
524 # following rows are data
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
525 colNodes=node[1].getElementsByTagNameNS(namespace, colTagName)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
526 data = []
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
527 hasData = False
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
528 for colNode in colNodes:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
529 dataNodes=colNode.getElementsByTagNameNS(namespace, dataTagName)
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
530 if len(dataNodes) > 0:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
531 val = getTextFromNode(dataNodes[0])
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
532 hasData = True
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
533 else:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
534 val = None
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
535
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
536 data.append(val)
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
537
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
538 if not hasData:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
539 # ignore empty rows
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
540 continue
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
541
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
542 # fix number of data fields
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
543 if len(data) > numFields:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
544 del data[numFields:]
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
545 elif len(data) < numFields:
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
546 missFields = numFields - len(data)
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
547 data.extend(missFields * [None,])
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
548
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
549 logging.debug("importexcel sqlinsert=%s data=%s"%(sqlInsert,data))
17
ed997e639cfd more upload table
casties
parents: 16
diff changeset
550 self.executeSQL(sqlInsert, data, hasResult=False)
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
551
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
552 return cnt
21
a67b7c1f7ec5 Merge with Falks GIS stuff 78e70dfa7ad6b27d10d490f9ae8820306e4fe5d4
casties
parents: 20 19
diff changeset
553
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
554 # Methods for GoogleMaps creation
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
555 def showGoogleMap(self,schema='chgis',table='mpdl',id=[],doc=None):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
556 logging.debug("showGoogleMap")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
557 data = self.getDataForGoogleMap(schema,table,id,doc)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
558 kml=self.getKMLname(data=data,table=table)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
559 googleMap_page=self.htmlHead()+str(self.getGoogleMapString(kml=kml))
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
560 return googleMap_page
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
561
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
562 def getDataForGoogleMap(self,schema='chgis',table='mpdl',id=[],doc=None):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
563 logging.debug("getDataForGoogleMap")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
564 qstr="SELECT * FROM "+schema+"."+table
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
565 try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
566 if id!=[]:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
567 qstr=qstr+" WHERE "
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
568 for id_item in id.split(","):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
569 if table=='mpdl':
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
570 qstr=qstr+" mpdl_xmlsource_id = '"+id_item+ "' OR"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
571 else:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
572 qstr=qstr+" cast(id as text) LIKE '"+id_item+ "' OR"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
573 qstr=str(qstr).rsplit(" ",1)[0] #to remove last " and "
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
574 data=self.ZSQLSimpleSearch(qstr)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
575 return data
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
576 except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
577 return qstr
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
578
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
579 def getKMLname(self,data=[],table=""):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
580 logging.debug("getKMLname")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
581 #session=context.REQUEST.SESSION
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
582 kml4Marker="<kml xmlns=\'http://www.opengis.net/kml/2.2\'><Document><Style id=\'marker_icon\'><IconStyle><scale>15</scale><Icon><href>http://chinagis.mpiwg-berlin.mpg.de/chinagis/images/dot_red.png</href></Icon></IconStyle></Style>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
583 initializeStringForGoogleMaps=""
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
584 #doLine=container.getVar('doLine')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
585 # Mapping a set of points from table-based SQL-query:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
586 if data!=None:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
587 try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
588 SQL="""SELECT \"attribute with gis_id\" FROM public.metadata WHERE tablename LIKE '"""+table+"""'"""
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
589 gisIDattribute=self.ZSQLSimpleSearch(SQL)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
590 except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
591 return "table not registered within metadata"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
592 for dataset in data:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
593 try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
594 xCoord=getattr(dataset,'longitude')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
595 yCoord=getattr(dataset,'latitude')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
596 except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
597 try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
598 xCoord=getattr(dataset,'x_coord')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
599 yCoord=getattr(dataset,'y_coord')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
600 except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
601 # try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
602 gisID=getattr(dataset,getattr(gisIDattribute[0],'attribute with gis_id'))
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
603 coords=self.getPoint4GISid(gisID)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
604 if coords!=None:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
605 xCoord=coords[0]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
606 yCoord=coords[1]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
607 # except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
608 # return "no coordinates found"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
609 if float(xCoord)!=0:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
610 if float(yCoord)!=0:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
611 kml4Marker=kml4Marker+"<Placemark>"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
612 kml4Marker=kml4Marker+"<description> <![CDATA[<b>"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
613 for values in dataset:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
614 if values != (None, None):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
615 if str(values).find('name')>-1:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
616 kml4Marker=kml4Marker+"<name>"+str(values[1])+"</name>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
617 continue
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
618 elif str(values).find('place')>-1:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
619 kml4Marker=kml4Marker+"<name>"+str(values[1])+"</name>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
620 continue
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
621
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
622 kml4Marker=kml4Marker+str(values)+": "
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
623 attribute_string=str(values).replace("'","__Apostroph__")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
624 attribute_string=str(attribute_string).replace('"','__DoubleApostroph__')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
625 attribute_string=str(attribute_string).replace(';','__$$__')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
626 attribute_string=str(attribute_string).replace('&','&amp;')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
627 if str(attribute_string).find('http')>-1:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
628 attribute_string='<A HREF=' + str(attribute_string) + ' target=_blank>' + str(attribute_string) + '</A>'
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
629 kml4Marker=kml4Marker+attribute_string+"</a><br>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
630
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
631 kml4Marker=kml4Marker+"]]></description>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
632 kml4Marker=kml4Marker+"<styleURL>#marker_icon</styleURL>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
633 kml4Marker=kml4Marker+"<Point>"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
634
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
635 kml4Marker=kml4Marker+"<coordinates>"+str(xCoord)+","+str(yCoord)+",0</coordinates>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
636 kml4Marker=kml4Marker+"</Point>\n"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
637 kml4Marker=kml4Marker+"</Placemark>\n"
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
638
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
639 kml4Marker=kml4Marker+"</Document>\n</kml>"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
640 kmlFileName="marker"+str(time.time())+".kml"
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
641
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
642 # kml4Marker=str(kml4Marker).replace('&','$$')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
643 # kml4Marker=str(kml4Marker).replace(';','__$$__')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
644 # kml4Marker=str(kml4Marker).replace('#','__SHARP__')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
645 initializeStringForGoogleMaps="""onload=\"initialize(\'http://chinagis.mpiwg-berlin.mpg.de/chinagis/REST/daten/"""+kmlFileName+"""\')\""""#+str(data)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
646 initializeStringForGoogleMaps=initializeStringForGoogleMaps.replace("None","0")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
647 isLoadReady='false'
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
648 while isLoadReady=='false':
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
649 isLoadReady=self.RESTwrite2File(self.daten,kmlFileName,kml4Marker)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
650
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
651 return initializeStringForGoogleMaps
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
652
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
653 def getGoogleMapString(self,kml):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
654 logging.debug("getGoogleMapString")
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
655 printed= '<body %s> '%kml +"""\n <div id="map_canvas" style="width: 98%; height: 95%"> </div> \n </body>" \n </html>"""
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
656 return printed
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
657
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
658 def getPoint4GISid(self,gis_id):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
659 j=0
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
660 while (True):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
661 j=j+1
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
662 if (j>100): # FJK: just to prevent endless loops
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
663 break
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
664 if (gis_id.isdigit()): # FJK: regular exit from while-loop
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
665 break
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
666 else:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
667 gis_id=gis_id.strip('abcdefghijklmnopqrstuvwxyz_') # FJK: to strip all letters
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
668 gis_id=gis_id.strip() # FJK: to strip all whitespaces
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
669 resultpoint = [0,0]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
670 results = None
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
671 try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
672 if int(gis_id)>0:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
673 SQL="SELECT x_coord,y_coord FROM chgis.chgis_coords WHERE gis_id LIKE cast("+ str(gis_id) +" as text);"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
674 results=self.ZSQLSimpleSearch(SQL)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
675 #print results
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
676 if results != None:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
677 for result in results:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
678 resultpoint=[getattr(result,str('x_coord')),getattr(result,str('y_coord'))]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
679 if resultpoint !=[0,0]:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
680 return resultpoint
14
05933707897f NEW - # 12: create table and upload data
casties
parents: 13
diff changeset
681 else:
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
682 coords=self.getCoordsFromREST_gisID(joinid)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
683 SQL="INSERT INTO chgis.chgis_coords (gis_id,x_coord,y_coord) VALUES (" +gis_id+ "," +coords[0][1]+ "," +coords[0][0]+ "); ANALYZE chgis.chgis_coords;"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
684 returnstring=self.ZSQLSimpleSearch(SQL)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
685 return coords[0]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
686 except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
687 error="gis_id not to interpretable:"+str(gis_id)
16
cbb73d103152 NEW - # 12: create table and upload data
casties
parents: 15
diff changeset
688
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
689 def getCoordsFromREST_gisID(self,gis_id):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
690 coordlist=[]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
691 i=0
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
692 while (i<5 and coordlist==[]):
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
693
19
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
694 urlresponse=container.urlFunctions.zUrlopenParseString(container.urlFunctions.zUrlopenRead("http://chgis.hmdc.harvard.edu/xml/id/"+gis_id))
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
695 baseDocElement=container.urlFunctions.zUrlopenDocumentElement(urlresponse)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
696 childnodes=container.urlFunctions.zUrlopenChildNodes(baseDocElement)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
697 itemnodes=container.urlFunctions.zUrlopenGetElementsByTagName(baseDocElement,'item')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
698
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
699 for i in range(0,container.urlFunctions.zUrlopenLength(itemnodes)):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
700 itemnode=container.urlFunctions.zUrlopenGetItem(itemnodes,i)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
701 itemspatialnodes=container.urlFunctions.zUrlopenGetElementsByTagName(itemnode,'spatial')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
702 for j in range(0,container.urlFunctions.zUrlopenLength(itemspatialnodes)):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
703 coord=[]
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
704 itemspatialnode= container.urlFunctions.zUrlopenGetItem(itemspatialnodes,j)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
705 itemspatiallatnodes=container.urlFunctions.zUrlopenGetElementsByTagName(itemspatialnode,'degrees_latitude')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
706 for k in range(0,container.urlFunctions.zUrlopenLength(itemspatiallatnodes)):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
707 itemspatiallatnode= container.urlFunctions.zUrlopenGetItem(itemspatiallatnodes,k)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
708 coord.append(container.urlFunctions.zUrlopenGetTextData(itemspatiallatnode))
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
709 itemspatiallngnodes=container.urlFunctions.zUrlopenGetElementsByTagName(itemspatialnode,'degrees_longitude')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
710 for k in range(0,container.urlFunctions.zUrlopenLength(itemspatiallngnodes)):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
711 itemspatiallngnode= container.urlFunctions.zUrlopenGetItem(itemspatiallngnodes,k)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
712 coord.append(container.urlFunctions.zUrlopenGetTextData(itemspatiallngnode))
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
713 coordlist.append(coord)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
714 gis_id= "_"+gis_id
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
715 return coordlist
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
716
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
717 # End for GoogleMaps creation
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
718
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
719 def RESTwrite2File(self,datadir, name,text):
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
720 # try:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
721 fileid=name
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
722 if fileid in datadir.objectIds():
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
723 datadir.manage_delObjects(fileid)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
724 newfile=open(name,'w')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
725 newfile.write(text)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
726 newfile.close()
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
727 file4Read=open(name,'r')
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
728 fileInZope=datadir.manage_addFile(id=fileid,file=file4Read)
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
729 return "Write successful"
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
730 # except:
78e70dfa7ad6 GoogleMaps related functions
fknauft
parents: 18
diff changeset
731 # return "Could not write"
13
e2c73c077533 NEW - # 12: create table and upload data
casties
parents: 12
diff changeset
732
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
733
4
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
734 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
735 REQUEST=None):
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
736 """Change the object"""
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
737 if title is not None:
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
738 self.title = title
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
739
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
740 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
741 self.connection_id = connection_id
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
742
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
743 #checkPermission=getSecurityManager().checkPermission
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
744 REQUEST.RESPONSE.redirect('manage_main')
e3ee1f358fe6 new version that doesn't use ZSQLExtend but the database connection more directly.
casties
parents: 2
diff changeset
745
2
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
746
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
747 manage_addRestDbInterfaceForm=PageTemplateFile('zpt/addRestDbInterface',globals())
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
748
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
749 def manage_addRestDbInterface(self, id, title='', label='', description='',
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
750 createPublic=0,
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
751 createUserF=0,
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
752 REQUEST=None):
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
753 """Add a new object with id *id*."""
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
754
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
755 ob=RestDbInterface(str(id),title)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
756 self._setObject(id, ob)
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
757
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
758 #checkPermission=getSecurityManager().checkPermission
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
759 REQUEST.RESPONSE.redirect('manage_main')
61a3764cd5fb new version RestDbInterface with working traversal and templates
casties
parents:
diff changeset
760
5
7539a9e69365 small fix
casties
parents: 4
diff changeset
761