more refactor

1 files changed, 46 insertions, 32 deletions

diff --git a/lib/d2/bin/d2_svg_processor.py b/lib/d2/bin/d2_svg_processor.py
index c423ec6..3e59a4b 100644
--- a/lib/d2/bin/d2_svg_processor.py
+++ b/lib/d2/bin/d2_svg_processor.py
@@ -84,6 +84,15 @@ class Args(object):
     DEFAULT_MASTER_SVG = 'combined_master_v6.svg'
     DEFAULT_MASTER_SPREADSHEET = 'FloorPlan1.xls'
 
+    MASTER_SVG_HELP = "The full path of the master svg file "\
+                      "files: (default: {default})"
+
+    MASTER_XLS_HELP = "The full path of the master spreadsheet file "\
+                      "files: (default: {default})"
+
+    MASTER_OUTPUT_DIR_HELP = "The full path of the output directory "\
+                     ': (default: {default})'
+
     def __init__(self, config):
         self._config = config
         self._parser_ = None
@@ -128,8 +137,7 @@ class Args(object):
                 '--master-svg',
                 type=argparse.FileType('r'),
                 default=default_path,
-                help='The full path of the master svg file'
-                     'files: (default: %(default)s)'
+                help=self.MASTER_SVG_HELP.format(default=default_path)
         )
 
     def _spread_sheet_file(self):
@@ -140,8 +148,7 @@ class Args(object):
                 '--master-spreadsheet',
                 type=str,
                 default=default_path,
-                help='The full path of the master spreadsheet file'
-                     'files: (default: %(default)s)'
+                help=self.MASTER_XLS_HELP.format(default=default_path)
         )
 
     def _output_directory(self):
@@ -152,13 +159,13 @@ class Args(object):
                 '--output-directory',
                 type=str,
                 default=default_path,
-                help='The full path of the master spreadsheet file'
-                     'files: (default: %(default)s)'
+                help=self.MASTER_OUTPUT_DIR_HELP.format(default=default_path)
         )
 
 class ParseFloorPlanXLS(object):
 
-    MULTIPLE_RECORD_ERROR = "Data Error: multiple records for {0} in room {1}"
+    MULTIPLE_RECORD_ERROR = "Data Error: xls has multiple records for {0} "\
+                            "in room {1}"
 
     def __init__(self):
         pass
@@ -313,6 +320,13 @@ class PopulateTables(object):
     TABLES = [u'forge', u'label_coordinate', u'plot']
 
     TRANSFORM_MATRIX_ERROR = "Error: transform matrix of {0} not implemented"
+    DUPLICATE_NTWK_LABEL_ERROR = "Data Error: master svg has duplicate "\
+                                 "network  label in same room: {0}, {1}"    
+    NO_CLOSEBY_NTWK_ID_ERROR = "Data Error: cannot find closest_ntwk_id "\
+               "in room_name: {0}, x: {1} y: {2}, current name shown {3}"
+    NO_AREA_INFO_ERROR = "Data Error: cannot find area info for {0} {1}"
+    NO_OCCUPANT_DETAIL = "Data Errot: cannot find {0} in occupant_detail"
+
 
     def __init__(self):
         self.input_svg = ""
@@ -377,7 +391,7 @@ class PopulateTables(object):
         # Append group element with id to ntwk_id_svg
         ntwk_group = etree.SubElement(parent_node, "g",
                                    transform=node.attrib['transform'],
-                                   id="%s_NTWK_NUMBER" %room_name)
+                                   id="{0}_NTWK_NUMBER".format(room_name))
 
         room_ntwk_id = NTWK_NUMBER_ID.get(room_name)
         for el in node:
@@ -445,9 +459,9 @@ class PopulateTables(object):
         if room_name not in ntwk_number_data:
             ntwk_number_data[room_name] = {}
         if ntwk_id in ntwk_number_data[room_name]:
