Added eDBfieldMapping field for filter types

This field will be used to determine what kind of filter logic to add
when building SQL queries.  The filter type is set in the fieldMapping
field nodes as an attribute named 'filter'.  Their values and the
corresponding SQL conditions are:

   filter                | SQL condition
  -----------------------+---------------
   equals                | =
   not-equals            | != / NOT(...)
   less-than             | <
   less-than-equals      | <=
   greater-than          | >
   greater-than-equals   | >=
  -----------------------+---------------

The default value for each field is set in the eurephiadb_mapping.h

1 files changed, 65 insertions, 63 deletions

diff --git a/database/eurephiadb_mapping.h b/database/eurephiadb_mapping.h
index bf3cd6a..4421c68 100644
--- a/database/eurephiadb_mapping.h
+++ b/database/eurephiadb_mapping.h
@@ -26,12 +26,14 @@
 # define   	EUREPHIADB_MAPPING_H
 
 typedef enum eDBfieldType_e { ft_UNDEF, ft_INT, ft_STRING, ft_DATETIME, ft_PASSWD, ft_SETNULL } eDBfieldType;
+typedef enum eDBfieldFilterType_e { flt_NOTSET, flt_EQ, flt_NEQ, flt_LT, flt_LTE, flt_GT, flt_GTE } eDBfieldFilterType;
 
 typedef struct _eDBfieldMap_s {
         int tableid;
         char *table_alias;
         long field_id;
         eDBfieldType field_type;
+        eDBfieldFilterType filter_type;
         char *field_name;
         char *value;
         struct _eDBfieldMap_s *next;
@@ -89,90 +91,90 @@ extern const char *SESSION_STATUS[];
 #ifdef EUREPHIADB_MAPPING_C
 
 static eDBfieldMap eTblMap_user[] = {
-        {TABLE_USERS, NULL, FIELD_RECID,       ft_INT,      "uid"},
-        {TABLE_USERS, NULL, FIELD_UNAME,       ft_STRING,   "username"},
-        {TABLE_USERS, NULL, FIELD_PASSWD,      ft_PASSWD,   "password"},
-        {TABLE_USERS, NULL, FIELD_ACTIVATED,   ft_DATETIME, "activated"},
-        {TABLE_USERS, NULL, FIELD_DEACTIVATED, ft_DATETIME, "deactivated"},
-        {TABLE_USERS, NULL, FIELD_LASTACCESS,  ft_DATETIME, "lastaccess"},
-        {0, NULL, 0, ft_UNDEF, NULL}
+        {TABLE_USERS, NULL, FIELD_RECID,       ft_INT,      flt_EQ, "uid",         NULL, NULL},
+        {TABLE_USERS, NULL, FIELD_UNAME,       ft_STRING,   flt_EQ, "username",    NULL, NULL},
+        {TABLE_USERS, NULL, FIELD_PASSWD,      ft_PASSWD,   flt_EQ, "password",    NULL, NULL},
+        {TABLE_USERS, NULL, FIELD_ACTIVATED,   ft_DATETIME, flt_EQ, "activated",   NULL, NULL},
+        {TABLE_USERS, NULL, FIELD_DEACTIVATED, ft_DATETIME, flt_EQ, "deactivated", NULL, NULL},
+        {TABLE_USERS, NULL, FIELD_LASTACCESS,  ft_DATETIME, flt_EQ, "lastaccess",  NULL, NULL},
+        {0, NULL, 0, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_certificates[] = {
-        {TABLE_CERTS, NULL, FIELD_RECID,       ft_INT,      "certid"},
-        {TABLE_CERTS, NULL, FIELD_CERTDEPTH,   ft_INT,      "depth"},
-        {TABLE_CERTS, NULL, FIELD_CERTDIGEST,  ft_STRING,   "digest"},
-        {TABLE_CERTS, NULL, FIELD_CNAME,       ft_STRING,   "cname"},
-        {TABLE_CERTS, NULL, FIELD_ORG,         ft_STRING,   "org"},
-        {TABLE_CERTS, NULL, FIELD_EMAIL,       ft_STRING,   "email"},
-        {TABLE_CERTS, NULL, FIELD_REGISTERED,  ft_DATETIME, "registered"},
-        {0, NULL, 0, ft_UNDEF, NULL}
+        {TABLE_CERTS, NULL, FIELD_RECID,       ft_INT,      flt_EQ, "certid",      NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CERTDEPTH,   ft_INT,      flt_EQ, "depth",       NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CERTDIGEST,  ft_STRING,   flt_EQ, "digest",      NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CNAME,       ft_STRING,   flt_EQ, "cname",       NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_ORG,         ft_STRING,   flt_EQ, "org",         NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_EMAIL,       ft_STRING,   flt_EQ, "email",       NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_REGISTERED,  ft_DATETIME, flt_EQ, "registered",  NULL, NULL},
+        {0, NULL, 0, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_lastlog[] = {
-        {TABLE_LASTLOG, NULL, FIELD_UID,         ft_INT,      "uid"},
-        {TABLE_LASTLOG, NULL, FIELD_CERTID,      ft_INT,      "certid"},
-        {TABLE_LASTLOG, NULL, FIELD_REMOTEIP,    ft_STRING,   "ip"},
-        {TABLE_LASTLOG, NULL, FIELD_VPNIP,       ft_STRING,   "vpnip"},
-        {TABLE_LASTLOG, NULL, FIELD_SESSTATUS,   ft_STRING,   "status"},
-        {TABLE_LASTLOG, NULL, FIELD_LOGIN,       ft_DATETIME, "login"},
-        {TABLE_LASTLOG, NULL, FIELD_LOGOUT,      ft_DATETIME, "logout"},
-        {TABLE_LASTLOG, NULL, FIELD_RECID,       ft_INT,      "id"},
-        {TABLE_LASTLOG, NULL, FIELD_UNAME,       ft_STRING,   "username",      NULL, NULL},
-        {TABLE_LASTLOG, NULL, FIELD_MACADDR,     ft_STRING,   "macaddr",       NULL, NULL},
-        {TABLE_LASTLOG, NULL, FIELD_UICID,       ft_STRING,   "uicid",         NULL, NULL},
-        {0, NULL, 0, ft_UNDEF, NULL}
+        {TABLE_LASTLOG, NULL, FIELD_UID,         ft_INT,      flt_EQ, "uid",       NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_CERTID,      ft_INT,      flt_EQ, "certid",    NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_REMOTEIP,    ft_STRING,   flt_EQ, "ip",        NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_VPNIP,       ft_STRING,   flt_EQ, "vpnip",     NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_SESSTATUS,   ft_STRING,   flt_EQ, "status",    NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_LOGIN,       ft_DATETIME, flt_EQ, "login",     NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_LOGOUT,      ft_DATETIME, flt_EQ, "logout",    NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_RECID,       ft_INT,      flt_EQ, "id",        NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_UNAME,       ft_STRING,   flt_EQ, "username",  NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_MACADDR,     ft_STRING,   flt_EQ, "macaddr",   NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_UICID,       ft_STRING,   flt_EQ, "uicid",     NULL, NULL},
+        {0, NULL, 0, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_attempts[] = {
-        {TABLE_ATTEMPTS, NULL, FIELD_UNAME,       ft_STRING,   "username"},
-        {TABLE_ATTEMPTS, NULL, FIELD_REMOTEIP,    ft_STRING,   "ip"},
-        {TABLE_ATTEMPTS, NULL, FIELD_ATTEMPTS,    ft_INT,      "attempts"},
-        {TABLE_ATTEMPTS, NULL, FIELD_REGISTERED,  ft_DATETIME, "registered"},
-        {TABLE_ATTEMPTS, NULL, FIELD_LASTATTEMPT, ft_DATETIME, "lastattempt"},
-        {TABLE_ATTEMPTS, NULL, FIELD_RECID,       ft_INT,      "id"},
-        {0, NULL, 0, ft_UNDEF, NULL}
+        {TABLE_ATTEMPTS, NULL, FIELD_UNAME,       ft_STRING,   flt_EQ, "username",    NULL, NULL},
+        {TABLE_ATTEMPTS, NULL, FIELD_REMOTEIP,    ft_STRING,   flt_EQ, "ip",          NULL, NULL},
+        {TABLE_ATTEMPTS, NULL, FIELD_ATTEMPTS,    ft_INT,      flt_EQ, "attempts",    NULL, NULL},
+        {TABLE_ATTEMPTS, NULL, FIELD_REGISTERED,  ft_DATETIME, flt_EQ, "registered",  NULL, NULL},
+        {TABLE_ATTEMPTS, NULL, FIELD_LASTATTEMPT, ft_DATETIME, flt_EQ, "lastattempt", NULL, NULL},
+        {TABLE_ATTEMPTS, NULL, FIELD_RECID,       ft_INT,      flt_EQ, "id",          NULL, NULL },
+        {0, NULL, 0, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_blacklist[] = {
-        {TABLE_BLACKLIST, NULL, FIELD_UNAME,       ft_STRING,  "username"},
-        {TABLE_BLACKLIST, NULL, FIELD_REMOTEIP,    ft_STRING,  "ip"},
-        {TABLE_BLACKLIST, NULL, FIELD_REGISTERED,  ft_DATETIME, "registered"},
-        {TABLE_BLACKLIST, NULL, FIELD_LASTACCESS,  ft_DATETIME, "lastattempt"},
-        {TABLE_BLACKLIST, NULL, FIELD_LASTACCESS,  ft_DATETIME, "lastaccessed"},
-        {TABLE_BLACKLIST, NULL, FIELD_RECID,       ft_INT,      "id"},
-        {0, NULL, 0, ft_UNDEF, NULL}
+        {TABLE_BLACKLIST, NULL, FIELD_UNAME,       ft_STRING,   flt_EQ, "username",     NULL, NULL},
+        {TABLE_BLACKLIST, NULL, FIELD_REMOTEIP,    ft_STRING,   flt_EQ, "ip",           NULL, NULL},
+        {TABLE_BLACKLIST, NULL, FIELD_REGISTERED,  ft_DATETIME, flt_EQ, "registered",   NULL, NULL},
+        {TABLE_BLACKLIST, NULL, FIELD_LASTACCESS,  ft_DATETIME, flt_EQ, "lastattempt",  NULL, NULL},
+        {TABLE_BLACKLIST, NULL, FIELD_LASTACCESS,  ft_DATETIME, flt_EQ, "lastaccessed", NULL, NULL},
+        {TABLE_BLACKLIST, NULL, FIELD_RECID,       ft_INT,      flt_EQ, "id",           NULL, NULL},
+        {0, NULL, 0, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_usercerts[] = {
-        {TABLE_USERCERTS, NULL, FIELD_UID,        ft_INT,  "uid",            NULL, NULL},
-        {TABLE_USERCERTS, NULL, FIELD_CERTID,     ft_INT,  "certid",         NULL, NULL},
-        {TABLE_USERCERTS, NULL, FIELD_ACCPROFILE, ft_INT,  "accessprofile",  NULL, NULL},
-        {TABLE_USERCERTS, NULL, FIELD_REGISTERED, ft_INT,  "registered",     NULL, NULL},
-        {TABLE_USERCERTS, NULL, FIELD_RECID,      ft_INT,  "uicid",          NULL, NULL},
-        {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL}
+        {TABLE_USERCERTS, NULL, FIELD_UID,        ft_INT, flt_EQ,  "uid",            NULL, NULL},
+        {TABLE_USERCERTS, NULL, FIELD_CERTID,     ft_INT, flt_EQ,  "certid",         NULL, NULL},
+        {TABLE_USERCERTS, NULL, FIELD_ACCPROFILE, ft_INT, flt_EQ,  "accessprofile",  NULL, NULL},
+        {TABLE_USERCERTS, NULL, FIELD_REGISTERED, ft_INT, flt_EQ,  "registered",     NULL, NULL},
+        {TABLE_USERCERTS, NULL, FIELD_RECID,      ft_INT, flt_EQ,  "uicid",          NULL, NULL},
+        {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_eurephiaadmacc[] = {
-        {TABLE_EUREPHIAADMACC, NULL, FIELD_UID,       ft_INT,    "uid",           NULL, NULL},
-        {TABLE_EUREPHIAADMACC, NULL, FIELD_INTERFACE, ft_STRING, "interface",     NULL, NULL},
-        {TABLE_EUREPHIAADMACC, NULL, FIELD_ACCESSLVL, ft_STRING, "accesslevel",   NULL, NULL},
-        {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL}
+        {TABLE_EUREPHIAADMACC, NULL, FIELD_UID,       ft_INT,    flt_EQ, "uid",           NULL, NULL},
+        {TABLE_EUREPHIAADMACC, NULL, FIELD_INTERFACE, ft_STRING, flt_EQ, "interface",     NULL, NULL},
+        {TABLE_EUREPHIAADMACC, NULL, FIELD_ACCESSLVL, ft_STRING, flt_EQ, "accesslevel",   NULL, NULL},
+        {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 static eDBfieldMap eTblMap_fwprofiles[] = {
-        {TABLE_FWPROFILES,   NULL,     FIELD_DESCR,      ft_STRING,   "description",   NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_FWPROFILE,  ft_STRING,   "fwprofile",     NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_RECID,      ft_INT   ,   "accessprofile", NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_UID,        ft_INT   ,   "uid",           NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_UNAME,      ft_STRING,   "username",      NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_CERTID,     ft_INT,      "certid",        NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_CNAME,      ft_STRING,   "cname",         NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_ORG,        ft_STRING,   "org",           NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_EMAIL,      ft_STRING,   "email",         NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_CERTDIGEST, ft_STRING,   "digest",        NULL, NULL},
-        {TABLE_FWPROFILES,   NULL,     FIELD_REGISTERED, ft_DATETIME, "registered",    NULL, NULL},
-        {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL}
+        {TABLE_FWPROFILES,   NULL,     FIELD_DESCR,      ft_STRING  , flt_EQ, "description",   NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_FWPROFILE,  ft_STRING  , flt_EQ, "fwprofile",     NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_RECID,      ft_INT     , flt_EQ, "accessprofile", NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_UID,        ft_INT     , flt_EQ, "uid",           NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_UNAME,      ft_STRING  , flt_EQ, "username",      NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_CERTID,     ft_INT     , flt_EQ, "certid",        NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_CNAME,      ft_STRING  , flt_EQ, "cname",         NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_ORG,        ft_STRING  , flt_EQ, "org",           NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_EMAIL,      ft_STRING  , flt_EQ, "email",         NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_CERTDIGEST, ft_STRING  , flt_EQ, "digest",        NULL, NULL},
+        {TABLE_FWPROFILES,   NULL,     FIELD_REGISTERED, ft_DATETIME, flt_EQ, "registered",    NULL, NULL},
+        {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL}
 };
 
 #endif // #ifdef EUREPHIADB_MAPPING_C