mysql code separation complete..

1 files changed, 28 insertions, 6 deletions

diff --git a/mod_log_sql.h b/mod_log_sql.h
index 0c59cb7..1eed9b4 100644
--- a/mod_log_sql.h
+++ b/mod_log_sql.h
@@ -1,4 +1,4 @@
-/* $Id: mod_log_sql.h,v 1.4 2004/02/29 23:36:18 urkle Exp $ */
+/* $Id: mod_log_sql.h,v 1.5 2004/03/02 05:34:50 urkle Exp $ */
 
 #ifndef MOD_LOG_SQL_H
 #define MOD_LOG_SQL_H
@@ -31,12 +31,11 @@ LOGSQL_DECLARE(void) log_sql_register_item(server_rec *s, apr_pool_t *p,
                 char key, logsql_item_func *func, const char *sql_field_name,
                 int want_orig_default, int string_contents);
 
-/* DB Connection structure holds connection status information
- * and connection handle
- */
+/* DB Connection structure holds connection handle */
 typedef struct {
         int connected; /* Are we connected to the DB */
         void *handle; /* DB specific connection pointer */
+        apr_table_t *parms; /* DB connection parameters */
 } logsql_dbconnection;
 
 /* open db handle return values*/
@@ -45,9 +44,22 @@ typedef enum {
         LOGSQL_OPENDB_SUCCESS,
         LOGSQL_OPENDB_ALREADY,
         LOGSQL_OPENDB_PRESERVE
-} logsql_opendb;
+} logsql_opendb_ret;
+
+typedef enum {
+        LOGSQL_QUERY_SUCCESS = 0,
+        LOGSQL_QUERY_FAIL,
+        LOGSQL_QUERY_NOLINK,
+        LOGSQL_QUERY_NOTABLE,
+        LOGSQL_QUERY_PRESERVED,
+} logsql_query_ret;
 
-/* For passing to create_tables handler */
+typedef enum {
+        LOGSQL_TABLE_SUCCESS = 0,
+        LOGSQL_TABLE_FAIL,
+} logsql_table_ret;
+
+/* Table type to create/log to */
 typedef enum {
         LOGSQL_TABLE_ACCESS = 0,
         LOGSQL_TABLE_NOTES,
@@ -60,5 +72,15 @@ typedef enum {
 #define LOGSQL_TABLE_ALL LOGSQL_TABLE_ACCESS | LOGSQL_TABLE_NOTES | \
         LOGSQL_TABLE_HEADERSIN | LOGSQL_TABLE_HEADERSOUT | LOGSQL_TABLE_COOKIES
 
+/* MySQL module calls */
+logsql_opendb_ret log_sql_mysql_connect(server_rec *s, logsql_dbconnection *db);
+void log_sql_mysql_close(logsql_dbconnection *db);
+const char *log_sql_mysql_escape(const char *from_str, apr_pool_t *p, 
+                                                                logsql_dbconnection *db);
+logsql_query_ret log_sql_mysql_query(request_rec *r,logsql_dbconnection *db,
+                                                                const char *query);
+logsql_table_ret log_sql_mysql_create(request_rec *r, logsql_dbconnection *db,
+                                                logsql_tabletype table_type, const char *table_name);
+
 
 #endif /* MOD_LOG_SQL_H */