/[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 930 by jonathan, Tue May 20 15:23:03 2003 UTC revision 1930 by bh, Tue Nov 11 13:24:41 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, RasterLayer  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  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 43  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 57  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  
         else:  
             filename = file_or_filename  
             self.__directory = os.path.dirname(filename)  
             self.__file = open(filename)  
   
         parser = make_parser()  
         parser.setContentHandler(self)  
         parser.setErrorHandler(ErrorHandler())  
         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()  
   
     def close(self):  
         self.__file.close()  
           
     def GetFilename(self):  
         if hasattr(self.__file, "name"):  
             return self.__file.name  
   
         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])  
88          else:          else:
89              # Dispatch with namespace              fullname = name
90              method_name = self.__dispatchers.get(name)              name = name[1]
91          if method_name is not None and method_name[0] is not None:          self.name = name
92              getattr(self, method_name[0])(name, qname, attrs)          self.fullname = fullname
93            self.required = required
94            self.default = default
95            self.conversion = conversion
96    
97      def endElementNS(self, name, qname):          # set by the SessionLoader's check_attrs method
98          """Call the method given for name in self.end_dispatcher          self.value = None
         """  
         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)  
   
     def encode(self, str):  
         """Assume that str is in Unicode and encode it into Latin1.  
           
         If str is None, return None  
         """  
