/[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 784 by jonathan, Tue Apr 29 17:30:18 2003 UTC revision 1844 by bh, Tue Oct 21 10:49:44 2003 UTC
# Line 24  from Thuban import _ Line 24  from Thuban import _
24  from Thuban.Model.table import FIELDTYPE_INT, FIELDTYPE_DOUBLE, \  from Thuban.Model.table import FIELDTYPE_INT, FIELDTYPE_DOUBLE, \
25       FIELDTYPE_STRING       FIELDTYPE_STRING
26    
27    from Thuban.Model.color import Color, Transparent
28    
29  from Thuban.Model.session import Session  from Thuban.Model.session import Session
30  from Thuban.Model.map import Map  from Thuban.Model.map import Map
31  from Thuban.Model.layer import Layer  from Thuban.Model.layer import Layer, RasterLayer
 from Thuban.Model.color import Color  
32  from Thuban.Model.proj import Projection  from Thuban.Model.proj import Projection
33    from Thuban.Model.range import Range
34  from Thuban.Model.classification import Classification, \  from Thuban.Model.classification import Classification, \
35      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \      ClassGroupDefault, ClassGroupSingleton, ClassGroupRange, ClassGroupMap, \
36      ClassGroupProperties      ClassGroupProperties
37    from Thuban.Model.data import DerivedShapeStore, ShapefileStore
38    from Thuban.Model.table import DBFTable
39    from Thuban.Model.transientdb import TransientJoinedTable
40    
41    from Thuban.Model.xmlreader import XMLReader
42    import resource
43    
44    import postgisdb
45    
46    class LoadError(Exception):
47    
48        """Exception raised when the thuban file is corrupted
49    
50        Not all cases of corrupted thuban files will lead to this exception
51        but those that are found by checks in the loading code itself are.
52        """
53    
54    
55    class LoadCancelled(Exception):
56    
57        """Exception raised to indicate that loading was interrupted by the user"""
58    
59    
60  def parse_color(color):  def parse_color(color):
# Line 42  def parse_color(color): Line 65  def parse_color(color):
65      """      """
66      color = string.strip(color)      color = string.strip(color)
67      if color == "None":      if color == "None":
68          result = Color.Transparent          result = Transparent
69      elif color[0] == '#':      elif color[0] == '#':
70          if len(color) == 7:          if len(color) == 7:
71              r = string.atoi(color[1:3], 16) / 255.0              r = string.atoi(color[1:3], 16) / 255.0
# Line 56  def parse_color(color): Line 79  def parse_color(color):
79          raise ValueError(_("Invalid color specification %s") % color)          raise ValueError(_("Invalid color specification %s") % color)
80      return result      return result
81    
82    class AttrDesc:
83    
84  class XMLReader(xml.sax.handler.ContentHandler):      def __init__(self, name, required = False, default = "",
85                     conversion = None):
86      # Dictionary mapping element names (or (URI, element name) pairs for          if not isinstance(name, tuple):
87      # documents using namespaces) to method names. The methods should              fullname = (None, name)
     # accept the same parameters as the startElement (or startElementNS)  
     # methods. The start_dispatcher is used by the default startElement  
     # and startElementNS methods to call a method for the open tag of an  
     # element.  
     start_dispatcher = {}  
   
     # end_dispatcher works just like start_dispatcher but it's used by  
     # endElement and endElementNS. The method whose names it maps to  
     # should accept the same parameters as endElement and endElementNS.  
     end_dispatcher = {}  
   
   
     def __init__(self):  
         self.chars = ''  
         self.__directory = ""  
         self.__dispatchers = {}  
   
     def read(self, file_or_filename):  
   
         if hasattr(file_or_filename, "read"):  
             # it's a file object  
             self.__directory = ""  
             self.__file = file_or_filename  
88          else:          else:
89              filename = file_or_filename              fullname = name
90              self.__directory = os.path.dirname(filename)              name = name[1]
91              self.__file = open(filename)          self.name = name
92            self.fullname = fullname
93          parser = make_parser()          self.required = required
94          parser.setContentHandler(self)          self.default = default
95          parser.setErrorHandler(ErrorHandler())          self.conversion = conversion
         parser.setFeature(xml.sax.handler.feature_namespaces, 1)  
   
         #  
         # Well, this isn't pretty, but it appears that if you  
         # use Python 2.2 without the site-package _xmlplus then  
         # the following will fail, and without them it will work.  
         # However, if you do have the site-package and you don't  
         # call these functions, the reader raises an exception  
         #  
         # The reason we set these to 0 in the first place is  
         # because there is an unresolved issue with external  
         # entities causing an exception in the reader  
         #  
         try:  
             parser.setFeature(xml.sax.handler.feature_validation,0)  
             parser.setFeature(xml.sax.handler.feature_external_ges,0)  
             parser.setFeature(xml.sax.handler.feature_external_pes,0)  
         except SAXNotRecognizedException:  
             pass  
   
         parser.parse(self.__file)  
   
         self.close()  
96    
97      def close(self):          # set by the SessionLoader's check_attrs method
98          self.__file.close()          self.value = None
           
     def GetFilename(self):  
         if hasattr(self.__file, "name"):  
             return self.__file.name  
99    
         return ""  
   
     def GetDirectory(self):  
         return self.__directory  
   
   
     def AddDispatchers(self, dict):  
         """Add the function names that should be used to process XML tags.  
   
         dict -- a dictionary whose keys are XML tag strings and whose values  
                 are pairs of strings such that the first string is  
                 the name of the function that should be called when the  
                 XML tag opens and the second string is the name of the  
                 function that should be called when the XML tag closes.  
                 If a pair element is None, no function is called.  
         """  
   
         self.__dispatchers.update(dict)  
   
     def startElementNS(self, name, qname, attrs):  
         """Call the method given for name in self.start_dispatcher  
         """  
         if name[0] is None:  
             method_name = self.__dispatchers.get(name[1])  
         else:  
             # Dispatch with namespace  
             method_name = self.__dispatchers.get(name)  
         if method_name is not None and method_name[0] is not None:  
             getattr(self, method_name[0])(name, qname, attrs)  
   
     def endElementNS(self, name, qname):  
         """Call the method given for name in self.end_dispatcher  
         """  
         if name[0] is None:  
             method_name = self.__dispatchers.get(name[1])  
         else:  
             # Dispatch with namespace  
             method_name = self.__dispatchers.get(name)  
         if method_name is not None and method_name[1] is not None:  
             getattr(self, method_name[1])(name, qname)  
100    
101  class SessionLoader(XMLReader):  class SessionLoader(XMLReader):
102    
103      def __init__(self):      def __init__(self, db_connection_callback = None):
104          """Inititialize the Sax handler."""          """Inititialize the Sax handler."""
105          XMLReader.__init__(self)          XMLReader.__init__(self)
106    
107            self.db_connection_callback = db_connection_callback
108    
109          self.theSession = None          self.theSession = None
110          self.aMap = None          self.aMap = None
111          self.aLayer = None          self.aLayer = None
112    
113          XMLReader.AddDispatchers(self,          # Map ids used in the thuban file to the corresponding objects
114              {'session'       : ("start_session",        "end_session"),          # in the session
115               'map'           : ("start_map",            "end_map"),          self.idmap = {}
116               'projection'    : ("start_projection",     "end_projection"),  
117               'parameter'     : ("start_parameter",      None),          dispatchers = {
118               'layer'         : ("start_layer",          "end_layer"),              'session'       : ("start_session",        "end_session"),
119               'classification': ("start_classification", "end_classification"),  
120               'clnull'        : ("start_clnull",         "end_clnull"),              'dbconnection': ("start_dbconnection", None),
121               'clpoint'       : ("start_clpoint",        "end_clpoint"),  
122               'clrange'       : ("start_clrange",        "end_clrange"),              'dbshapesource': ("start_dbshapesource", None),
123               'cldata'        : ("start_cldata",         "end_cldata"),              'fileshapesource': ("start_fileshapesource", None),
124               'table'         : ("start_table",          "end_table"),              'derivedshapesource': ("start_derivedshapesource", None),
125               'labellayer'    : ("start_labellayer",     None),              'filetable': ("start_filetable", None),
126               'label'         : ("start_label",          None)})              'jointable': ("start_jointable", None),
127    
128                'map'           : ("start_map",            "end_map"),
129                'projection'    : ("start_projection",     "end_projection"),
130                'parameter'     : ("start_parameter",      None),
131                'layer'         : ("start_layer",          "end_layer"),
132                'rasterlayer'   : ("start_rasterlayer",    "end_rasterlayer"),
133                'classification': ("start_classification", "end_classification"),
134                'clnull'        : ("start_clnull",         "end_clnull"),
135                'clpoint'       : ("start_clpoint",        "end_clpoint"),
136                'clrange'       : ("start_clrange",        "end_clrange"),
137                'cldata'        : ("start_cldata",         "end_cldata"),
138                'table'         : ("start_table",          "end_table"),
139                'labellayer'    : ("start_labellayer",     None),
140                'label'         : ("start_label",          None)}
141    
142            # all dispatchers should be used for the 0.8 and 0.9 namespaces too
143            for xmlns in ("http://thuban.intevation.org/dtds/thuban-0.8.dtd",
144                          "http://thuban.intevation.org/dtds/thuban-0.9-dev.dtd",
145                          "http://thuban.intevation.org/dtds/thuban-0.9.dtd",
146                          "http://thuban.intevation.org/dtds/thuban-1.0-dev.dtd"):
147                for key, value in dispatchers.items():
148                    dispatchers[(xmlns, key)] = value
149    
150            XMLReader.AddDispatchers(self, dispatchers)
151    
152      def start_session(self, name, qname, attrs):      def start_session(self, name, qname, attrs):
153          self.theSession = Session(attrs.get((None, 'title'), None))          self.theSession = Session(self.encode(attrs.get((None, 'title'),
154                                                            None)))
155    
156      def end_session(self, name, qname):      def end_session(self, name, qname):
157          pass          pass
158    
159        def check_attrs(self, element, attrs, descr):
160            """Check and convert some of the attributes of an element
161    
162            Parameters:
163               element -- The element name
164               attrs -- The attrs mapping as passed to the start_* methods
165               descr -- Sequence of attribute descriptions (AttrDesc instances)
166    
167            Return a dictionary containig normalized versions of the
168            attributes described in descr. The keys of that dictionary are
169            the name attributes of the attribute descriptions. The attrs
170            dictionary will not be modified.
171    
172            If the attribute is required, i.e. the 'required' attribute of
173            the descrtiption is true, but it is not in attrs, raise a
174            LoadError.
175    
176            If the attribute has a default value and it is not present in
177            attrs, use that default value as the value in the returned dict.
178    
179            If a conversion is specified, convert the value before putting
180            it into the returned dict. The following conversions are
181            available:
182    
183               'filename' -- The attribute is a filename.
184    
185                             If the filename is a relative name, interpret
186                             it relative to the directory containing the
187                             .thuban file and make it an absolute name
188    
189               'shapestore' -- The attribute is the ID of a shapestore
190                               defined earlier in the .thuban file. Look it
191                               up self.idmap
192    
193               'table' -- The attribute is the ID of a table or shapestore
194                          defined earlier in the .thuban file. Look it up
195                          self.idmap. If it's the ID of a shapestore the
196                          value will be the table of the shapestore.
197    
198               'idref' -- The attribute is the id of an object defined
199                          earlier in the .thuban file. Look it up self.idmap
200    
201               'ascii' -- The attribute is converted to a bytestring with
202                          ascii encoding.
203    
204               a callable -- The attribute value is passed to the callable
205                             and the return value is used a as the converted
206                             value
207            """
208            normalized = {}
209    
210            for d in descr:
211                if d.required and not attrs.has_key(d.fullname):
212                    raise LoadError("Element %s requires an attribute %r"
213                                    % (element, d.name))
214                value = attrs.get(d.fullname, d.default)
215    
216                if d.conversion in ("idref", "shapesource"):
217                    if value in self.idmap:
218                        value = self.idmap[value]
219                    else:
220                        raise LoadError("Element %s requires an already defined ID"
221                                        " in attribute %r"
222                                        % (element, d.name))
223                elif d.conversion == "table":
224                    if value in self.idmap:
225                        value = self.idmap[value]
226                        if isinstance(value, ShapefileStore):
227                            value = value.Table()
228                    else:
229                        raise LoadError("Element %s requires an already defined ID"
230                                        " in attribute %r"
231                                        % (element, d.name))
232                elif d.conversion == "filename":
233                    value = os.path.abspath(os.path.join(self.GetDirectory(),
234                                                         value))
235                elif d.conversion == "ascii":
236                    value = value.encode("ascii")
237                elif d.conversion:
238                    # Assume it's a callable
239                    value = d.conversion(value)
240    
241                normalized[d.name] = value
242            return normalized
243    
244        def start_dbconnection(self, name, qname, attrs):
245            attrs = self.check_attrs(name, attrs,
246                                     [AttrDesc("id", True),
247                                      AttrDesc("dbtype", True),
248                                      AttrDesc("host", False, ""),
249                                      AttrDesc("port", False, ""),
250                                      AttrDesc("user", False, ""),
251                                      AttrDesc("dbname", True)])
252            ID = attrs["id"]
253            dbtype = attrs["dbtype"]
254            if dbtype != "postgis":
255                raise LoadError("dbtype %r not supported" % filetype)
256    
257            del attrs["id"]
258            del attrs["dbtype"]
259    
260            # Try to open the connection and if it fails ask the user for
261            # the correct parameters repeatedly.
262            # FIXME: it would be better not to insist on getting a
263            # connection here. We should handle this more like the raster
264            # images where the layers etc still are created but are not
265            # drawn in case Thuban can't use the data for various reasons
266            while 1:
267                try:
268                    conn = postgisdb.PostGISConnection(**attrs)
269                    break
270                except postgisdb.ConnectionError, val:
271                    if self.db_connection_callback is not None:
272                        attrs = self.db_connection_callback(attrs, str(val))
273                        if attrs is None:
274                            raise LoadCancelled
275                    else:
276                        raise
277    
278            self.idmap[ID] = conn
279            self.theSession.AddDBConnection(conn)
280    
281        def start_dbshapesource(self, name, qname, attrs):
282            attrs = self.check_attrs(name, attrs,
283                                     [AttrDesc("id", True),
284                                      AttrDesc("dbconn", True,
285                                               conversion = "idref"),
286                                      AttrDesc("tablename", True,
287                                               conversion = "ascii")])
288            ID = attrs["id"]
289            db = attrs["dbconn"]
290            tablename = attrs["tablename"]
291            self.idmap[ID] = self.theSession.OpenDBShapeStore(db, tablename)
292    
293        def start_fileshapesource(self, name, qname, attrs):
294            attrs = self.check_attrs(name, attrs,
295                                      [AttrDesc("id", True),
296                                       AttrDesc("filename", True,
297                                                conversion = "filename"),
298                                       AttrDesc("filetype", True)])
299            ID = attrs["id"]
300            filename = attrs["filename"]
301            filetype = attrs["filetype"]
302            if filetype != "shapefile":
303                raise LoadError("shapesource filetype %r not supported" % filetype)
304            self.idmap[ID] = self.theSession.OpenShapefile(filename)
305    
306        def start_derivedshapesource(self, name, qname, attrs):
307            attrs = self.check_attrs(name, attrs,
308                                     [AttrDesc("id", True),
309                                      AttrDesc("shapesource", True,
310                                               conversion = "shapesource"),
311                                      AttrDesc("table", True, conversion="table")])
312            store = DerivedShapeStore(attrs["shapesource"], attrs["table"])
313            self.theSession.AddShapeStore(store)
314            self.idmap[attrs["id"]] = store
315    
316        def start_filetable(self, name, qname, attrs):
317            attrs = self.check_attrs(name, attrs,
318                                     [AttrDesc("id", True),
319                                      AttrDesc("title", True),
320                                      AttrDesc("filename", True,
321                                               conversion = "filename"),
322                                      AttrDesc("filetype")])
323            filetype = attrs["filetype"]
324            if filetype != "DBF":
325                raise LoadError("shapesource filetype %r not supported" % filetype)
326            table = DBFTable(attrs["filename"])
327            table.SetTitle(attrs["title"])
328            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
329    
330        def start_jointable(self, name, qname, attrs):
331            attrs = self.check_attrs(name, attrs,
332                                     [AttrDesc("id", True),
333                                      AttrDesc("title", True),
334                                      AttrDesc("left", True, conversion="table"),
335                                      AttrDesc("leftcolumn", True),
336                                      AttrDesc("right", True, conversion="table"),
337                                      AttrDesc("rightcolumn", True),
338    
339                                      # jointype is required for file
340                                      # version 0.9 but this attribute
341                                      # wasn't in the 0.8 version because of
342                                      # an oversight so we assume it's
343                                      # optional since we want to handle
344                                      # both file format versions here.
345                                      AttrDesc("jointype", False,
346                                               default="INNER")])
347    
348            jointype = attrs["jointype"]
349            if jointype == "LEFT OUTER":
350                outer_join = True
351            elif jointype == "INNER":
352                outer_join = False
353            else:
354                raise LoadError("jointype %r not supported" % jointype )
355            table = TransientJoinedTable(self.theSession.TransientDB(),
356                                         attrs["left"], attrs["leftcolumn"],
357                                         attrs["right"], attrs["rightcolumn"],
358                                         outer_join = outer_join)
359            table.SetTitle(attrs["title"])
360            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
361    
362      def start_map(self, name, qname, attrs):      def start_map(self, name, qname, attrs):
363          """Start a map."""          """Start a map."""
364          self.aMap = Map(attrs.get((None, 'title'), None))          self.aMap = Map(self.encode(attrs.get((None, 'title'), None)))
         self.__projReceiver = self.aMap  
365    
366      def end_map(self, name, qname):      def end_map(self, name, qname):
367          self.theSession.AddMap(self.aMap)          self.theSession.AddMap(self.aMap)
368          self.__projReceiver = None          self.aMap = None
369    
370      def start_projection(self, name, qname, attrs):      def start_projection(self, name, qname, attrs):
371          self.ProjectionName = attrs.get((None, 'name'), None)          attrs = self.check_attrs(name, attrs,
372          self.ProjectionParams = [ ]                                   [AttrDesc("name", conversion=self.encode),
373                                      AttrDesc("epsg", default=None,
374                                               conversion=self.encode)])
375            self.projection_name = attrs["name"]
376            self.projection_epsg = attrs["epsg"]
377            self.projection_params = [ ]
378    
379      def end_projection(self, name, qname):      def end_projection(self, name, qname):
380          self.__projReceiver.SetProjection(          if self.aLayer is not None:
381              Projection(self.ProjectionParams, self.ProjectionName))              obj = self.aLayer
382            elif self.aMap is not None:
383                obj = self.aMap
384            else:
385                assert False, "projection tag out of context"
386                pass
387    
388            obj.SetProjection(Projection(self.projection_params,
389                                         self.projection_name,
390                                         epsg = self.projection_epsg))
391    
392      def start_parameter(self, name, qname, attrs):      def start_parameter(self, name, qname, attrs):
393          s = attrs.get((None, 'value'))          s = attrs.get((None, 'value'))
394          s = str(s) # we can't handle unicode in proj          s = str(s) # we can't handle unicode in proj
395          self.ProjectionParams.append(s)          self.projection_params.append(s)
396    
397      def start_layer(self, name, qname, attrs, layer_class = Layer):      def start_layer(self, name, qname, attrs, layer_class = Layer):
398          """Start a layer          """Start a layer
# Line 224  class SessionLoader(XMLReader): Line 401  class SessionLoader(XMLReader):
401          attrs which may be a dictionary as well as the normal SAX attrs          attrs which may be a dictionary as well as the normal SAX attrs
402          object and bind it to self.aLayer.          object and bind it to self.aLayer.
403          """          """
404          title = attrs.get((None, 'title'), "")          title = self.encode(attrs.get((None, 'title'), ""))
405          filename = attrs.get((None, 'filename'), "")          filename = attrs.get((None, 'filename'), "")
406          filename = os.path.join(self.GetDirectory(), filename)          filename = os.path.join(self.GetDirectory(), filename)
407          visible  = attrs.get((None, 'visible'), "true")          filename = self.encode(filename)
408            visible  = self.encode(attrs.get((None, 'visible'), "true")) != "false"
409          fill = parse_color(attrs.get((None, 'fill'), "None"))          fill = parse_color(attrs.get((None, 'fill'), "None"))
410          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))
411          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))
412          self.aLayer = layer_class(title,          if attrs.has_key((None, "shapestore")):
413                                    self.theSession.OpenShapefile(filename),              store = self.idmap[attrs[(None, "shapestore")]]
414            else:
415                store = self.theSession.OpenShapefile(filename)
416            self.aLayer = layer_class(title, store,
417                                    fill = fill, stroke = stroke,                                    fill = fill, stroke = stroke,
418                                    lineWidth = stroke_width,                                    lineWidth = stroke_width,
419                                    visible = visible != "false")                                    visible = visible)
   
         self.__projReceiver = self.aLayer  
