From 6e3d52901a70e166695fc37d896d537d0c741fa0 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 15 Jan 2016 16:47:05 -0500
Subject: [PATCH] Vanilla importer: add an option for whether vanilla_mysql.rb
 should convert html markup into literals

---
 script/import_scripts/vanilla_mysql.rb | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index 257f4ef3918..13237e7b87f 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -7,6 +7,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
   VANILLA_DB = "vanilla_mysql"
   TABLE_PREFIX = "GDN_"
   BATCH_SIZE = 1000
+  CONVERT_HTML = true
 
   def initialize
     super
@@ -189,17 +190,19 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     # [SAMP]...[/SAMP]
     raw.gsub!(/\[\/?samp\]/i, "`")
 
-    # replace all chevrons with HTML entities
-    # NOTE: must be done
-    #  - AFTER all the "code" processing
-    #  - BEFORE the "quote" processing
-    raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-             .gsub("<", "&lt;")
-             .gsub("\u2603", "<")
+    unless CONVERT_HTML
+      # replace all chevrons with HTML entities
+      # NOTE: must be done
+      #  - AFTER all the "code" processing
+      #  - BEFORE the "quote" processing
+      raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
+               .gsub("<", "&lt;")
+               .gsub("\u2603", "<")
 
-    raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-             .gsub(">", "&gt;")
-             .gsub("\u2603", ">")
+      raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
+               .gsub(">", "&gt;")
+               .gsub("\u2603", ">")
+    end
 
     # [URL=...]...[/URL]
     raw.gsub!(/\[url="?(.+?)"?\](.+)\[\/url\]/i) { "[#{$2}](#{$1})" }