add where clause argument to findpkg

[zpackage] / lib / findpkg.c

diff --git a/lib/findpkg.c b/lib/findpkg.c
index 072f9f1cbd21745259eeb1c0b59e412424bd490a..cbf70042c413baa4671a36005b83f6987d1459f3 100644 (file)
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -34,29 +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";
-#if 0
-       char *sstr[] = {
-               "status = 'installed'",
-               "",
-               "status != 'installed'"
-       };
-#endif
 
 //     char *order = "order by package, version collate vercmp, cast(release as integer)";
        sqlite3_str *sql;
-       sqlite3_stmt *stmt;
        char *query, *pkgid = 0;
-       char package[32];
-       char version[32];
-       int release;
-
-       if (pkgstr == NULL) {
-               fprintf(stderr, "trying to parse null string\n");
-               return NULL;
-       }
 
        /* null pkgstr find "best" package
         * best is shortest complete package if any are complete
@@ -65,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);
-
-       /* install a collation function */
-       zpm_addvercmp(zpm);
-
-       /* TODO allow more args to nail down version and release */
-
        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);
+       sqlite3_str_appendall(sql, " where true");
+
+       if (pkgstr) {
+               int release;
+               char version[32];
+               char package[32];
+
+               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;
@@ -96,28 +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);
 
-#if 0
-       if (zpm->pkgid) {
-               free(zpm->pkgid);
-       }
-       zpm->pkgid = 0;
-#endif
-
-       switch (sqlite3_step(stmt)) {
-               case SQLITE_ROW:
-                       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 pkgid;
 }