popfile-commit

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13716/Classifier

Modified Files:
	popfile.sql 
Log Message:
A new configuration value for the IMAP module: use_multiple_connections.

Index: popfile.sql
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/popfile.sql,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** popfile.sql	29 Apr 2006 09:07:15 -0000	1.28
--- popfile.sql	1 Dec 2007 22:36:31 -0000	1.29
***************
*** 114,118 ****
  --
  -- buckets - the table that stores the name of POPFile buckets and relates
! --           them to users. 
  --
  -- Note: A single user may have multiple buckets, but a single bucket only has
--- 114,118 ----
  --
  -- buckets - the table that stores the name of POPFile buckets and relates
! --           them to users.
  --
  -- Note: A single user may have multiple buckets, but a single bucket only has
***************
*** 135,139 ****
  -- ---------------------------------------------------------------------------
  --
! -- words - the table that creates a unique ID for a word.  
  --
  -- Words and buckets come together in the matrix table to form the corpus of
--- 135,139 ----
  -- ---------------------------------------------------------------------------
  --
! -- words - the table that creates a unique ID for a word.
  --
  -- Words and buckets come together in the matrix table to form the corpus of
***************
*** 162,171 ****
                                                 -- or written
                       unique (wordid, bucketid) -- each word appears once in a
!                                                -- bucket 
                     );
  
  -- ---------------------------------------------------------------------------
  --
! -- user_template - the table of possible parameters that a user can have.  
  --
  -- For example in the users table there is just an password associated with
--- 162,171 ----
                                                 -- or written
                       unique (wordid, bucketid) -- each word appears once in a
!                                                -- bucket
                     );
  
  -- ---------------------------------------------------------------------------
  --
! -- user_template - the table of possible parameters that a user can have.
  --
  -- For example in the users table there is just an password associated with
***************
*** 185,189 ****
                                                      -- for parameter
                            unique (name)             -- parameter name's are
!                                                     -- unique 
                          );
  
--- 185,189 ----
                                                      -- for parameter
                            unique (name)             -- parameter name's are
!                                                     -- unique
                          );
  
***************
*** 198,202 ****
                                                    -- entry
                            userid integer,         -- a user
!                           utid integer,           -- points to an entry in 
                                                    -- user_template
                            val varchar(255),       -- value for the
--- 198,202 ----
                                                    -- entry
                            userid integer,         -- a user
!                           utid integer,           -- points to an entry in
                                                    -- user_template
                            val varchar(255),       -- value for the
***************
*** 205,212 ****
                                                    -- instance of each parameter
                          );
!  
  -- ---------------------------------------------------------------------------
  --
! -- bucket_template - the table of possible parameters that a bucket can have.  
  --
  -- See commentary for user_template for an explanation of the philosophy
--- 205,212 ----
                                                    -- instance of each parameter
                          );
! 
  -- ---------------------------------------------------------------------------
  --
! -- bucket_template - the table of possible parameters that a bucket can have.
  --
  -- See commentary for user_template for an explanation of the philosophy
***************
*** 220,225 ****
                                def varchar(255),        -- the default value for
                                                         -- the parameter
!                               unique (name)            -- parameter names 
!                                                        -- are unique 
                              );
  
--- 220,225 ----
                                def varchar(255),        -- the default value for
                                                         -- the parameter
!                               unique (name)            -- parameter names
!                                                        -- are unique
                              );
  
***************
*** 238,246 ****
                         unique (account)               -- Each account appears
                                                        -- once
!                      ); 
  
  -- ---------------------------------------------------------------------------
  --
! -- bucket_params - the table that relates buckets with bucket parameters 
  --                 (as defined in bucket_template) and specific values.
  --
--- 238,246 ----
                         unique (account)               -- Each account appears
                                                        -- once
!                      );
  
  -- ---------------------------------------------------------------------------
  --
! -- bucket_params - the table that relates buckets with bucket parameters
  --                 (as defined in bucket_template) and specific values.
  --
***************
*** 250,259 ****
                                                        -- entry
                              bucketid integer,         -- a bucket
!                             btid integer,             -- points to an entry in 
                                                        -- bucket_template
                              val varchar(255),         -- value for the
                                                        -- parameter
!                             unique (bucketid, btid)   -- each bucket has just 
!                                                       -- one instance of each 
                                                        -- parameter
                          );
--- 250,259 ----
                                                        -- entry
                              bucketid integer,         -- a bucket
!                             btid integer,             -- points to an entry in
                                                        -- bucket_template
                              val varchar(255),         -- value for the
                                                        -- parameter
!                             unique (bucketid, btid)   -- each bucket has just
!                                                       -- one instance of each
                                                        -- parameter
                          );
***************
*** 299,305 ****
                        committed integer,         -- 1 if this item has been
                                                   -- committed
