/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/session.py

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

Parent Directory | Revision Log | View Patch Patch

-revision 1068 by bh,
Tue May 27 15:02:37 2003 UTC
+revision 2102 by bh,
Thu Mar 11 21:04:30 2004 UTC
 Line 1
- # Copyright (c) 2001, 2002, 2003 by Intevation GmbH
+ # Copyright (c) 2001, 2002, 2003, 2004 by Intevation GmbH
  # Authors:
  # Bernhard Herzog <[email protected]>
  # Jan-Oliver Wagner <[email protected]>
 Line 16 
 from messages import MAPS_CHANGED, EXTEN
       MAP_LAYERS_CHANGED, MAP_PROJECTION_CHANGED, \
       LAYER_CHANGED, LAYER_PROJECTION_CHANGED, LAYER_VISIBILITY_CHANGED,\
       EXTENSION_CHANGED, EXTENSION_OBJECTS_CHANGED, CHANGED, \
-      TABLE_REMOVED
+      TABLE_REMOVED, DBCONN_ADDED, DBCONN_REMOVED
  from Thuban import _
 Line 24 
 from base import TitledObject, Modifiabl
  from map import Map
  from data import ShapefileStore
  from table import DBFTable
+ import postgisdb
  from transientdb import TransientDatabase, AutoTransientTable
-Line 133 
 class Session(TitledObject, Modifiable):
+Line 134 
 class Session(TitledObject, Modifiable):
          self.tables = []
          self.shapestores = []
          self.extensions = []
+         self.db_connections = []
          self.temp_dir = None
          self.transient_db = None
-Line 201 
 class Session(TitledObject, Modifiable):
+Line 203 
 class Session(TitledObject, Modifiable):
          The list includes all tables that are indirectly opened through
          shape stores and the tables that have been opened explicitly.
          """
-         return self.tables + [store.Table() for store in self.ShapeStores()]
+         tables = self.tables[:]
+         ids = {}
+         for t in tables:
+             ids[id(t)] = 1
+         for store in self.ShapeStores():
+             t = store.Table()
+             if id(t) not in ids:
+                 ids[id(t)] = 1
+                 tables.append(t)
+         return tables
      def UnreferencedTables(self):
          """Return the tables that are not referenced by other data sources"""
-Line 237 
 class Session(TitledObject, Modifiable):
+Line 248 
 class Session(TitledObject, Modifiable):
          else:
              transient_table = table
          self.tables.append(transient_table)
+         self.changed()
          return transient_table
      def RemoveTable(self, table):
-Line 255 
 class Session(TitledObject, Modifiable):
+Line 267 
 class Session(TitledObject, Modifiable):
          self.tables = tables
          self.changed(TABLE_REMOVED, table)
+     def DataContainers(self):
+         """Return all data containers, i.e. shapestores and tables"""
+         return self.tables + self.ShapeStores()
      def OpenTableFile(self, filename):
          """Open the table file filename and return the table object.
-Line 300 
 class Session(TitledObject, Modifiable):
+Line 316 
 class Session(TitledObject, Modifiable):
                                                          self.temp_dir_remover)
          return self.transient_db
+     def AddDBConnection(self, dbconn):
+         """Add the database connection dbconn to the session
+         The argument should be an instance of PostGISConnection.
+         """
+         self.db_connections.append(dbconn)
+         self.changed(DBCONN_ADDED)
+     def DBConnections(self):
+         """
+         Return a list of all database connections registered with the session
+         """
+         return self.db_connections
+     def HasDBConnections(self):
+         """Return whether the session has open database connections"""
+         return bool(self.db_connections)
+     def CanRemoveDBConnection(self, dbconn):
+         """Return whether the database connections dbconn can be removed
+         If can be removed if none of the shapestores or tables in the
+         session references it.
+         """
+         for store in self.ShapeStores():
+             if (isinstance(store, postgisdb.PostGISShapeStore)
+                 and store.db is dbconn):
+                 return 0
+         for table in self.Tables():
+             if (isinstance(table, postgisdb.PostGISTable)
+                 and table.db is dbconn):
+                 return 0
+         return 1
+     def RemoveDBConnection(self, dbconn):
+         """Remove the database connection from the session
+         The parameter must be a connection that was registered
+         previously by a AddDBConnection() call.
+         """
+         if self.CanRemoveDBConnection(dbconn):
+             remaining = [c for c in self.db_connections if c is not dbconn]
+             if len(remaining) < len(self.db_connections):
+                 self.db_connections = remaining
+                 self.changed(DBCONN_REMOVED)
+             else:
+                 raise ValueError("DBConection %r is not registered"
+                                  " with session %r" % (dbconn, self))
+         else:
+             raise ValueError("DBConnection %r is still in use" % (dbconn,))
+     def OpenDBShapeStore(self, db, tablename, id_column = None,
+                          geometry_column = None):
+         """Create and return a shapstore for a table in the database
+         The db parameter must be a database connection previously passed
+         to AddDBConnection().
+         """
+         store = postgisdb.PostGISShapeStore(db, tablename,
+                                             id_column = id_column,
+                                             geometry_column = geometry_column)
+         self._add_shapestore(store)
+         return store
      def Destroy(self):
          for map in self.maps:
              map.Destroy()

 Legend:



Removed from v.1068
 


changed lines


 
Added in v.2102
 Legend:



Removed from v.1068
 


changed lines


 
Added in v.2102
-Removed from v.1068
+Added in v.2102

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26