CAMP/chaloBEST
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conflicts resolved

Browse Source
This commit is contained in:
Sanj 2011-12-16 17:58:10 +05:30
parent bf1a803f93
commit 56ee058e83
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
chaloBEST/chalobest.db.THIS Normal file
View File

Binary file not shown.

23
chaloBEST/imports/import_atlas.py
View File

@ -21,6 +21,28 @@ def csvToJSON():
jsonFile.close() jsonFile.close()
<<<<<<< TREE <<<<<<< TREE
def getRouteCodes():
atlasRawCSV = csv.reader(open(join(PROJECT_ROOT, "../db_csv_files/AtlasRaw.csv"), "r"), delimiter="\t")
atlasDict = json.loads(open(join(PROJECT_ROOT, "../db_csv_files/Atlas.json")).read())
mapping = {}
missingFile = open("/tmp/routesMissing.txt", "w")
for row in atlasRawCSV:
routeAlias = row[0]
routeCode = row[1]
print routeCode
if routeCode in atlasDict:
mapping[routeCode] = routeAlias
else:
missingFile.write(routeCode + "\n")
missingFile.close()
mappingFile = open(join(PROJECT_ROOT, "../db_csv_files/routeMapping.json"), "w")
mappingFile.write(json.dumps(mapping, indent=2))
mappingFile.close()
=======
<<<<<<< TREE
def csvClean1(): def csvClean1():
atlasCSV = csv.reader(open(join(PROJECT_ROOT, "../db_csv_files/Atlas.csv"), "r"), delimiter="\t") atlasCSV = csv.reader(open(join(PROJECT_ROOT, "../db_csv_files/Atlas.csv"), "r"), delimiter="\t")
@ -28,3 +50,4 @@ def csvClean1():
>>>>>>> MERGE-SOURCE >>>>>>> MERGE-SOURCE
>>>>>>> MERGE-SOURCE