svn commit: r366420 - in /httpd/mod_mbox/branches/surgery: ./ include/ src/libmbox/ src/mod-mbox-util/ src/module/

[ma...@apache.org]

Author: maxime
Date: Thu Jan  5 20:26:11 2006
New Revision: 366420

URL: http://svn.apache.org/viewcvs?rev=366420&view=rev
Log:
Everything build and run succesfully. libmime is still to be done.


Added:
    httpd/mod_mbox/branches/surgery/include/libmbox.h
      - copied, changed from r366415, httpd/mod_mbox/branches/surgery/src/libmbox/libmbox.h
Removed:
    httpd/mod_mbox/branches/surgery/src/libmbox/libmbox.h
    httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.h
    httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.h
Modified:
    httpd/mod_mbox/branches/surgery/Makefile.am
    httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.c
    httpd/mod_mbox/branches/surgery/src/libmbox/mbox_parse.c
    httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c
    httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am
    httpd/mod_mbox/branches/surgery/src/mod-mbox-util/mod-mbox-util.c
    httpd/mod_mbox/branches/surgery/src/module/Makefile.am
    httpd/mod_mbox/branches/surgery/src/module/mod_mbox.h

Modified: httpd/mod_mbox/branches/surgery/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/Makefile.am?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/Makefile.am Thu Jan  5 20:26:11 2006
@@ -8,4 +8,4 @@
              README \
              STATUS
 
-SUBDIRS = src/module src/libmbox src/libmime src/mod-mbox-util
+SUBDIRS = src/libmbox src/libmime src/mod-mbox-util src/module

Copied: httpd/mod_mbox/branches/surgery/include/libmbox.h (from r366415, httpd/mod_mbox/branches/surgery/src/libmbox/libmbox.h)
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/include/libmbox.h?p2=httpd/mod_mbox/branches/surgery/include/libmbox.h&p1=httpd/mod_mbox/branches/surgery/src/libmbox/libmbox.h&r1=366415&r2=366420&rev=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/libmbox.h (original)
+++ httpd/mod_mbox/branches/surgery/include/libmbox.h Thu Jan  5 20:26:11 2006
@@ -51,6 +51,8 @@
 #define MBOX_SORT_THREAD 2
 #define MBOX_SORT_REVERSE_DATE 3
 
+#define MBOX_CACHE_VERSION 0x2
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -217,6 +219,20 @@
 APR_DECLARE(apr_status_t)
 mbox_cache_get_count(mbox_cache_info* mli, int *count, char* path);
 