!                       hdr_from    varchar(255),  -- The From: header 
!                       hdr_to      varchar(255),  -- The To: header            
!                       hdr_cc      varchar(255),  -- The Cc: header            
                        hdr_subject varchar(255),  -- The Subject: header
                        hdr_date    date,          -- The Date: header
--- 299,305 ----
                        committed integer,         -- 1 if this item has been
                                                   -- committed
!                       hdr_from    varchar(255),  -- The From: header
!                       hdr_to      varchar(255),  -- The To: header
!                       hdr_cc      varchar(255),  -- The Cc: header
                        hdr_subject varchar(255),  -- The Subject: header
                        hdr_date    date,          -- The Date: header
***************
*** 309,320 ****
                        usedtobe integer,          -- Previous classification
                        magnetid integer,          -- If classified with magnet
!                       sort_from    varchar(255),  -- The From: header 
!                       sort_to      varchar(255),  -- The To: header            
!                       sort_cc      varchar(255),  -- The Cc: header            
                        sort_subject varchar(255),  -- The Subject: header
                        size        integer        -- Size of the message (bytes)
                      );
  
! -- MySQL SPECIFIC 
  
  -- ---------------------------------------------------------------------------
--- 309,320 ----
                        usedtobe integer,          -- Previous classification
                        magnetid integer,          -- If classified with magnet
!                       sort_from    varchar(255),  -- The From: header
!                       sort_to      varchar(255),  -- The To: header
!                       sort_cc      varchar(255),  -- The Cc: header
                        sort_subject varchar(255),  -- The Subject: header
                        size        integer        -- Size of the message (bytes)
                      );
  
! -- MySQL SPECIFIC
  
  -- ---------------------------------------------------------------------------
***************
*** 344,348 ****
  alter table words modify word binary(255);
  
! -- MySQL enforces types, SQLite uses the concept of manifest typing, where 
  -- the type of a value is associated with the value itself, not the column that
  -- it is stored in. POPFile has two date fields in history where POPFile
--- 344,348 ----
  alter table words modify word binary(255);
  
! -- MySQL enforces types, SQLite uses the concept of manifest typing, where
  -- the type of a value is associated with the value itself, not the column that
  -- it is stored in. POPFile has two date fields in history where POPFile
***************
*** 364,371 ****
  --
  -- It deletes the related entries in the 'matrix', 'bucket_params' and
! -- 'magnets' tables.  
  --
  -- ---------------------------------------------------------------------------
!  
  create trigger delete_bucket delete on buckets
               begin
--- 364,371 ----
  --
  -- It deletes the related entries in the 'matrix', 'bucket_params' and
! -- 'magnets' tables.
  --
  -- ---------------------------------------------------------------------------
! 
  create trigger delete_bucket delete on buckets
               begin
***************
*** 435,452 ****
  -- These are the possible parameters for a bucket
  --
! -- subject      1 if should do subject modification for message classified 
  --              to this bucket
  -- xtc          1 if should add X-Text-Classification header
  -- xpl          1 if should add X-POPFile-Link header
! -- fncount      Number of messages that were incorrectly classified, and 
  --              meant to go into this bucket but did not
! -- fpcount      Number of messages that were incorrectly classified into 
  --              this bucket
! -- quarantine   1 if should quaratine (i.e. RFC822 wrap) messages in this 
  --              bucket
  -- count        Total number of messages classified into this bucket
  -- color        The color used for this bucket in the UI
  
! insert into bucket_template ( name, def ) values ( 'subject',    '1' ); 
  insert into bucket_template ( name, def ) values ( 'xtc',        '1' );
  insert into bucket_template ( name, def ) values ( 'xpl',        '1' );
--- 435,452 ----
  -- These are the possible parameters for a bucket
  --
! -- subject      1 if should do subject modification for message classified
  --              to this bucket
  -- xtc          1 if should add X-Text-Classification header
  -- xpl          1 if should add X-POPFile-Link header
! -- fncount      Number of messages that were incorrectly classified, and
  --              meant to go into this bucket but did not
! -- fpcount      Number of messages that were incorrectly classified into
  --              this bucket
! -- quarantine   1 if should quaratine (i.e. RFC822 wrap) messages in this
  --              bucket
  -- count        Total number of messages classified into this bucket
  -- color        The color used for this bucket in the UI
  
! insert into bucket_template ( name, def ) values ( 'subject',    '1' );
  insert into bucket_template ( name, def ) values ( 'xtc',        '1' );
  insert into bucket_template ( name, def ) values ( 'xpl',        '1' );
***************
*** 564,567 ****
--- 564,568 ----
  insert into user_template ( name, def, form ) values ( 'imap_use_ssl', 0, '%d' );
  insert into user_template ( name, def, form ) values ( 'imap_watched_folders', 'INBOX', '%s' );
+ insert into user_template ( name, def, form ) values ( 'imap_use_multiple_connections', '0', '%d' );
  
  -- Show the config bar at the bottom of each page defaults to on