From f1ad96ffe75beb6e7441d4a23a0f29e4e7f2e05a Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 25 Sep 2009 13:19:26 +0200 Subject: Rewrote the eDBmkSortKeys() function to use the eDBfieldMap returned from eDBxmlMapping() --- database/sqlite/administration/certificates.c | 4 ++-- database/sqlite/administration/usercerts.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'database/sqlite') diff --git a/database/sqlite/administration/certificates.c b/database/sqlite/administration/certificates.c index 53b50c2..e00de73 100644 --- a/database/sqlite/administration/certificates.c +++ b/database/sqlite/administration/certificates.c @@ -267,8 +267,8 @@ xmlDoc *eDBadminCertificate(eurephiaCTX *ctx, xmlDoc *qryxml) { fmap = eDBxmlMapping(ctx, tbl_sqlite_certs, NULL, fieldmap_n); if( strcmp(mode, "list") == 0 ) { - char *sortkeys = xmlGetNodeContent(root_n, "sortkeys"); - resxml = certificate_list(ctx, fmap, eDBmkSortKeyString(tbl_sqlite_certs, sortkeys)); + char *sortkeys = xmlGetNodeContent(root_n, "sortkeys"); + resxml = certificate_list(ctx, fmap, eDBmkSortKeyString(fmap, sortkeys)); } else if( strcmp(mode, "register") == 0 ) { resxml = certificate_add(ctx, fmap); } else if( strcmp(mode, "delete") == 0 ) { diff --git a/database/sqlite/administration/usercerts.c b/database/sqlite/administration/usercerts.c index 4387dcf..4573842 100644 --- a/database/sqlite/administration/usercerts.c +++ b/database/sqlite/administration/usercerts.c @@ -74,7 +74,7 @@ xmlDoc *usercerts_search(eurephiaCTX *ctx, eDBfieldMap *where_m, const char *sor xmlNode *link_root_n = NULL, *link_n = NULL, *tmp_n = NULL; dbresult *res = NULL; xmlChar tmp[2050]; - char *dbsort = NULL; + const char *dbsort = NULL; int i; DEBUG(ctx, 21, "Function call: usercerts_search(ctx, eDBfieldMap, '%s')", sortkeys); @@ -87,7 +87,7 @@ xmlDoc *usercerts_search(eurephiaCTX *ctx, eDBfieldMap *where_m, const char *sor } if( sortkeys != NULL ) { - dbsort = eDBmkSortKeyString(tbl_sqlite_usercerts, sortkeys); + dbsort = eDBmkSortKeyString(where_m, sortkeys); } res = sqlite_query_mapped(ctx, SQL_SELECT, -- cgit