From f7727ae4c61b3efea3ddde3c5643566d7cbc6cc0 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 22 Apr 2016 11:08:02 -0700
Subject: [PATCH] Add markers for testing

These added markers show which code needs to be commented out for the new code to work properly.
---
 DATabase/Generate.cs | 4 +++-
 DATabase/Import.cs   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DATabase/Generate.cs b/DATabase/Generate.cs
index 2c4bae9a..3bc58e5a 100644
--- a/DATabase/Generate.cs
+++ b/DATabase/Generate.cs
@@ -184,6 +184,7 @@ namespace SabreTools
 			bool srcmerged = (_sources == "" || _sources.Split(',').Length > 1);
 			bool merged = sysmerged || srcmerged;
 
+			// BEGIN COMMENT
 			string query = @"
 SELECT DISTINCT systems.manufacturer AS manufacturer, systems.system AS system, systems.id AS systemid,
 	sources.name AS source, sources.url AS url, sources.id AS sourceid,
@@ -261,9 +262,10 @@ JOIN checksums
 				roms = RomManipulation.Merge(roms, true);
 				RomManipulation.Sort(roms, _norename);
 			}
+			// END COMMENT
 
 			/*
-			// This block would replace the whole block above from 'string query' on to 'if (merged)'
+			// This block would replace the whole block above between BEGIN COMMENT and END COMMENT
 			string query = @"
 SELECT hash.id AS id, hash.size AS size, hash.crc AS crc, hash.md5 AS md5, hash.sha1 AS sha1,
 	hashdata.key AS key, hashdata.value AS value,
diff --git a/DATabase/Import.cs b/DATabase/Import.cs
index 0d2cac2e..eb8643ba 100644
--- a/DATabase/Import.cs
+++ b/DATabase/Import.cs
@@ -410,6 +410,7 @@ namespace SabreTools
 				dbc.Open();
 				foreach (RomData rom in roms)
 				{
+					// BEGIN COMMENT
 					// If we have a new game, check for a new ID
 					if (rom.Game != lastgame)
 					{
@@ -419,6 +420,7 @@ namespace SabreTools
 
 					// Try to add the rom with the game information
 					AddRom(rom, gameid, date, dbc);
+					// END COMMENT
 
 					/*
 					// Try to add the romdata