420    
421      def end_layer(self, name, qname):      def end_layer(self, name, qname):
422          self.aMap.AddLayer(self.aLayer)          self.aMap.AddLayer(self.aLayer)
423          self.__projReceiver = None          self.aLayer = None
424    
425        def start_rasterlayer(self, name, qname, attrs, layer_class = RasterLayer):
426            title = self.encode(attrs.get((None, 'title'), ""))
427            filename = attrs.get((None, 'filename'), "")
428            filename = os.path.join(self.GetDirectory(), filename)
429            filename = self.encode(filename)
430            visible  = self.encode(attrs.get((None, 'visible'), "true")) != "false"
431    
432            self.aLayer = layer_class(title, filename, visible = visible)
433    
434        def end_rasterlayer(self, name, qname):
435            self.aMap.AddLayer(self.aLayer)
436            self.aLayer = None
437    
438      def start_classification(self, name, qname, attrs):      def start_classification(self, name, qname, attrs):
439          field = attrs.get((None, 'field'), None)          field = attrs.get((None, 'field'), None)
# Line 261  class SessionLoader(XMLReader): Line 453  class SessionLoader(XMLReader):
453          elif fieldType == FIELDTYPE_DOUBLE:          elif fieldType == FIELDTYPE_DOUBLE:
454              self.conv = float              self.conv = float
455    
456          self.aLayer.GetClassification().SetField(field)          self.aLayer.SetClassificationColumn(field)
   
