Changeset 93
- Timestamp:
- 11/06/09 12:59:23 (3 weeks ago)
- bzr:user-agent:
- bzr1.13.1+bzr-svn0.5.3
- bzr:text-parents:
.leo svn-v4:024821f5-3938-0410-9e91-f12db5f4c5db:trunk/src/catalog:86
.leo/shadow svn-v4:024821f5-3938-0410-9e91-f12db5f4c5db:trunk/src/catalog:86- bzr:root:
- trunk/src/catalog
- svn:original-date:
- 2009-11-06T18:59:21.982000Z
- bzr:revprop:branch-nick:
- trunk/src/catalog
- bzr:repository-uuid:
- 024821f5-3938-0410-9e91-f12db5f4c5db
- bzr:base-revision:
- svn-v4:024821f5-3938-0410-9e91-f12db5f4c5db:trunk/src/catalog:90
- bzr:revno:
- 67
- bzr:file-ids:
.bzrignore NEW-trunk%2Fsrc%2Fcatalog%2F.bzrignore
.leo 64@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F.leo
.leo/shadow 65@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow
.leo/shadow/xdbfio.py 65@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2Fxdbfio.py
.leo/shadow/xdwenv.py NEW-trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2Fxdwenv.py
.leo/shadow/ximportShapefile 65@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2FximportShapefile
.leo/shadow/xmodels.py NEW-trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2Fxmodels.py
.leo/shadow/xsteps.py NEW-trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2Fxsteps.py
.leo/shadow/xtablesummary.py 65@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F.leo%2Fshadow%2Fxtablesummary.py
__init__.py 18@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2F__init__.py
catalog.conf 12@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fcatalog.conf
data.py 48@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fdata.py
dataserver.py 48@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fdataserver.py
dataworkshop.ini NEW-trunk%2Fsrc%2Fcatalog%2Fdataworkshop.ini
dbfio.py 55@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fdbfio.py
dwenv.py NEW-trunk%2Fsrc%2Fcatalog%2Fdwenv.py
files.py 14@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Ffiles.py
importShapefile 58@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2FimportShapefile
models.py 14@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fmodels.py
serv.py 12@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fserv.py
steps.py 34@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Fsteps.py
tablesummary.py 54@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Ftablesummary.py
test.py 34@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Ftest.py
tests.py 48@024821f5-3938-0410-9e91-f12db5f4c5db:trunk%2Fsrc%2Fcatalog%2Ftests.py- bzr:mapping-version:
- v4
- Location:
- trunk/src/catalog
- Files:
-
- 5 modified
-
dataserver.py (modified) (2 diffs)
-
.leo/shadow/xsteps.py (modified) (2 diffs)
-
.leo/shadow/xtablesummary.py (modified) (2 diffs)
-
steps.py (modified) (2 diffs)
-
tablesummary.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/catalog/dataserver.py
r90 r93 17 17 for repo in self.repositories: 18 18 if repo.startswith('postgres://'): 19 self.repo = repo # FIXME - cheap pass to describe() 19 20 print shpview.parsePosturl(repo) 20 21 con = psycopg2.connect(shpview.parsePosturl(repo)['connect2']) … … 101 102 102 103 return None 104 def describe(self, URN): 105 """describe the named resource""" 106 con = psycopg2.connect(shpview.parsePosturl(self.repo)['connect2']) 107 cur = con.cursor() 108 table_name = URN.split('.')[-1] 109 q = """select title from meta.describe where tablename = '%s'""" % table_name 110 cur.execute(q) 111 ans = cur.fetchone() 112 if not ans: 113 ans = table_name+"???" 114 else: 115 ans = ans[0] 116 return ans 103 117 def fieldDesc(self, URN, name): 104 118 """return dsecription of field in URN""" -
trunk/src/catalog/.leo/shadow/xsteps.py
r90 r93 228 228 active = [f.file for f in self.files] if self else [] 229 229 for i in fileList: 230 o = tag.option(i.rsplit('.',1)[-1], value=AddDatasetStep.enc(i)) 230 ttl = context.env['dataServer'].describe(i) 231 o = tag.option(ttl, value=AddDatasetStep.enc(i)) 231 232 if i in active: 232 233 o(selected = '1') … … 373 374 found = False 374 375 for i in inputs: 375 o = tag.option(i.name, value=i.URN, class_=prefix) 376 ttl = i.name 377 if not i.URN.startswith('sel://'): 378 ttl = context.env['dataServer'].describe(i.URN) 379 o = tag.option(ttl, value=i.URN, class_=prefix) 376 380 if i.URN == input_: 377 381 o(selected = "1") -
trunk/src/catalog/.leo/shadow/xtablesummary.py
r90 r93 48 48 if self.numeric is not False: # stays false once it becomes false 49 49 try: 50 x = float(x) 50 try: 51 x = float(x) 52 except TypeError: 53 x = 0. # FIXME None? 51 54 self.numeric = True 52 55 except ValueError: … … 297 300 else: 298 301 cur.execute('select %s from %s' % ( 299 ','.join([ f for f in self._fields if f != 'the_geom']), table))302 ','.join(['"%s"'%f for f in self._fields if f != 'the_geom']), table)) 300 303 self.reader = cur 301 304 #@-node:tbrown.20080804100842.31:__init__ -
trunk/src/catalog/steps.py
r90 r93 178 178 active = [f.file for f in self.files] if self else [] 179 179 for i in fileList: 180 o = tag.option(i.rsplit('.',1)[-1], value=AddDatasetStep.enc(i)) 180 ttl = context.env['dataServer'].describe(i) 181 o = tag.option(ttl, value=AddDatasetStep.enc(i)) 181 182 if i in active: 182 183 o(selected = '1') … … 299 300 found = False 300 301 for i in inputs: 301 o = tag.option(i.name, value=i.URN, class_=prefix) 302 ttl = i.name 303 if not i.URN.startswith('sel://'): 304 ttl = context.env['dataServer'].describe(i.URN) 305 o = tag.option(ttl, value=i.URN, class_=prefix) 302 306 if i.URN == input_: 303 307 o(selected = "1") -
trunk/src/catalog/tablesummary.py
r90 r93 35 35 if self.numeric is not False: # stays false once it becomes false 36 36 try: 37 x = float(x) 37 try: 38 x = float(x) 39 except TypeError: 40 x = 0. # FIXME None? 38 41 self.numeric = True 39 42 except ValueError: … … 224 227 else: 225 228 cur.execute('select %s from %s' % ( 226 ','.join([ f for f in self._fields if f != 'the_geom']), table))229 ','.join(['"%s"'%f for f in self._fields if f != 'the_geom']), table)) 227 230 self.reader = cur 228 231 def next(self):
