X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=860409e41a99ea0e6a7a06f3ed4b756344f6c3fe;hp=b1003bf2325c47b6bcf9ca68c5d3a94e4e99eede;hb=23f08e0abdbd5212e4a867c80f7833e4ebcbb1cf;hpb=8aaade51e5904619daf638d496ce1162138d940f

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index b1003bf..860409e 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -5,20 +5,26 @@
 
 #define DEBUG_FLAG_LIST				\
    DF(sql)					\
-   DF(value)
+   DF(sql2)					\
+   DF(value)					\
+   DF(lp)
+#define debug stdout
+
+#include "common.h"
 
 
-#define SQL_MUST( call ) ({					 \
+#define SQL_MUST( call ) ({						 \
     /* `call' is an expression returning result, using  const char *sqe; \
      * chk1 and chk2 are blocks using sqe and  int sqr; */		 \
     const char *sql_must_call_string= #call;				 \
     int sqr;								 \
-    if (DEBUGP(sql)) fprintf(stderr,"SQL %s", sql_must_call_string);	 \
+    if (DEBUGP(sql2)) fprintf(stderr,"SQL %s", sql_must_call_string);	 \
     sqr= (call);							 \
-    if (DEBUGP(sql)) fprintf(stderr," = %d\n", sqr);			 \
-    if (sqr) fatal("SQL call failed code %d: %s: %s",			 \
-		   sqr, sqlite3_errmsg(db), sql_must_call_string);	 \
-  })
+    if (DEBUGP(sql2)) fprintf(stderr," = %d\n", sqr);			 \
+    if (sqr) sql_fatal("(unknown)", sqr, sql_must_call_string);		 \
+  })									 \
+
+void sql_fatal(const char *stmt_what, int sqr, const char *act_what) NORET;
 
 #define SQL_STEP(ssh) (sql_step_wrap((ssh), #ssh, __FILE__, __LINE__))
 int sql_step_wrap(sqlite3_stmt *ssh, const char *ssh_string,
@@ -26,14 +32,19 @@ int sql_step_wrap(sqlite3_stmt *ssh, const char *ssh_string,
 
 int sql_single_int(const char *stmt);
 
-#define MAX_ROUTELEN 20
+#define SQL_PREPARE(ss,stmt) ((ss)= sql_prepare((stmt),#ss))
+sqlite3_stmt *sql_prepare(const char *stmt, const char *what);
 
-#include "common.h"
+#define SQL_BIND(ss,index,value) (sql_bind((ss),(index),(value),#ss,#value))
+void sql_bind(sqlite3_stmt *ss, int index, int value,
+	      const char *ss_what, const char *val_what);
+
+#define MAX_ROUTELEN 20
 
 extern sqlite3 *db;
 
 void setup(void);
-void value_route(int nislands, const int *islands);
+double value_route(int nislands, const int *islands);
 void setup_value(void);
 void setup_commods(void);