From ff744b48fdc0665b620339d51424892def8d8071 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Sun, 5 Apr 2009 22:57:43 +0200 Subject: 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 --- database/sqlite/fieldmapping.h | 98 +++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'database/sqlite') diff --git a/database/sqlite/fieldmapping.h b/database/sqlite/fieldmapping.h index 1af42e5..3a84f8d 100644 --- a/database/sqlite/fieldmapping.h +++ b/database/sqlite/fieldmapping.h @@ -25,80 +25,80 @@ #ifdef FMAP_USERS static eDBfieldMap tbl_sqlite_users[] = { - {TABLE_USERS, NULL, FIELD_RECID, ft_INT, "uid", NULL, NULL}, - {TABLE_USERS, NULL, FIELD_UNAME, ft_STRING, "username", NULL, NULL}, - {TABLE_USERS, NULL, FIELD_PASSWD, ft_PASSWD, "password", NULL, NULL}, - {TABLE_USERS, NULL, FIELD_ACTIVATED, ft_DATETIME, "activated", NULL, NULL}, - {TABLE_USERS, NULL, FIELD_DEACTIVATED, ft_DATETIME, "deactivated", NULL, NULL}, - {TABLE_USERS, NULL, FIELD_LASTACCESS, ft_DATETIME, "last_accessed", NULL, NULL}, - {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} + {TABLE_USERS, NULL, FIELD_RECID, ft_INT , flt_NOTSET, "uid", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_UNAME, ft_STRING , flt_NOTSET, "username", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_PASSWD, ft_PASSWD , flt_NOTSET, "password", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_ACTIVATED, ft_DATETIME, flt_NOTSET, "activated", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_DEACTIVATED, ft_DATETIME, flt_NOTSET, "deactivated", NULL, NULL}, + {TABLE_USERS, NULL, FIELD_LASTACCESS, ft_DATETIME, flt_NOTSET, "last_accessed", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif #ifdef FMAP_CERTS static eDBfieldMap tbl_sqlite_certs[] = { - {TABLE_CERTS, NULL, FIELD_RECID, ft_INT, "certid", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_CERTDEPTH, ft_INT, "depth", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_CERTDIGEST, ft_STRING, "digest", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_CNAME, ft_STRING, "common_name", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_ORG, ft_STRING, "organisation", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_EMAIL, ft_STRING, "email", NULL, NULL}, - {TABLE_CERTS, NULL, FIELD_REGISTERED, ft_DATETIME, "registered", NULL, NULL}, - {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} + {TABLE_CERTS, NULL, FIELD_RECID, ft_INT , flt_NOTSET, "certid", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_CERTDEPTH, ft_INT , flt_NOTSET, "depth", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_CERTDIGEST, ft_STRING , flt_NOTSET, "digest", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_CNAME, ft_STRING , flt_NOTSET, "common_name", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_ORG, ft_STRING , flt_NOTSET, "organisation", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_EMAIL, ft_STRING , flt_NOTSET, "email", NULL, NULL}, + {TABLE_CERTS, NULL, FIELD_REGISTERED, ft_DATETIME, flt_NOTSET, "registered", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif #ifdef FMAP_USERCERTS static eDBfieldMap tbl_sqlite_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_NOTSET, "uid", NULL, NULL}, + {TABLE_USERCERTS, NULL, FIELD_CERTID, ft_INT, flt_NOTSET, "certid", NULL, NULL}, + {TABLE_USERCERTS, NULL, FIELD_ACCPROFILE, ft_INT, flt_NOTSET, "accessprofile", NULL, NULL}, + {TABLE_USERCERTS, NULL, FIELD_REGISTERED, ft_INT, flt_NOTSET, "registered", NULL, NULL}, + {TABLE_USERCERTS, NULL, FIELD_RECID, ft_INT, flt_NOTSET, "uicid", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif #ifdef FMAP_ADMINACCESS static eDBfieldMap tbl_sqlite_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, "access", NULL, NULL}, - {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} + {TABLE_EUREPHIAADMACC, NULL, FIELD_UID, ft_INT , flt_NOTSET, "uid", NULL, NULL}, + {TABLE_EUREPHIAADMACC, NULL, FIELD_INTERFACE, ft_STRING, flt_NOTSET, "interface", NULL, NULL}, + {TABLE_EUREPHIAADMACC, NULL, FIELD_ACCESSLVL, ft_STRING, flt_NOTSET, "access", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif #ifdef FMAP_LASTLOG static eDBfieldMap tbl_sqlite_lastlog[] = { - {TABLE_LASTLOG, NULL, FIELD_UID, ft_INT, "uid", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_CERTID, ft_INT, "certid", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_REMOTEIP, ft_STRING, "remotehost", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_VPNIP, ft_STRING, "vpnipaddr", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_SESSTATUS, ft_STRING, "status", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_LOGIN, ft_DATETIME, "login" , NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_LOGOUT, ft_DATETIME, "logout", NULL, NULL}, - {TABLE_LASTLOG, NULL, FIELD_RECID, ft_INT, "llid", NULL, NULL}, - {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, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL} + {TABLE_LASTLOG, NULL, FIELD_UID, ft_INT , flt_NOTSET, "uid", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_CERTID, ft_INT , flt_NOTSET, "certid", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_REMOTEIP, ft_STRING , flt_NOTSET, "remotehost", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_VPNIP, ft_STRING , flt_NOTSET, "vpnipaddr", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_SESSTATUS, ft_STRING , flt_NOTSET, "status", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_LOGIN, ft_DATETIME, flt_NOTSET, "login" , NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_LOGOUT, ft_DATETIME, flt_NOTSET, "logout", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_RECID, ft_INT , flt_NOTSET, "llid", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_UNAME, ft_STRING , flt_NOTSET, "username", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_MACADDR, ft_STRING , flt_NOTSET, "macaddr", NULL, NULL}, + {TABLE_LASTLOG, NULL, FIELD_UICID, ft_STRING , flt_NOTSET, "uicid", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif #ifdef FMAP_OVPNACCESSES static eDBfieldMap tbl_sqlite_openvpnaccesses[] = { - {TABLE_FWPROFILES, NULL, FIELD_DESCR, ft_STRING, "access_descr", NULL, NULL}, - {TABLE_FWPROFILES, NULL, FIELD_FWPROFILE, ft_STRING, "fw_profile", 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, "common_name", NULL, NULL}, - {TABLE_FWPROFILES, NULL, FIELD_ORG, ft_STRING, "organisation", 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_NOTSET, "access_descr", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_FWPROFILE, ft_STRING , flt_NOTSET, "fw_profile", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_RECID, ft_INT , flt_NOTSET, "accessprofile", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_UID, ft_INT , flt_NOTSET, "uid", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_UNAME, ft_STRING , flt_NOTSET, "username", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_CERTID, ft_INT , flt_NOTSET, "certid", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_CNAME, ft_STRING , flt_NOTSET, "common_name", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_ORG, ft_STRING , flt_NOTSET, "organisation", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_EMAIL, ft_STRING , flt_NOTSET, "email", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_CERTDIGEST, ft_STRING , flt_NOTSET, "digest", NULL, NULL}, + {TABLE_FWPROFILES, NULL, FIELD_REGISTERED, ft_DATETIME, flt_NOTSET, "registered", NULL, NULL}, + {0, NULL, FIELD_NONE, ft_UNDEF, flt_NOTSET, NULL, NULL, NULL} }; #endif -- cgit