/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/load.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/load.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2036 by bh, Mon Dec 22 17:49:43 2003 UTC revision 2104 by bh, Fri Mar 12 12:19:15 2004 UTC
# Line 1  Line 1 
1  # Copyright (C) 2001, 2002, 2003 by Intevation GmbH  # Copyright (C) 2001, 2002, 2003, 2004 by Intevation GmbH
2  # Authors:  # Authors:
3  # Jan-Oliver Wagner <[email protected]>  # Jan-Oliver Wagner <[email protected]>
4  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
# Line 145  class SessionLoader(XMLReader): Line 145  class SessionLoader(XMLReader):
145                        "http://thuban.intevation.org/dtds/thuban-0.9.dtd",                        "http://thuban.intevation.org/dtds/thuban-0.9.dtd",
146                        "http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd",                        "http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd",
147                        "http://thuban.intevation.org/dtds/thuban-1.0rc1.dtd",                        "http://thuban.intevation.org/dtds/thuban-1.0rc1.dtd",
148                        "http://thuban.intevation.org/dtds/thuban-1.0.0.dtd"):                        "http://thuban.intevation.org/dtds/thuban-1.0.0.dtd",
149                          "http://thuban.intevation.org/dtds/thuban-1.1-dev.dtd"):
150              for key, value in dispatchers.items():              for key, value in dispatchers.items():
151                  dispatchers[(xmlns, key)] = value                  dispatchers[(xmlns, key)] = value
152    
# Line 300  class SessionLoader(XMLReader): Line 301  class SessionLoader(XMLReader):
301                                    AttrDesc("dbconn", True,                                    AttrDesc("dbconn", True,
302                                             conversion = "idref"),                                             conversion = "idref"),
303                                    AttrDesc("tablename", True,                                    AttrDesc("tablename", True,
304                                               conversion = "ascii"),
305                                      # id_column and geometry_column were
306                                      # newly introduced with thuban-1.1.dtd
307                                      # where they're required.  Since we
308                                      # support the older formats too we
309                                      # have them optional here.
310                                      AttrDesc("id_column", False, "gid",
311                                               conversion = "ascii"),
312                                      AttrDesc("geometry_column", False,
313                                             conversion = "ascii")])                                             conversion = "ascii")])
314          ID = attrs["id"]          # The default value of geometry_column to use when instantiating
315          db = attrs["dbconn"]          # the db shapestore is None which we currently can't easily use
316          tablename = attrs["tablename"]          # in check_attrs
317          self.idmap[ID] = self.theSession.OpenDBShapeStore(db, tablename)          geometry_column = attrs["geometry_column"]
318            if not geometry_column:
319                geometry_column = None
320            dbopen = self.theSession.OpenDBShapeStore
321            self.idmap[attrs["id"]] = dbopen(attrs["dbconn"], attrs["tablename"],
322                                             id_column = attrs["id_column"],
323                                             geometry_column=geometry_column)
324    
325      def start_fileshapesource(self, name, qname, attrs):      def start_fileshapesource(self, name, qname, attrs):
326          attrs = self.check_attrs(name, attrs,          attrs = self.check_attrs(name, attrs,
Legend:
Removed from v.2036  
changed lines
  Added in v.2104
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26