457    
458      def end_classification(self, name, qname):      def end_classification(self, name, qname):
459          pass          pass
460    
461      def start_clnull(self, name, qname, attrs):      def start_clnull(self, name, qname, attrs):
462          self.cl_group = ClassGroupDefault()          self.cl_group = ClassGroupDefault()
463          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))
464          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
465    
466      def end_clnull(self, name, qname):      def end_clnull(self, name, qname):
# Line 280  class SessionLoader(XMLReader): Line 471  class SessionLoader(XMLReader):
471      def start_clpoint(self, name, qname, attrs):      def start_clpoint(self, name, qname, attrs):
472          attrib_value = attrs.get((None, 'value'), "0")          attrib_value = attrs.get((None, 'value'), "0")
473    
474          value = self.conv(attrib_value)          field = self.aLayer.GetClassificationColumn()
475            if self.aLayer.GetFieldType(field) == FIELDTYPE_STRING:
476                value = self.encode(attrib_value)
477            else:
478                value = self.conv(attrib_value)
479          self.cl_group = ClassGroupSingleton(value)          self.cl_group = ClassGroupSingleton(value)
480          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))
481          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
482    
483    
# Line 294  class SessionLoader(XMLReader): Line 488  class SessionLoader(XMLReader):
488    
489      def start_clrange(self, name, qname, attrs):      def start_clrange(self, name, qname, attrs):
490    
491            range = attrs.get((None, 'range'), None)
492            # for backward compatibility (min/max are not saved)
493            min   = attrs.get((None, 'min'), None)
494            max   = attrs.get((None, 'max'), None)
495    
496          try:          try:
497              min = self.conv(attrs.get((None, 'min'), "0"))              if range is not None:
498              max = self.conv(attrs.get((None, 'max'), "0"))                  self.cl_group = ClassGroupRange(Range(range))
499                elif min is not None and max is not None:
500                    self.cl_group = ClassGroupRange((self.conv(min),
501                                                     self.conv(max)))
502                else:
503                    self.cl_group = ClassGroupRange(Range(None))
504    
505          except ValueError:          except ValueError:
506              raise ValueError(_("Classification range is not a number!"))              raise ValueError(_("Classification range is not a number!"))
507    
         self.cl_group = ClassGroupRange(min, max)  