+APR_DECLARE(void)
+mbox_cache_close(mbox_cache_info* mli);
+
+APR_DECLARE(apr_status_t)
+mbox_cache_update(mbox_cache_info** mli,
+                        const char* path, apr_pool_t* p,
+                        char* list, char* domain);
+
+APR_DECLARE(apr_status_t)
+mbox_cache_set_count(mbox_cache_info* mli, int count, char* path);
+
+APR_DECLARE(apr_status_t)
+mbox_cache_touch(mbox_cache_info* mli);
+
 /** mbox_sort **/
 void *mbox_sort_linked_list(void *p, unsigned index,
      int (*compare)(void *, void *, void *), void *pointer,
@@ -242,6 +258,15 @@
 char* mbox_get_list_post(request_rec *r, char* path);
 
 /** mbox_search **/
+apr_status_t mbox_indexer_init(mbox_indexer_t** ctx, const char* path,
+                               apr_pool_t* pool);
+
+apr_status_t mbox_indexer_optimize(mbox_indexer_t* ctx);
+
+apr_status_t mbox_indexer_close(mbox_indexer_t* ctx);
+
+apr_status_t mbox_indexer_add(mbox_indexer_t* ctx, mbox_search_doc_t* doc);
+
 typedef int (query_callback_fn_t)(void* baton, int position,
                                   mbox_search_doc_t* rdoc);
 

Modified: httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.c?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.c (original)
+++ httpd/mod_mbox/branches/surgery/src/libmbox/mbox_cache.c Thu Jan  5 20:26:11 2006
@@ -20,7 +20,6 @@
  */
 
 #include "libmbox.h"
-#include "mbox_cache.h"
 
 #define LIST_DB_NAME "listinfo.db"
 

Modified: httpd/mod_mbox/branches/surgery/src/libmbox/mbox_parse.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmbox/mbox_parse.c?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/mbox_parse.c (original)
+++ httpd/mod_mbox/branches/surgery/src/libmbox/mbox_parse.c Thu Jan  5 20:26:11 2006
@@ -31,8 +31,8 @@
  * of slightly different mbox formats (of which there are a few).
  */
 
+#include "libmbox.h"
 #include "mbox_parse.h"
-#include "mbox_search.h"
 
 /* FIXME: Remove this when apr_date_parse_rfc() and ap_strcasestr() are fixed ! */
 #include "mbox_externals.h"

Modified: httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c (original)
+++ httpd/mod_mbox/branches/surgery/src/libmbox/mbox_search.c Thu Jan  5 20:26:11 2006
@@ -29,7 +29,8 @@
 #include "apr.h"
 #include "apr_strings.h"
 #include "apr_thread_proc.h"
-#include "mbox_search.h"
+
+#include "libmbox.h"
 
 apr_status_t mbox_indexer_init(mbox_indexer_t** ctx_, const char* path,
                                apr_pool_t* p)

Modified: httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/mod-mbox-util/Makefile.am Thu Jan  5 20:26:11 2006
@@ -1,8 +1,9 @@
 # mod-mbox-util
 
 mod_mbox_util_SOURCES = mod-mbox-util.c
-mod_mbox_util_LDADD = libmbox.la
+mod_mbox_util_LDADD = $(top_builddir)/src/libmbox/libmbox.la
 mod_mbox_util_CFLAGS = -Wall ${MODULE_CFLAGS}
 mod_mbox_util_LDFLAGS =  -avoid-version ${BIN_LDFLAGS}
 
 bin_PROGRAMS = mod-mbox-util
+

Modified: httpd/mod_mbox/branches/surgery/src/mod-mbox-util/mod-mbox-util.c
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/mod-mbox-util/mod-mbox-util.c?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/mod-mbox-util/mod-mbox-util.c (original)
+++ httpd/mod_mbox/branches/surgery/src/mod-mbox-util/mod-mbox-util.c Thu Jan  5 20:26:11 2006
@@ -16,16 +16,16 @@
 
 #define CORE_PRIVATE
 #include "httpd.h"
+
 #include "apr_pools.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "mbox_cache.h"
-#include "mbox_parse.h"
-#include "mbox_search.h"
 #include "apr_getopt.h"
 #include "apr_date.h"
 #include "apr_lib.h"
 #include "apr_fnmatch.h"
+
+#include "libmbox.h"
 
 #define NL APR_EOL_STR
 

Modified: httpd/mod_mbox/branches/surgery/src/module/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/module/Makefile.am?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/module/Makefile.am (original)
+++ httpd/mod_mbox/branches/surgery/src/module/Makefile.am Thu Jan  5 20:26:11 2006
@@ -9,9 +9,10 @@
   mod_mbox_cte.c    \
   mod_mbox_mime.c
 
-mod_mbox_la_LIBADD = libmbox.la libmime.la
+mod_mbox_la_LIBADD = $(top_builddir)/src/libmbox/libmbox.la
 mod_mbox_la_CFLAGS = -Wall ${MODULE_CFLAGS}
 mod_mbox_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULES_LDFLAGS}
 
 pkglib_LTLIBRARIES = mod_mbox.la
 pkginclude_HEADERS = mod_mbox.h
+

Modified: httpd/mod_mbox/branches/surgery/src/module/mod_mbox.h
URL: http://svn.apache.org/viewcvs/httpd/mod_mbox/branches/surgery/src/module/mod_mbox.h?rev=366420&r1=366419&r2=366420&view=diff
==============================================================================
--- httpd/mod_mbox/branches/surgery/src/module/mod_mbox.h (original)
+++ httpd/mod_mbox/branches/surgery/src/module/mod_mbox.h Thu Jan  5 20:26:11 2006
@@ -35,9 +35,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "mbox_cache.h"
-#include "mbox_parse.h"
-#include "mbox_thread.h"
+#include "libmbox.h"
 
 #ifndef MOD_MBOX_H
 #define MOD_MBOX_H