add where clause argument to findpkg

[zpackage] / lib / findpkg.c

diff --git a/lib/findpkg.c b/lib/findpkg.c
index dec9283e1201c571282eff2ebec82d9a363c843a..cbf70042c413baa4671a36005b83f6987d1459f3 100644 (file)
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -9,59 +9,7 @@
 
 #include "sqlite3.h"
 
-int zpm_parse_package(char *pstr, char *name, char *ver, int *rel) {
-       if (name) *name = 0;
-       if (ver) *ver = 0;
-       if (rel) *rel = 0;
-       int havename = 0;
-       int havever = 0;
-       int haverel = 0;
-
-       /* string - ver - rel */
-       /* rel is all digits */
-       /* possible forms:
-        * ^(.+)-([0-9][^-]*)-([\d+])$
-        * ^(.+)-([0-9][^-]*)$
-        * ^(.+)$
-        * The main problem in parsing is that the package name itself
-        * can contain a '-', so you can't just split on '-'
-        * Also, the version can be just digits.
-        */
-
-       /* everything up to the first '-' is in the name */
-       while (*pstr) {
-               if (*pstr == '-' && isdigit(*(pstr+1))) {
-                       break;
-               }
-               if (name) {
-                       *name++ = *pstr;
-               }
-               pstr++;
-               havename = 1;
-       }
-       if (name) *name = 0;
-       if (*pstr == '-') {
-               pstr++;
-       }
-       while (*pstr && *pstr != '-') {
-               if (ver) {
-                       *ver++ = *pstr;
-               }
-               pstr++;
-               havever = 1;
-       }
-       if (ver) *ver = 0;
-       if (*pstr == '-') {
-               pstr++;
-       }
-       /* TODO use strtol */
-       if (rel && *pstr) {
-               haverel = 1;
-               *rel = atoi(pstr);
-       }
-
-       return havename + havever + haverel;
-}
+#define DMARK fprintf(stderr, "mark %s %s:%d\n", __FILE__, __func__, __LINE__)
 
 /*
  * flags 0 = find installed
@@ -86,24 +34,13 @@ void zpm_sqlite_error(struct zpm *zpm) {
        zpm->errmsg = strdup((const char *)sqlite3_errmsg(zpm->db));
 }
 
-char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
+char *zpm_findpkg(struct zpm *zpm, char *pkgstr, char *where) {
        char *select = "select pkgid, package, version, release from packages_pkgid";
-       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp limit 1";
-#if 0
-       char *sstr[] = {
-               "status = 'installed'",
-               "",
-               "status != 'installed'"
-       };
-#endif
+       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp";
 
 //     char *order = "order by package, version collate vercmp, cast(release as integer)";
        sqlite3_str *sql;
-       sqlite3_stmt *stmt;
-       char *query;
-       char package[32];
-       char version[32];
-       int release;
+       char *query, *pkgid = 0;
 
        /* null pkgstr find "best" package
         * best is shortest complete package if any are complete
@@ -112,29 +49,40 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
         * latest as determined by vercmp
         */
 
-       /* given a package name, get the packages */
-       /* no package name, get all */
-
-       //              char where[1024] = "";
-
-       zpm_parse_package(pkgstr, package, version, &release);
+       sql = sqlite3_str_new(zpm->db);
 
-       /* install a collation function */
-       zpm_addvercmp(zpm);
+       sqlite3_str_appendall(sql, select);
+       sqlite3_str_appendall(sql, " where true");
 
-       /* TODO allow more args to nail down version and release */
+       if (pkgstr) {
+               int release;
+               char version[32];
+               char package[32];
 
-       sql = sqlite3_str_new(zpm->db);
-       sqlite3_str_appendall(sql, select);
-       sqlite3_str_appendf(sql, " where package = %q", package);
-       if (*version) {
-               sqlite3_str_appendf(sql, " and version = %q", version);
+               zpm_parse_package(pkgstr, package, version, &release);
+               if (*package != 0) {
+                       sqlite3_str_appendf(sql, " and package = %Q",
+                                       package);
+               }
+               if (*version != 0) {
+                       sqlite3_str_appendf(sql, " and version = %Q",
+                                       version);
+               }
+               if (release != 0) {
+                       sqlite3_str_appendf(sql, " and release = %d",
+                                       release);
+               }
        }
-       if (release) {
-               sqlite3_str_appendf(sql, " and release = %d", release);
+
+       if (where) {
+               sqlite3_str_appendall(sql, " and ");
+               sqlite3_str_appendall(sql, where);
        }
-       sqlite3_str_appendf(sql, " %s", group);
-       sqlite3_str_appendf(sql, " limit 1");
+
+
+       sqlite3_str_appendall(sql, " ");
+       sqlite3_str_appendall(sql, group);
+       sqlite3_str_appendall(sql, " limit 1;");
 
        if (sqlite3_str_errcode(sql)) {
                zpm->error = 1;
@@ -143,24 +91,10 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        }
 
        query = sqlite3_str_finish(sql);
-       sqlite3_prepare_v2(zpm->db, query, strlen(query), &stmt, NULL);
-       sqlite3_free(query);
 
-       free(zpm->pkgid);
-       zpm->pkgid = 0;
-
-       switch (sqlite3_step(stmt)) {
-               case SQLITE_ROW:
-                       zpm->pkgid = strdup((const char *)sqlite3_column_text(stmt, 0));
-                       break;
-               case SQLITE_DONE:
-                       /* not found */
-                       break;
-               default:
-                       zpm_sqlite_error(zpm);
-                       break;
-       }
-       sqlite3_finalize(stmt);
+       pkgid = zpm_db_string(zpm, query);;
+
+       sqlite3_free(query);
 
-       return zpm->pkgid;
+       return pkgid;
 }