Add "recipe_normal" delimiter to CSV conversion

editor/toCSV.js

@@ -20,7 +20,7 @@ for (var i = 0 ; i < recipesList.length ; i++){
 //===============================================
 // turns the recipe database into a csv
 
-var headerRow = "id,name,type,wiki_link,category,time,yield,ingredients";
+var headerRow = "id,name,type,wiki_link,category,recipe_normal,time,yield,ingredients...";
 
 
 
@@ -33,7 +33,12 @@ for (var i = 0 ; i < recipesList.length ; i++){
 		recipesList[i].name + "," +
 		recipesList[i].type + "," +
 		recipesList[i].wiki_link + "," +
-		recipesList[i].category + "," +
+		recipesList[i].category
+
+
+
+	//add the normal recipe
+	row += "," + "recipe_normal" + "," + 
 		recipesList[i].recipe.time + "," +
 		recipesList[i].recipe["yield"];
 

editor/toJSON.js

@@ -24,12 +24,13 @@ for (var i = 1 ; i < csvRows.length ; i++){		//note: skip the first as it is the
 
 	if (rowSplit.length >= 5){
 		//entry is greater than 5 columns, has a recipe, otherwise leave blank
-		recipeItem.recipe.time = parseFloat(rowSplit[5]);
-		recipeItem.recipe["yield"] = parseFloat(rowSplit[6]);
+		//recipeItem.recipeType = rowSplit[5];			//the delimiter for a normal recipe list
+		recipeItem.recipe.time = parseFloat(rowSplit[6]);
+		recipeItem.recipe["yield"] = parseFloat(rowSplit[7]);
 
 		//the rest of the row is ingredients, turn into list
 		recipeItem.recipe.ingredients = [];
-		for (var j = 7 ; j < rowSplit.length ; j++){
+		for (var j = 8 ; j < rowSplit.length ; j++){
 			if (rowSplit[j].split(":").length !=2){
 				continue;
 			}
@@ -61,7 +62,7 @@ for (var i = 1 ; i < csvRows.length ; i++){		//note: skip the first as it is the
 //===============================================
 // output to file
 
-
+console.log("Total recipes parsed: " + jsonList.length);
 writeToFile("recipes_csv_converted.json", JSON.stringify(jsonList, null, 4));