Merge pull request hcientist#33 from pjritee/master

pgbovine · pgbovine · commit fe809a381c13 · 2013-06-27T05:58:49.000-07:00
bug fixes for make_visualization code and doc
diff --git a/v3/docs/make_visualizations.md b/v3/docs/make_visualizations.md
@@ -17,7 +17,7 @@ Calling this again will rebuild everything. Alternatively, the program can be us
 
     python $OPT/make_visualizations.py make_viz.json file1.html file3.html
 
-For the example we assume the `.html` files are `file1.html`, `file2.html` and `file3.html` and that `file1.html` will have visualizations for `prog1_1.py` and `prog1_2.py`; `file2.html` will have a visualization for `prog2_1.py`; and `file3.html` will have a visualization for `prog3_1.py`. Further we assume that a local OPT server has been set up (see the following section) at the URL http://my.local.server/visualize.html.
+For the example we assume the `.html` files are `file1.html`, `file2.html` and `file3.html` and that `file1.html` will have visualizations for `prog1_1.py` and `prog1_2.py`; `file2.html` will have a visualization for `prog2_1.py`; and `file3.html` will have a visualization for `prog3_1.py`. Further we assume that a local OPT server has been set up at the URL http://my.local.server/visualize.html.
 
 The following is a possible example for `make_viz.json`
 
diff --git a/v3/make_visualizations.py b/v3/make_visualizations.py
@@ -391,17 +391,17 @@ def make_html_viz(prog, html_file, html_info):
     if end_head_pos == -1:
         print "Could not find '\n</head>' in {0}".format(html_file)
         return
-    # add the updated dependency info just before </head>
-    html_text = html_text[:end_head_pos] + PY_TUTOR_DEPEND + \
-        html_text[end_head_pos:]
 
     # all_divs is the string of all div entries to embed in the html
     # this is added to the header comments for easy cut and pasting
     # to the correct location in the document.
     all_divs = '\n'.join(DIV_TEXT.format(get_vizname_root(py)) for py in py_dict)
-
+    # add the updated dependency info just before </head>
+    html_text = html_text[:end_head_pos] +\
+        PY_TUTOR_DEPEND.format(js_out, all_divs) + \
+        html_text[end_head_pos:]
     fd = open(html_file, 'w')
-    fd.write(html_text.format(js_out, all_divs))
+    fd.write(html_text)
     fd.close()
     
 
