comparison nist_wrapper.py @ 12:3a69874edaf7

small fix

11:a62374fcee9c

        
    # kill process:
    #p.terminate() - not needed, nistm$ will terminate...nistms.exe is the one that 
    #stays open...and orphan..killing it:
    
    utils.log_message(log_file, "killing wine process...")
    if is_wine:
#         pid = utils.get_process_pid("nistms.exe")
#         os.kill(pid, 9)
        os.killpg(pro.pid, 9)    
    else:

    html_file = open(output_html_report,'w')
    html_render = ReportGenerator(os.path.dirname(__file__), 'templates/main_template.html',hits_dict, spectra_dict)
    html_render.render(html_file)
    # copy necessary .js files as well:
    templates_folder = os.path.dirname(__file__) + '/templates/'
    utils.copy_file(templates_folder + 'spectrum_gen.js', output_html_report_files_path+"/spectrum_gen.js")
    utils.copy_dir(templates_folder + 'lib', output_html_report_files_path+'/lib' )
    utils.copy_dir(templates_folder + 'images', output_html_report_files_path+'/images' )
    
    html_file.close()

     
     

12:3a69874edaf7

        
    # kill process:
    #p.terminate() - not needed, nistm$ will terminate...nistms.exe is the one that 
    #stays open...and orphan..killing it:
    
    if is_wine:
#         pid = utils.get_process_pid("nistms.exe")
#         os.kill(pid, 9)
        os.killpg(pro.pid, 9)    
    else:

    html_file = open(output_html_report,'w')
    html_render = ReportGenerator(os.path.dirname(__file__), 'templates/main_template.html',hits_dict, spectra_dict)
    html_render.render(html_file)
    # copy necessary .js files as well:
    templates_folder = os.path.dirname(__file__) + '/templates/'
    #utils.copy_file(templates_folder + 'spectrum_gen.js', output_html_report_files_path+"/spectrum_gen.js")
    #utils.copy_dir(templates_folder + 'lib', output_html_report_files_path+'/lib' )
    #utils.copy_dir(templates_folder + 'images', output_html_report_files_path+'/images' )
    utils.copy_dir(templates_folder, output_html_report_files_path)
    
    html_file.close()