more cleanup

1 files changed, 21 insertions, 11 deletions

diff --git a/lib/d2/bin/d2_svg_processor.py b/lib/d2/bin/d2_svg_processor.py
index 3e59a4b..97c6801 100644
--- a/lib/d2/bin/d2_svg_processor.py
+++ b/lib/d2/bin/d2_svg_processor.py
@@ -4,11 +4,13 @@ import json
 import stat
 import re
 import xlrd
+from collections import namedtuple
 from lxml import etree
 from copy import deepcopy
 from copy import copy
 from sqlalchemy import MetaData
 from d2.app.adapters.detail import DetailAdapter
+from d2.app.adapters.search import SearchAdapter
 from d2.app.adapters.forge import ForgeAdapter
 from d2.app.model.static import StaticData
 from d2.config import Config
@@ -70,8 +72,10 @@ NAME_CORRECTIONS = {u'Deb Smith': u'Deborah Smith',
                     u'Jane Carpenter-Lamb': u'Jane Carpenter',
                     u'Nanette Weidl': u'Nanette Wiedl',
                     u'Kathi Fai': u'Kathi Fay',
+                    u'Sally Babcock': u'Sally Schriner',
                     u'Brian Staneck': u'Brian Stanek'}
 
+
 floor_plan_data = {}
 
 ntwk_number_data = {}
@@ -168,7 +172,7 @@ class ParseFloorPlanXLS(object):
                             "in room {1}"
 
     def __init__(self):
-        pass
+        self._make = namedtuple('cubeInfo', 'name net_jack1 net_jack2')
 
     def _determine_room(self, s):
         """@params s: spread sheet's name, such as "QA 3A1" contains
@@ -194,9 +198,9 @@ class ParseFloorPlanXLS(object):
                     log_obj.error(self.MULTIPLE_RECORD_ERROR.format(cube,
                                                                room_name))
                 else:
-                    floor_plan_data[room_name][cube] = {'name': name,
-                                              'net_jack1': net_jack1,
-                                              'net_jack2': net_jack2}
+                    floor_plan_data[room_name][cube] = self._make(name,
+                                                              net_jack1,
+                                                              net_jack2)
 
     def __call__(self, args):
         wb = xlrd.open_workbook(args.master_spreadsheet)
@@ -740,13 +744,13 @@ class PopulateTables(object):
 
     def _find_occupant_id(self, info):
         occupant_id = None
-        if info['name'] == "Open":
+        if info.name == "Open":
             empty = self._db.session.query(Occupant).filter(
                  "occupant_type_id=:occupant_type_id").params(
                  occupant_type_id=self._static.occupant_type.empty).first()
             occupant_id = empty.id
         else:
-            (first_name, last_name) = self._get_first_last_name(info['name'])
+            (first_name, last_name) = self._get_first_last_name(info.name)
             records = self._detail_adapter.fetch_detail_by_type_data(
                         self._static.detail_type.last_name,
                         last_name)
@@ -761,21 +765,26 @@ class PopulateTables(object):
                         occupant_id = rec.occupant_id
                         break
 
+        # last resort try to do a search
+        if not occupant_id:
+            detail = self._search_adapter.search(info.name)
+            if len(detail) == 1:
+                occupant_id = detail[0].id
+
         if not occupant_id:
-            self._log_obj.error(self.NO_OCCUPANT_DETAIL.format(info['name']))
+            self._log_obj.error(self.NO_OCCUPANT_DETAIL.format(info.name))
 
         return occupant_id
 
     def _add_ntwk_jacks(self, plot_id, info):
-        if info and info.get('net_jack1'):
+        if info: 
             self._detail_adapter.insert_plot_detail(plot_id,
                     self._static.detail_type.network_jack,
-                    info['net_jack1'])
+                    info.net_jack1)
 
-        if info and info.get('net_jack2'):
             self._detail_adapter.insert_plot_detail(plot_id,
                     self._static.detail_type.network_jack,
-                    info['net_jack2'])
+                    info.net_jack2)
 
     def __call__(self, args):
         self._config = args.config
@@ -784,6 +793,7 @@ class PopulateTables(object):
         self._static = StaticData.load(self._db)()
         self._detail_adapter = DetailAdapter.load(self._config)
         self._forge_adapter = ForgeAdapter.load(self._config)
+        self._search_adapter = SearchAdapter.load(self._config)
 
         # clean up database records from previous run
         self._drop_tables()