From 0402e18a644cda50b62d5a5a8ad04a9e5c761b75 Mon Sep 17 00:00:00 2001 From: Johnson Chetty Date: Wed, 1 Feb 2012 15:42:50 +0530 Subject: [PATCH] data mapper under progress --- chaloBEST/imports/data_mapper.py | 8 ++++---- chaloBEST/mumbai/models.py | 8 ++++---- db_csv_files/{Holidays.csv => Holiday.csv} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename db_csv_files/{Holidays.csv => Holiday.csv} (100%) diff --git a/chaloBEST/imports/data_mapper.py b/chaloBEST/imports/data_mapper.py index 6d4ce57..c8f5dab 100644 --- a/chaloBEST/imports/data_mapper.py +++ b/chaloBEST/imports/data_mapper.py @@ -26,7 +26,7 @@ def Route_save(entry): #print obj.__dict__ def HardCodedRoute_save(entry): - obj = HardCodedRoute(code=Route.objects.get(entry[0]), alias=entry[1], faretype=entry[2]) + obj = HardCodedRoute(code=Route.objects.get(code=int(entry[0])), alias=entry[1], faretype=entry[2]) obj.save() #print obj.__dict__ @@ -88,13 +88,13 @@ def Stop_save(entry): # There is no model as StopMarathi/AreaMarathi, but this is done to separate errors arising from different files, and also that the Marathi names should be done after the Stop and Area entities have been fully loaded cuz thats how we get them from BEST. def StopMarathi_save(entry): - obj = Stop.objects.get(stopcd=int(entry[0])) + obj = Stop.objects.get(code=int(entry[0])) obj.stopnm_mr = str(entry[1]) obj.save() #print obj.__dict__ def AreaMarathi_save(entry): - obj = Area.objects.get(a_code=int(entry[0])) + obj = Area.objects.get(code=int(entry[0])) obj.areanm_mr = str(entry[1]) obj.save() #print obj.__dict__ @@ -156,7 +156,7 @@ def CsvLoader(thismodel): f.close() DataLinesInFile = CsvFile.line_num -1 - stats = str(DataLinesInFile - errcount ) + " " + thismodel + "s loaded. Number of Errors encountered: " + str(errcount) + stats = str(DataLinesInFile - errcount ) + " " + thismodel + "s loaded. Number of Errors encountered: " + str(errcount) + ". " if errcount > 0 : stats+="See " + thismodel + "Errors file for details." diff --git a/chaloBEST/mumbai/models.py b/chaloBEST/mumbai/models.py index 9aad26c..6a1b492 100644 --- a/chaloBEST/mumbai/models.py +++ b/chaloBEST/mumbai/models.py @@ -78,13 +78,13 @@ class Stop(models.Model): area = models.ForeignKey(Area) depot = models.ForeignKey("Depot", related_name='is_depot_for') name_mr= models.TextField(null=True, blank=True, max_length=512)#null=True, - + point = models.PointField(null=True) def __unicode__(self): return self.name class Route(models.Model): - code = models.TextField(max_length=255) + code = models.TextField(max_length=255, unique=True) alias = models.TextField(max_length=255) from_stop_txt = models.TextField(max_length=500) to_stop_txt = models.TextField(max_length=500) @@ -99,7 +99,7 @@ class Route(models.Model): class RouteDetail(models.Model): # rno = models.TextField() - route = models.ForeignKey(Route.code) + route = models.ForeignKey(Route, to_field="code") serial = models.PositiveIntegerField() stop = models.ForeignKey(Stop) stage = models.NullBooleanField() @@ -165,7 +165,7 @@ class RouteType(models.Model): class HardCodedRoute(models.Model): - code = models.ForeignKey(Route.code) + code = models.ForeignKey(Route, to_field="code") alias = models.TextField(max_length=50) faretype = models.TextField(max_length=10) diff --git a/db_csv_files/Holidays.csv b/db_csv_files/Holiday.csv similarity index 100% rename from db_csv_files/Holidays.csv rename to db_csv_files/Holiday.csv