508          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))          self.cl_group.SetLabel(attrs.get((None, 'label'), ""))
509          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
510    
# Line 320  class SessionLoader(XMLReader): Line 524  class SessionLoader(XMLReader):
524      def end_cldata(self, name, qname):      def end_cldata(self, name, qname):
525          pass          pass
526    
     def start_table(self, name, qname, attrs):  
         #print "table title: %s" % attrs.get('title', None)  
         pass  
   
     def end_table(self, name, qname):  
         pass  
   
527      def start_labellayer(self, name, qname, attrs):      def start_labellayer(self, name, qname, attrs):
528          self.aLayer = self.aMap.LabelLayer()          self.aLayer = self.aMap.LabelLayer()
529    
530      def start_label(self, name, qname, attrs):      def start_label(self, name, qname, attrs):
531          x = float(attrs[(None, 'x')])          x = float(attrs[(None, 'x')])
532          y = float(attrs[(None, 'y')])          y = float(attrs[(None, 'y')])
533          text = attrs[(None, 'text')]          text = self.encode(attrs[(None, 'text')])
534          halign = attrs[(None, 'halign')]          halign = attrs[(None, 'halign')]
535          valign = attrs[(None, 'valign')]          valign = attrs[(None, 'valign')]
536          self.aLayer.AddLabel(x, y, text, halign = halign, valign = valign)          self.aLayer.AddLabel(x, y, text, halign = halign, valign = valign)
# Line 342  class SessionLoader(XMLReader): Line 539  class SessionLoader(XMLReader):
539          pass          pass
540    
541    
542  def load_session(filename):  def load_session(filename, db_connection_callback = None):
543      """Load a Thuban session from the file object file"""      """Load a Thuban session from the file object file
544    
545      handler = SessionLoader()      The db_connection_callback, if given should be a callable object
546        that can be called like this:
547           db_connection_callback(params, message)
548    
549        where params is a dictionary containing the known connection
550        parameters and message is a string with a message why the connection
551        failed. db_connection_callback should return a new dictionary with
552        corrected and perhaps additional parameters like a password or None
553        to indicate that the user cancelled.
554        """
555        handler = SessionLoader(db_connection_callback)
556      handler.read(filename)      handler.read(filename)
557    
558      session = handler.theSession      session = handler.theSession
Legend:
Removed from v.784  
changed lines
  Added in v.1844
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26