From a82db79fcf12e4a414c0a0862ed38b9e3a964c70 Mon Sep 17 00:00:00 2001 From: Christopher Powell Date: Tue, 10 Dec 2002 20:37:29 +0000 Subject: *** empty log message *** --- diff --git a/Documentation/README b/Documentation/README index df96ba1..349b0ac 100644 --- a/Documentation/README +++ b/Documentation/README @@ -1,6 +1,13 @@ -$Id: README,v 1.1 2002/11/14 22:52:56 helios Exp $ +$Id: README,v 1.2 2002/12/10 20:37:29 helios Exp $ The "original" document is the LyX file "documentation.lyx" -- all other files here are derived from it. The most visually accurate document and the one I'd recommend reading is the PostScript (.ps) file, although a whole host of formats are made available here to suit your preference. + +To read the HTML docs, open HTML/documentation.html in your browser. +To read the .dvi file, use Xdvi or kdvi. +To read the .ps file, use gv or kghostview. +To read the .lyx file, use LyX. +To read the .txt file, use less. + diff --git a/Makefile b/Makefile index 6f69b50..eb4ffdf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 2002/12/10 19:43:21 helios Exp $ +# $Id: Makefile,v 1.19 2002/12/10 20:37:28 helios Exp $ ########################################################################### # Important: @@ -12,19 +12,19 @@ APXS = $(APACHEINST)/bin/apxs MYSQLLIBS = /usr/lib MYSQLHDRS = /usr/include/mysql -#MODSSLHDRS = /usr/local/src/apache_1.3.27-dso/src/modules/ssl -#DB1HDRS = /usr/include/db1 +MODSSLHDRS = /usr/local/src/apache_1.3.27-dso/src/modules/ssl +DB1HDRS = /usr/include/db1 ########################################################################### # Don't uncomment this without reading the "Optimizing for a busy database" # section in the documentation (under "Advanced logging scenarios"). -MYSQLDELAYED = -DWANT_DELAYED_MYSQL_INSERT +#MYSQLDELAYED = -DWANT_DELAYED_MYSQL_INSERT ########################################################################### # Rarely if ever have to touch below here. -MLMVERS = 1.18 +MLMVERS = 1.18pre1 #APXSGDB = -Wc,-g APXSOPTS = -Wc,-O2 -Wc,-Wall STATOPTS = -fpic -O2 -Wall @@ -34,8 +34,8 @@ RM = /bin/rm LYX = /usr/bin/lyx LATEX = /usr/bin/latex DVIPS = /usr/bin/dvips -LINKS = /usr/bin/links -L2H = /usr/local/bin/latex2html +LINKS = /usr/bin/lynx +L2H = /usr/bin/latex2html WEBSERV = gw0.corp STATFLAGS = -I$(APACHEINST)/include @@ -87,6 +87,9 @@ distro: documentation @cd ..; tar zcf mod_log_sql-$(MLMVERS).tar.gz --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.gz $(WEBSERV):$(APACHEINST)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.gz @ssh $(WEBSERV) "ln -sf mod_log_sql-$(MLMVERS).tar.gz $(APACHEINST)/html/mod_log_sql/mod_log_sql.tar.gz" +pre-distro: documentation + @cd ..; tar zcf mod_log_sql-$(MLMVERS).tar.gz --exclude mod_log_sql/CVS --exclude mod_log_sql/Documentation/CVS --exclude mod_log_sql/Documentation/HTML/CVS --exclude ".directory" mod_log_sql/; scp mod_log_sql-$(MLMVERS).tar.gz $(WEBSERV):$(APACHEINST)/html/mod_log_sql/; rm -f mod_log_sql-$(MLMVERS).tar.gz + documentation: Documentation/documentation.lyx @echo "Creating LaTeX docs..." @$(LYX) --export latex Documentation/documentation.lyx 2>/dev/null @@ -102,7 +105,7 @@ documentation: Documentation/documentation.lyx @$(L2H) -local_icons -show_section_numbers -split 4 -navigation -noindex_in_navigation -contents_in_navigation -dir Documentation/HTML Documentation/documentation.tex >/dev/null 2>&1 @echo "Creating plain text docs..." @$(L2H) -show_section_numbers -split 0 -dir Documentation/ Documentation/documentation.tex >/dev/null 2>&1 - @$(LINKS) -dump Documentation/documentation.html > Documentation/documentation.txt 2>/dev/null + @$(LINKS) -dump -nolist -width=120 -dump Documentation/documentation.html > Documentation/documentation.txt 2>/dev/null @echo "Cleaning up..." @$(RM) -f Documentation/*.html Documentation/WARNINGS Documentation/*.pl Documentation/*.aux Documentation/*.css Documentation/*.toc Documentation/*.log Documentation/*.old Documentation/*.png Documentation/images.tex @$(RM) -f Documentation/HTML/WARNINGS Documentation/HTML/*.pl Documentation/HTML/*.log Documentation/HTML/*.aux Documentation/HTML/*.tex Documentation/HTML/*.old Documentation/HTML/index.html diff --git a/mod_log_sql.c b/mod_log_sql.c index 117111b..d58839b 100644 --- a/mod_log_sql.c +++ b/mod_log_sql.c @@ -1,4 +1,4 @@ -/* $Id: mod_log_sql.c,v 1.20 2002/12/10 19:43:21 helios Exp $ */ +/* $Id: mod_log_sql.c,v 1.21 2002/12/10 20:37:28 helios Exp $ */ /* --------* * DEFINES * @@ -1677,46 +1677,3 @@ module sql_log_module = { #endif }; - - - -/* Make the tables if we're supposed to. */ -/* -if ((cls->table_made != 1) && (create_tables != 0)) { - result = safe_create_tables(cls, orig); - if (result != 0) - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: child attempted but failed to create one or more tables for %s", ap_get_server_name(orig)); - else - ap_log_error(APLOG_MARK,NOTICELEVEL,orig->server,"mod_log_sql: no problems creating tables for %s", ap_get_server_name(orig)); -} -*/ - -/* It failed, but NOT because table didn't exist */ -/* -if ( (result) && (result != ER_NO_SUCH_TABLE) ) - preserve_entry(orig,access_query); -*/ - -/* It failed because table didn't exist */ -/* -if (result == ER_NO_SUCH_TABLE) - if (create_tables) { - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: access table doesn't exist...creating now"); - if ((result = safe_create_tables(cls, orig))) { - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: child attempted but failed to create one or more tables for %s, preserving query", ap_get_server_name(orig)); - preserve_entry(orig,access_query); - } else { - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: table(s) successfully created - retrying insert"); - if ((result = safe_mysql_query(orig, access_query))) { - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: giving up, preserving query"); - preserve_entry(orig,access_query); - return OK; - } else - ap_log_error(APLOG_MARK_ERRLEVEL,orig->server,"mod_log_sql: insert successful after table creation"); - } - } else { - ap_log_error(APLOG_MARK,ERRLEVEL,orig->server,"mod_log_sql: access table doesn't exist...not allowed to create, giving up, preserving query"); - preserve_entry(orig,access_query); - return OK; - } -*/ -- cgit v0.9.2