# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/calvin/Desktop/gnutrition/C_Development/
# testament_sha1: 338faa86835cb45f5a34c7198c04629025894db9
# timestamp: 2016-04-24 00:35:31 -0700
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'trunk/src/createdb.c'
--- trunk/src/createdb.c	2012-09-09 05:15:19 +0000
+++ trunk/src/createdb.c	2016-04-24 07:03:56 +0000
@@ -125,6 +125,7 @@
 		cols = columns[n];
 		switch(n) {
 			case CATEGORY: {
+				ret = sqlite3_prepare_v2(db, INS_CATEGORY, strlen(INS_CATEGORY)+1, &pStmt, &pzTail); 				
 				while ((lineptr= next_line(fb)) != NULL) {
 					line_no++;
 					tokenize(lineptr, _FS_, argv, &cols);
@@ -137,7 +138,6 @@
 					print_strvec(argv);
 #endif
 
-					ret = sqlite3_prepare_v2(db, INS_CATEGORY, strlen(INS_CATEGORY)+1, &pStmt, &pzTail); 
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for CATEGORY", ret);
 						exit(1);
@@ -160,6 +160,7 @@
 				assert(line_no == fb->lines);
 			} break;
 			case FD_GROUP: {
+			        ret = sqlite3_prepare_v2(db, INS_FD_GROUP, strlen(INS_FD_GROUP)+1, &pStmt, &pzTail);
 				while ((lineptr= next_line(fb)) != NULL) {
 					tokenize(lineptr, _FS_, argv, &cols);
 					line_no++;
@@ -171,7 +172,7 @@
 					print_strvec(argv);
 #endif
 
-					ret = sqlite3_prepare_v2(db, INS_FD_GROUP, strlen(INS_FD_GROUP)+1, &pStmt, &pzTail); 
+
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for FD_GROUP", ret);
 						exit(1);
@@ -199,6 +200,7 @@
 						text_pos[] = {3,4,5,6,7,8,10}, /* text data positional info */
 						real_pos[] = {11,12,13,14}; /* real positional info */
 
+				ret = sqlite3_prepare_v2(db, INS_FOOD_DES, strlen(INS_FOOD_DES)+1, &pStmt, &pzTail); 				
 				while ((lineptr= next_line(fb)) != NULL) {
 					line_no++;
 					tokenize(lineptr, _FS_, argv, &cols);
@@ -210,7 +212,7 @@
 #ifdef VERBOSE
 					print_strvec(argv);
 #endif
-					ret = sqlite3_prepare_v2(db, INS_FOOD_DES, strlen(INS_FOOD_DES)+1, &pStmt, &pzTail); 
+
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for FOOD_DES", ret);
 						exit(1);
@@ -259,7 +261,7 @@
 				int k, int_pos[] = {1,2,10,13},  /* integer data positional info */
 						text_pos[] = {6,7,8,9,16,17}, /* text data positional info */
 						real_pos[] = {3,4,5,11,12,14,15}; /* real positional info */
-
+					ret = sqlite3_prepare_v2(db, INS_NUT_DATA, strlen(INS_NUT_DATA)+1, &pStmt, &pzTail); 
 				while ((lineptr= next_line(fb)) != NULL) {
 					line_no++;
 					tokenize(lineptr, _FS_, argv, &cols);
@@ -271,7 +273,7 @@
 #ifdef VERBOSE
 					print_strvec(argv);
 #endif
-					ret = sqlite3_prepare_v2(db, INS_NUT_DATA, strlen(INS_NUT_DATA)+1, &pStmt, &pzTail); 
+
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for NUT_DATA", ret);
 						exit(1);
@@ -318,6 +320,7 @@
 				char *s;
 				int k, int_pos[] = {1,5,6},  /* integer data positional info */
 						text_pos[] = {2,3,4}; /* text data positional info */
+				ret = sqlite3_prepare_v2(db, INS_NUTR_DEF, strlen(INS_NUTR_DEF)+1, &pStmt, &pzTail); 
 				while ((lineptr= next_line(fb)) != NULL) {
 					line_no++;
 					tokenize(lineptr, _FS_, argv, &cols);
@@ -329,7 +332,7 @@
 #ifdef VERBOSE
 					print_strvec(argv);
 #endif
-					ret = sqlite3_prepare_v2(db, INS_NUTR_DEF, strlen(INS_NUTR_DEF)+1, &pStmt, &pzTail); 
+
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for NUTR_DEF", ret);
 						exit(1);
@@ -369,18 +372,19 @@
 				int k, int_pos[] = {1,2,6},		/* integer data positional info */
 						text_pos = 4,
 					    real_pos[] = {3,5,7};  
-				while ((lineptr= next_line(fb)) != NULL) {
-					line_no++;
-					tokenize(lineptr, _FS_, argv, &cols);
-					if (cols != columns[n]) {
-						fprintf(stderr, ERR_FMT, func, cols, columns[n],
-											line_no, datafiles[n]);
-					}
-					cols = columns[n];
-#ifdef VERBOSE
-					print_strvec(argv);
-#endif
 					ret = sqlite3_prepare_v2(db, INS_WEIGHT, strlen(INS_WEIGHT)+1, &pStmt, &pzTail); 
+				while ((lineptr= next_line(fb)) != NULL) {
+					line_no++;
+					tokenize(lineptr, _FS_, argv, &cols);
+					if (cols != columns[n]) {
+						fprintf(stderr, ERR_FMT, func, cols, columns[n],
+											line_no, datafiles[n]);
+					}
+					cols = columns[n];
+#ifdef VERBOSE
+					print_strvec(argv);
+#endif
+
 					if (ret != SQLITE_OK) {
 						fprintf(stderr,SQLITE_EMESG, "sqlite3_prepare_v2 for WEIGHT", ret);
 						exit(1);

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRH1k2YAAmBfgHSweW///3/n
/yq////6UAU6nszAWswpVkUcJKIVPwTTU8gyGJPQRo0g9IZNG0jQ0ZMmmmQHMJoDQGjRhGgxGmJk
xNBhGgZAMmAkUTFNNDSntT0U9QeiGjTIekAABo0NDQ2oaHMJoDQGjRhGgxGmJkxNBhGgZAMmAkkC
aaAmE0mJNNTQaPUeoG0gZNAAA09TJJCo2xJDKCUDaV/Pt8+/KJG+KOLb7OOmKDxuqEDt/poiy2RD
hmrzURrAxBExEOaYz6H7gQQNefcb4TkoMCrpWy0JHH0bNz5Z22hcvIkaOaVMxU5XyM84LO6OLoyr
TCUiAVDJSzun5zYkZsjRr5C6M3tOTcINcuqNIG+VJRnu9NU0x4a0fUWIgQsuaopxOky6ue/hm2I5
hWEALCh9t9EjWefcrlwdfb09fVzbaX/15MCq4jlee3kWItlQzupuR9k08808C7w3xa/FcKq0hu38
/gzeE03m0qxLyDdpW7KVC1sGw7TWrJC2kkEpQFijjjviwimjWrBbFFb0cEQwJRVa2HCTjagoyANY
aoQ3ka+Lj0FOUwc9xWkyY8GuMymdSxWV0O+2vZFwqxhivy+9EL9HNGw3Zai4KRdI35dgnWYfehNN
JlCtXnQKnxTqITczF2D38zJ4bYCu10sKl1huMZaWaOV5JiAxOqGimKlVQTG41ZaitvITMLmHFBcn
K4Vdw+8mdAcQxizbDEyysrtukyjah4bPeuBZtwmLWy0Gs099cAiGybWO7OsVjUFynoPzi4doYOnv
grC2qSdfqCjOUmYk6c13RxvdKp8zo0vuhB1k7YlUfUFcLHVBaTCtpT64unO9ZcJjHZWVjpZSGWE7
guiUgnNyHIQfgZstYtjA9lbPmNtYiuqVlFDDR1a9SWgOM7DsIjKxnNxec4GL9nkPLgwlh/M8TCVi
YyPrbbbbew8/fjdh6RFVYYkT/D48yhmYRGqMiTx9CvvEeVHf6AtD1ojMYJ0PoDrDBXkDgPHMSeOD
jLxOBmNgoeh1OgNXuZx756Xtk7TCxarOAuScIYEcCWTn5eDDDBMLBimQtTW9CkpZNfUY5o1vAYsR
jl5PWPmP4i5uJJbdylpTFjKG285T7yGosYyv8/uMLqV5si0cjJwjL2mnFLMTLzJlbqvl28i4ufJd
tpI85H1Q2C6NOXSOOURN+TVwsekq+kxuFlAYna7BourmFC8XiOWwxjBfcxGdFTx8+HTkzq5f5tho
ZX3NMgXSVHjVeL6xjUi6S5IYnJo8sJCiITAihTrxJld15SILZCDPUWjh5V2xbjTf79RqGOQTpROP
6hREUv+SO0IHjSxDkGwU9eQLogTM6ehNDb4etp0zgteNWskhDDbnDdSnnN2rC7QEAPizUOucST4c
TPp4h4AWYVhW4HoxQzg5Sz5erQ7RXaN8lWBew2qrskUtxLKokspdEvpYpyI6UTKIifYT5weSuugU
chg2Sd9VV5iUe+DmNNotCC/AardNxnewlDiATCB2NvkY3qYeQLV1vUZ7uwO5D8wOLmTRMuE30fvF
I6rq50PIK1Gq5i5CwE2mUytM5wd0pJTTJbgO/1sY4eHIsCZdnQvRFNmJQhGTTuVIKWkiNTXUoyro
Ru6oW7bMeoHgXBmlmFw2EDdqByJuwijnq/pRki4Hu5pnZhiKD0RtNKnBDfq8vPOh3RaE1wHIczFT
LtC9wPW269M6q72Rai1FOtdQqQDpgGwchYiiFxXNxW9zWJOkjXFTznXJhdyRThQkBH1k2YA=