Changeset 5634

Timestamp:

07/08/07 02:07:36 (1 year ago)

Author:

jdunck

Message:

gis LayerMapping? now supports loading while mapping ForeignKey? to other tables.

Files:

• django/branches/gis/django/contrib/gis/utils/LayerMapping.py (modified) (10 diffs)

django/branches/gis/django/contrib/gis/utils/LayerMapping.py

@@ -21 +21 @@
-  model -- GeoDjango model (not an instance)
-
-
+
+
-
-  mapping -- A python dictionary, keys are strings corresponding
@@ -92 +93 @@
-from django.contrib.gis.models import GeometryColumns, SpatialRefSys
-
+from django.db import connection, transaction
+from django.core.exceptions import ObjectDoesNotExist
+
-# A mapping of given geometry types to their OGR integer type.
-ogc_types = {'POINT' : OGRGeomType('Point'),
@@ -116 +120 @@
-               'POLYGON' : OGRGeomType('MultiPolygon'),
-               }
+
+def map_foreign_key(django_field):
+    from django.db.models.fields.related import ForeignKey
+
+    if not django_field.__class__ is ForeignKey:
+        return django_field.__class__.__name__
+
+     
+    rf=django_field.rel.get_related_field()
+
+    return rf.get_internal_type()
-                
-# The acceptable Django field types that map to OGR fields.
-
+
+
+
-               'FloatField' : OFTReal,
-               'DateTimeField' : OFTDateTime,
@@ -143 +160 @@
-
-        # Making sure the given mapping model field is in the given model fields.
-
+
+
+
+
+
-            raise Exception, 'Given mapping field "%s" not in given Model fields!' % model_field
-        else:
-            model_type = model_fields[model_field]
-
-        ## Handling if we get a geometry in the Field ###
@@ -176 +195 @@
-        ## Handling other fields 
-        else:
- 
+
-            if not model_type in field_types:
-                raise Exception, 'Django field type "%s" has no OGR mapping (yet).' % model_type
@@ -209 +228 @@
-    "A class that maps OGR Layers to Django Models."
-
-ogr_file
+data
-        "Takes the Django model, the mapping (dictionary), and the SHP file."
-
-        # Getting the field names and types from the model
-
-
+
-        # Getting the DataSource and its Layer
-
+
+
+
+
-        self.layer = self.ds[layer]
-
@@ -228 +249 @@
-        self.model = model
-        self.source_srs = check_srs(self.layer, source_srs)
-
+
+
-    def save(self, verbose=False):
-        "Runs the layer mapping on the given SHP file, and saves to the database."
@@ -247 +269 @@
-        except Exception, msg:
-            raise Exception, 'Could not translate between the data source and model geometry.'
-
+
-        for feat in self.layer:
-            # The keyword arguments for model construction
@@ -253 +275 @@
-
-            # Incrementing through each model field and the OGR field in the mapping
+            all_prepped = True
+
-            for model_field, ogr_field in self.mapping.items():
-
+
+
+
+
+
+
-
-                if ogr_field in ogc_types:
@@ -272 +301 @@
-
-                    # Updating the keyword args with the WKT of the transformed model.
-kwargs[model_field]
+val
-                else:
-                    ## Otherwise, this is an OGR field type
-                    fi = feat.index(ogr_field)
-                    val = feat[fi].value
+
+                if is_fk:
+                    rel_obj = None
+                    field_name = model_field[:-3]
+                    try:
+                        #FIXME: refactor to efficiently fetch FKs.
+                        #  Requires significant re-work. :-/
+                        rel = self.model._meta.get_field(field_name).rel
+                        rel_obj = rel.to._default_manager.get(**{('%s__exact' % rel.field_name):val})
+                    except ObjectDoesNotExist:
+                        all_prepped = False
+                    
+                    kwargs[model_field[:-3]] = rel_obj
+                else:
-                    kwargs[model_field] = val
-
-            # Constructing the model using the constructed keyword args
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+