99    
         if str is not None:  
             return str.encode("latin1")  
         else:  
             return None  
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               'rasterlayer'   : ("start_rasterlayer",    "end_rasterlayer"),  
120               'classification': ("start_classification", "end_classification"),              'dbconnection': ("start_dbconnection", None),
121               'clnull'        : ("start_clnull",         "end_clnull"),  
122               'clpoint'       : ("start_clpoint",        "end_clpoint"),              'dbshapesource': ("start_dbshapesource", None),
123               'clrange'       : ("start_clrange",        "end_clrange"),              'fileshapesource': ("start_fileshapesource", None),
124               'cldata'        : ("start_cldata",         "end_cldata"),              'derivedshapesource': ("start_derivedshapesource", None),
125               'table'         : ("start_table",          "end_table"),              'filetable': ("start_filetable", None),
126               'labellayer'    : ("start_labellayer",     None),              'jointable': ("start_jointable", None),
127               'label'         : ("start_label",          None)})  
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 Destroy(self):
153            """Clear all instance variables to cut cyclic references.
154    
155            The GC would have collected the loader eventually but it can
156            happen that it doesn't run at all until Thuban is closed (2.3
157            but not 2.2 tries a bit harder and forces a collection when the
158            interpreter terminates)
159            """
160            self.__dict__.clear()
161    
162      def start_session(self, name, qname, attrs):      def start_session(self, name, qname, attrs):
163          self.theSession = Session(self.encode(attrs.get((None, 'title'), None)))          self.theSession = Session(self.encode(attrs.get((None, 'title'),
164                                                            None)))
165    
166      def end_session(self, name, qname):      def end_session(self, name, qname):
167          pass          pass
168    
169        def check_attrs(self, element, attrs, descr):
170            """Check and convert some of the attributes of an element
171    
172            Parameters:
173               element -- The element name
174               attrs -- The attrs mapping as passed to the start_* methods
175               descr -- Sequence of attribute descriptions (AttrDesc instances)
176    
177            Return a dictionary containig normalized versions of the
178            attributes described in descr. The keys of that dictionary are
179            the name attributes of the attribute descriptions. The attrs
180            dictionary will not be modified.
181    
182            If the attribute is required, i.e. the 'required' attribute of
183            the descrtiption is true, but it is not in attrs, raise a
184            LoadError.
185    
186            If the attribute has a default value and it is not present in
187            attrs, use that default value as the value in the returned dict.
188    
189            If a conversion is specified, convert the value before putting
190            it into the returned dict. The following conversions are
191            available:
192    
193               'filename' -- The attribute is a filename.
194    
195                             If the filename is a relative name, interpret
196                             it relative to the directory containing the
197                             .thuban file and make it an absolute name
198    
199               'shapestore' -- The attribute is the ID of a shapestore
200                               defined earlier in the .thuban file. Look it
201                               up self.idmap
202    
203               'table' -- The attribute is the ID of a table or shapestore
204                          defined earlier in the .thuban file. Look it up
205                          self.idmap. If it's the ID of a shapestore the
206                          value will be the table of the shapestore.
207    
208               'idref' -- The attribute is the id of an object defined
209                          earlier in the .thuban file. Look it up self.idmap
210    
211               'ascii' -- The attribute is converted to a bytestring with
212                          ascii encoding.
213    
214               a callable -- The attribute value is passed to the callable
215                             and the return value is used a as the converted
216                             value
217            """
218            normalized = {}
219    
220            for d in descr:
221                if d.required and not attrs.has_key(d.fullname):
222                    raise LoadError("Element %s requires an attribute %r"
223                                    % (element, d.name))
224                value = attrs.get(d.fullname, d.default)
225    
226                if d.conversion in ("idref", "shapesource"):
227                    if value in self.idmap:
228                        value = self.idmap[value]
229                    else:
230                        raise LoadError("Element %s requires an already defined ID"
231                                        " in attribute %r"
232                                        % (element, d.name))
233                elif d.conversion == "table":
234                    if value in self.idmap:
235                        value = self.idmap[value]
236                        if isinstance(value, ShapefileStore):
237                            value = value.Table()
238                    else:
239                        raise LoadError("Element %s requires an already defined ID"
240                                        " in attribute %r"
241                                        % (element, d.name))
242                elif d.conversion == "filename":
243                    value = os.path.abspath(os.path.join(self.GetDirectory(),
244                                                         value))
245                elif d.conversion == "ascii":
246                    value = value.encode("ascii")
247                elif d.conversion:
248                    # Assume it's a callable
249                    value = d.conversion(value)
250    
251                normalized[d.name] = value
252            return normalized
253    
254        def start_dbconnection(self, name, qname, attrs):
255            attrs = self.check_attrs(name, attrs,
256                                     [AttrDesc("id", True),
257                                      AttrDesc("dbtype", True),
258                                      AttrDesc("host", False, ""),
259                                      AttrDesc("port", False, ""),
260                                      AttrDesc("user", False, ""),
261                                      AttrDesc("dbname", True)])
262            ID = attrs["id"]
263            dbtype = attrs["dbtype"]
264            if dbtype != "postgis":
265                raise LoadError("dbtype %r not supported" % filetype)
266    
267            del attrs["id"]
268            del attrs["dbtype"]
269    
270            # Try to open the connection and if it fails ask the user for
271            # the correct parameters repeatedly.
272            # FIXME: it would be better not to insist on getting a
273            # connection here. We should handle this more like the raster
274            # images where the layers etc still are created but are not
275            # drawn in case Thuban can't use the data for various reasons
276            while 1:
277                try:
278                    conn = postgisdb.PostGISConnection(**attrs)
279                    break
280                except postgisdb.ConnectionError, val:
281                    if self.db_connection_callback is not None:
282                        attrs = self.db_connection_callback(attrs, str(val))
283                        if attrs is None:
284                            raise LoadCancelled
285                    else:
286                        raise
287    
288            self.idmap[ID] = conn
289            self.theSession.AddDBConnection(conn)
290    
291        def start_dbshapesource(self, name, qname, attrs):
292            attrs = self.check_attrs(name, attrs,
293                                     [AttrDesc("id", True),
294                                      AttrDesc("dbconn", True,
295                                               conversion = "idref"),
296                                      AttrDesc("tablename", True,
297                                               conversion = "ascii")])
298            ID = attrs["id"]
299            db = attrs["dbconn"]
300            tablename = attrs["tablename"]
301            self.idmap[ID] = self.theSession.OpenDBShapeStore(db, tablename)
302    
303        def start_fileshapesource(self, name, qname, attrs):
304            attrs = self.check_attrs(name, attrs,
305                                      [AttrDesc("id", True),
306                                       AttrDesc("filename", True,
307                                                conversion = "filename"),
308                                       AttrDesc("filetype", True)])
309            ID = attrs["id"]
310            filename = attrs["filename"]
311            filetype = attrs["filetype"]
312            if filetype != "shapefile":
313                raise LoadError("shapesource filetype %r not supported" % filetype)
314            self.idmap[ID] = self.theSession.OpenShapefile(filename)
315    
316        def start_derivedshapesource(self, name, qname, attrs):
317            attrs = self.check_attrs(name, attrs,
318                                     [AttrDesc("id", True),
319                                      AttrDesc("shapesource", True,
320                                               conversion = "shapesource"),
321                                      AttrDesc("table", True, conversion="table")])
322            store = DerivedShapeStore(attrs["shapesource"], attrs["table"])
323            self.theSession.AddShapeStore(store)
324            self.idmap[attrs["id"]] = store
325    
326        def start_filetable(self, name, qname, attrs):
327            attrs = self.check_attrs(name, attrs,
328                                     [AttrDesc("id", True),
329                                      AttrDesc("title", True),
330                                      AttrDesc("filename", True,
331                                               conversion = "filename"),
332                                      AttrDesc("filetype")])
333            filetype = attrs["filetype"]
334            if filetype != "DBF":
335                raise LoadError("shapesource filetype %r not supported" % filetype)
336            table = DBFTable(attrs["filename"])
337            table.SetTitle(attrs["title"])
338            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
339    
340        def start_jointable(self, name, qname, attrs):
341            attrs = self.check_attrs(name, attrs,
342                                     [AttrDesc("id", True),
343                                      AttrDesc("title", True),
344                                      AttrDesc("left", True, conversion="table"),
345                                      AttrDesc("leftcolumn", True),
346                                      AttrDesc("right", True, conversion="table"),
347                                      AttrDesc("rightcolumn", True),
348    
349                                      # jointype is required for file
350                                      # version 0.9 but this attribute
351                                      # wasn't in the 0.8 version because of
352                                      # an oversight so we assume it's
353                                      # optional since we want to handle
354                                      # both file format versions here.
355                                      AttrDesc("jointype", False,
356                                               default="INNER")])
357    
358            jointype = attrs["jointype"]
359            if jointype == "LEFT OUTER":
360                outer_join = True
361            elif jointype == "INNER":
362                outer_join = False
363            else:
364                raise LoadError("jointype %r not supported" % jointype )
365            table = TransientJoinedTable(self.theSession.TransientDB(),
366                                         attrs["left"], attrs["leftcolumn"],
367                                         attrs["right"], attrs["rightcolumn"],
368                                         outer_join = outer_join)
369            table.SetTitle(attrs["title"])
370            self.idmap[attrs["id"]] = self.theSession.AddTable(table)
371    
372      def start_map(self, name, qname, attrs):      def start_map(self, name, qname, attrs):
373          """Start a map."""          """Start a map."""
374          self.aMap = Map(attrs.get((None, 'title'), None))          self.aMap = Map(self.encode(attrs.get((None, 'title'), None)))
375    
376      def end_map(self, name, qname):      def end_map(self, name, qname):
377          self.theSession.AddMap(self.aMap)          self.theSession.AddMap(self.aMap)
378          self.aMap = None          self.aMap = None
379    
380      def start_projection(self, name, qname, attrs):      def start_projection(self, name, qname, attrs):
381          self.ProjectionName = self.encode(attrs.get((None, 'name'), None))          attrs = self.check_attrs(name, attrs,
382          self.ProjectionParams = [ ]                                   [AttrDesc("name", conversion=self.encode),
383                                      AttrDesc("epsg", default=None,
384                                               conversion=self.encode)])
385            self.projection_name = attrs["name"]
386            self.projection_epsg = attrs["epsg"]
387            self.projection_params = [ ]
388    
389      def end_projection(self, name, qname):      def end_projection(self, name, qname):
390          if self.aLayer is not None:          if self.aLayer is not None:
# Line 229  class SessionLoader(XMLReader): Line 395  class SessionLoader(XMLReader):
395              assert False, "projection tag out of context"              assert False, "projection tag out of context"
396              pass              pass
397    
398          obj.SetProjection(          obj.SetProjection(Projection(self.projection_params,
399              Projection(self.ProjectionParams, self.ProjectionName))                                       self.projection_name,
400                                         epsg = self.projection_epsg))
401    
402      def start_parameter(self, name, qname, attrs):      def start_parameter(self, name, qname, attrs):
403          s = attrs.get((None, 'value'))          s = attrs.get((None, 'value'))
404          s = str(s) # we can't handle unicode in proj          s = str(s) # we can't handle unicode in proj
405          self.ProjectionParams.append(s)          self.projection_params.append(s)
406    
407      def start_layer(self, name, qname, attrs, layer_class = Layer):      def start_layer(self, name, qname, attrs, layer_class = Layer):
408          """Start a layer          """Start a layer
# Line 252  class SessionLoader(XMLReader): Line 419  class SessionLoader(XMLReader):
419          fill = parse_color(attrs.get((None, 'fill'), "None"))          fill = parse_color(attrs.get((None, 'fill'), "None"))
420          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))          stroke = parse_color(attrs.get((None, 'stroke'), "#000000"))
421          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))          stroke_width = int(attrs.get((None, 'stroke_width'), "1"))
422          self.aLayer = layer_class(title,          if attrs.has_key((None, "shapestore")):
423                                    self.theSession.OpenShapefile(filename),              store = self.idmap[attrs[(None, "shapestore")]]
424            else:
425                store = self.theSession.OpenShapefile(filename)
426            self.aLayer = layer_class(title, store,
427                                    fill = fill, stroke = stroke,                                    fill = fill, stroke = stroke,
428                                    lineWidth = stroke_width,                                    lineWidth = stroke_width,
429                                    visible = visible)                                    visible = visible)
# Line 293  class SessionLoader(XMLReader): Line 463  class SessionLoader(XMLReader):
463          elif fieldType == FIELDTYPE_DOUBLE:          elif fieldType == FIELDTYPE_DOUBLE:
464              self.conv = float              self.conv = float
465    
466          self.aLayer.GetClassification().SetField(field)          self.aLayer.SetClassificationColumn(field)
467    
468      def end_classification(self, name, qname):      def end_classification(self, name, qname):
469          pass          pass
# Line 311  class SessionLoader(XMLReader): Line 481  class SessionLoader(XMLReader):
481      def start_clpoint(self, name, qname, attrs):      def start_clpoint(self, name, qname, attrs):
482          attrib_value = attrs.get((None, 'value'), "0")          attrib_value = attrs.get((None, 'value'), "0")
483    
484          value = self.conv(attrib_value)          field = self.aLayer.GetClassificationColumn()
485            if self.aLayer.GetFieldType(field) == FIELDTYPE_STRING:
486                value = self.encode(attrib_value)
487            else:
488                value = self.conv(attrib_value)
489          self.cl_group = ClassGroupSingleton(value)          self.cl_group = ClassGroupSingleton(value)
490          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))          self.cl_group.SetLabel(self.encode(attrs.get((None, 'label'), "")))
491          self.cl_prop = ClassGroupProperties()          self.cl_prop = ClassGroupProperties()
# Line 334  class SessionLoader(XMLReader): Line 507  class SessionLoader(XMLReader):
507              if range is not None:              if range is not None:
508                  self.cl_group = ClassGroupRange(Range(range))                  self.cl_group = ClassGroupRange(Range(range))
509              elif min is not None and max is not None:              elif min is not None and max is not None:
510                  self.cl_group = ClassGroupRange(self.conv(min), self.conv(max))                  self.cl_group = ClassGroupRange((self.conv(min),
511                                                     self.conv(max)))
512              else:              else:
513                  self.cl_group = ClassGroupRange(Range(None))                  self.cl_group = ClassGroupRange(Range(None))
514    
# Line 360  class SessionLoader(XMLReader): Line 534  class SessionLoader(XMLReader):
534      def end_cldata(self, name, qname):      def end_cldata(self, name, qname):
535          pass          pass
536    
     def start_table(self, name, qname, attrs):  
         #print "table title: %s" % attrs.get('title', None)  
         pass  
   
     def end_table(self, name, qname):  
         pass  
   