-            self._log_obj.error("""
-            DATA ERROR: duplicate network label in same room: %s, %s
-            """ %(room_name, ntwk_id))
+            self._log_obj.error(self.DUPLICATE_NTWK_LABEL_ERROR.format(
+                                                                room_name,
+                                                                  ntwk_id))
         else:
             ntwk_number_data[room_name][ntwk_id] = {'x': x,
                                                     'y': y,
@@ -483,7 +497,7 @@ class PopulateTables(object):
                                     map(float, re.split('\s+', view_box[:]))
 
         for main_el in data:
-            if main_el.tag == '{%s}g' %NSMAP['svg']:
+            if main_el.tag == '{{{0}}}g'.format(NSMAP['svg']):
                 main_el_matrix = main_el.attrib['transform']
                 group_node = etree.SubElement(ntwk_id_svg, main_el.tag,
                                                    main_el.attrib)
@@ -503,8 +517,9 @@ class PopulateTables(object):
 
         #create svg root element:
         parser = etree.XMLParser()
-        name_label_svg = parser.makeelement('{%s}' %NSMAP['svg'] + 'svg',
-                                          nsmap = NSMAP2)
+        name_label_svg = parser.makeelement(
+                             '{{{0}}}{1}'.format(NSMAP['svg'], 'svg'), 
+                             nsmap = NSMAP2)
         #copy the root element attributes to the newly created svgs:
         root = data.getroottree().getroot()
         for key, value in root.attrib.iteritems():
@@ -515,7 +530,7 @@ class PopulateTables(object):
                                     map(float, re.split('\s+', view_box[:]))
 
         for main_el in data:
-            if main_el.tag == '{%s}g' %NSMAP['svg']:
+            if main_el.tag == '{{{0}}}g'.format(NSMAP['svg']):
                 main_el_matrix = main_el.attrib['transform']
                 group_node = etree.SubElement(name_label_svg, main_el.tag,
                                                    main_el.attrib)
@@ -548,13 +563,13 @@ class PopulateTables(object):
 
         name_label_group = etree.SubElement(parent_node, "g",
                                    transform=node.attrib['transform'],
-                                   id="%s_NAME_LABEL" %approx_room_name)
+                                   id="{0}_NAME_LABEL".format(approx_room_name))
 
         room_name_label_id = NAME_LABEL_ID.get(approx_room_name)
         for el in node:
             if el.attrib['id'] == room_name_label_id:
                 for sub_el in el:
-                    if sub_el.tag == '{%s}text' %NSMAP['svg']:
+                    if sub_el.tag == '{{{0}}}text'.format(NSMAP['svg']):
                         tspan_elem = sub_el.xpath('./svg:tspan',
                                                   namespaces=NSMAP)[0]
                         transform_matrix = sub_el.attrib['transform']
@@ -584,14 +599,13 @@ class PopulateTables(object):
                                 current_name_shown += " " + ts.text
 
                             if not closest_ntwk_id:
-                                self._log_obj.error("""DATA ERROR:
-                                 cannot find closest_ntwk_id for room_name:
-                                 %s x: %s y: %s, current name shown %s """
-                                 %(room_name, abs_x, abs_y,
-                                   current_name_shown))
+                                self._log_obj.error(
+                                     self.NO_CLOSEBY_NTWK_ID_ERROR.format(
+                                                                   room_name, 
+                                                                       abs_x, 
+                                                                       abs_y,
+                                                          current_name_shown))
                             else:
-                                #print "room_name: %s x: %s y: %s" %(room_name, x, y)
-                                #print "closest ntwk_id: %s" %closest_ntwk_id
                                 info = self._get_area_info(room_name,
                                                            closest_ntwk_id)
                                 if info:
@@ -708,9 +722,9 @@ class PopulateTables(object):
                     if normalized_id_IDF in floor_plan_data[room_name]:
                         info = floor_plan_data[room_name][normalized_id_IDF]
                     else:
-                        self._log_obj.error("""
-                        DATA ERROR: cannot find area info for %s %s
-                        """ %(room_name, ntwk_id))
+                        self._log_obj.error(self.NO_AREA_INFO_ERROR.format(
+                                                              room_name,
+                                                                ntwk_id))
         return info
 
     def _get_first_last_name(self, s):
@@ -748,8 +762,8 @@ class PopulateTables(object):
                         break
 
         if not occupant_id:
-            self._log_obj.error("""
-              DATA ERROR: cannot find %s in occupant_detail""" %info['name'])
+            self._log_obj.error(self.NO_OCCUPANT_DETAIL.format(info['name']))
+
         return occupant_id
 
     def _add_ntwk_jacks(self, plot_id, info):
@@ -809,7 +823,7 @@ class Util(object):
                                            el.tag,
                                            el.attrib)
         for sub_el in el:
-           if sub_el.tag != '{%s}text' %NSMAP['svg']:
+           if sub_el.tag != '{{{0}}}text'.format(NSMAP['svg']):
                el_wrapper_node.append(sub_el)
 
 
@@ -819,9 +833,9 @@ class Util(object):
                                     namespaces = NSMAP)
 
         for el in use_nodes:
-            href = '{%s}href' %NSMAP['xlink']
+            href = '{{{0}}}href'.format(NSMAP['xlink'])
             if href in el.attrib:
-                el_href = el.attrib['{%s}href' %NSMAP['xlink']]
+                el_href = el.attrib['{{{0}}}href'.format(NSMAP['xlink'])]
                 if el_href == href_id:
                     el.getparent().remove(el)