537      def start_labellayer(self, name, qname, attrs):      def start_labellayer(self, name, qname, attrs):
538          self.aLayer = self.aMap.LabelLayer()          self.aLayer = self.aMap.LabelLayer()
539    
# Line 382  class SessionLoader(XMLReader): Line 549  class SessionLoader(XMLReader):
549          pass          pass
550    
551    
552  def load_session(filename):  def load_session(filename, db_connection_callback = None):
553      """Load a Thuban session from the file object file"""      """Load a Thuban session from the file object file
554    
555      handler = SessionLoader()      The db_connection_callback, if given should be a callable object
556        that can be called like this:
557           db_connection_callback(params, message)
558    
559        where params is a dictionary containing the known connection
560        parameters and message is a string with a message why the connection
561        failed. db_connection_callback should return a new dictionary with
562        corrected and perhaps additional parameters like a password or None
563        to indicate that the user cancelled.
564        """
565        handler = SessionLoader(db_connection_callback)
566      handler.read(filename)      handler.read(filename)
567    
568      session = handler.theSession      session = handler.theSession
569      # Newly loaded session aren't modified      # Newly loaded session aren't modified
570      session.UnsetModified()      session.UnsetModified()
571    
572        handler.Destroy()
573    
574      return session      return session
575    
Legend:
Removed from v.930  
changed lines
  Added in v.1930
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26