X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Ffindpkg.c;h=8dd0ad14b1a4b7f83b96af8410eaaf9ac54ff79b;hb=HEAD;hp=072f9f1cbd21745259eeb1c0b59e412424bd490a;hpb=38b4e690c9910cde05ff97b7ebb32d5590328894;p=zpackage

diff --git a/lib/findpkg.c b/lib/findpkg.c
index 072f9f1..8dd0ad1 100644
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -8,6 +8,7 @@
 #include "zpm.h"
 
 #include "sqlite3.h"
+#include "lib/jsw/jsw_atree.h"
 
 #define DMARK fprintf(stderr, "mark %s %s:%d\n", __FILE__, __func__, __LINE__)
 
@@ -34,29 +35,15 @@ 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 *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)";
+char *zpm_findlib(struct zpm *zpm, char *soname, char *where) {
 	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;
-	}
+char *select = "select printf('%%s-%%s-%%s',P.package,P.version,P.release) as pkgid, P.package, P.version, P.release\
+	from packagefiles PF\
+	join elflibraries EL on EL.file = PF.hash\
+	join packages P on P.package = PF.package and P.version = PF.version and P.release = PF.release";
+	char *order = "order by P.package, P.version, cast(P.release as integer)";
 
 	/* null pkgstr find "best" package
 	 * best is shortest complete package if any are complete
@@ -65,29 +52,148 @@ 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 */
+	sql = sqlite3_str_new(zpm->db);
+
+	sqlite3_str_appendall(sql, select);
+	sqlite3_str_appendf(sql, " where P.hash is not null and EL.soname = %Q", soname);
+
+	if (where) {
+		sqlite3_str_appendall(sql, " and ");
+		sqlite3_str_appendall(sql, where);
+	}
+
+	sqlite3_str_appendall(sql, " ");
+	sqlite3_str_appendall(sql, order);
+	sqlite3_str_appendall(sql, " limit 1;");
+
+	if (sqlite3_str_errcode(sql)) {
+		zpm->error = 1;
+		sqlite3_free(sqlite3_str_finish(sql));
+		return 0;
+	}
+
+	query = sqlite3_str_finish(sql);
+
+	pkgid = zpm_db_string(zpm, query);;
+
+	sqlite3_free(query);
+
+	return pkgid;
+}
+
+int zpm_packages_needed(struct zpm *zpm, char *pkgid, jsw_atree_t *list) {
+	char *pkglibsneeded = "select soname, selfsatisfied from package_libraries_needed where pkgid = %Q";
+	sqlite3_stmt *st;
+	int count = 0;
+	int rv;
+
+	st = zpm_dbquery(zpm, pkglibsneeded, pkgid);
+
+	while ((rv = sqlite3_step(st)) == SQLITE_ROW) {
+		char *soname;
+		int self;
+
+		soname = (char *)sqlite3_column_text(st, 0);
+		/* TODO check and skip self sats */
+		self = sqlite3_column_int(st,1);
+		if (self) {
+			continue;
+		}
+		count++;
+
+		/* if it's in needed, we've already looked at this one */
+		if (list && !jsw_afind(list, soname)) {
+			jsw_ainsert(list, soname);
+		}
+	}
+
+	sqlite3_finalize(st);
+	return count;
+}
+
+
+int zpm_libraries_needed(struct zpm *zpm, char *pkgid, jsw_atree_t *list) {
+	char *pkglibsneeded = "select soname, selfsatisfied from package_libraries_needed where pkgid = %Q";
+	sqlite3_stmt *st;
+	int count = 0;
+	int rv;
 
-	//		char where[1024] = "";
+	st = zpm_dbquery(zpm, pkglibsneeded, pkgid);
 
-	zpm_parse_package(pkgstr, package, version, &release);
+	while ((rv = sqlite3_step(st)) == SQLITE_ROW) {
+		char *soname;
+		int self;
 
-	/* install a collation function */
-	zpm_addvercmp(zpm);
+		soname = (char *)sqlite3_column_text(st, 0);
+		/* TODO check and skip self sats */
+		self = sqlite3_column_int(st,1);
+		if (self) {
+			continue;
+		}
+		count++;
 
-	/* TODO allow more args to nail down version and release */
+		/* if it's in needed, we've already looked at this one */
+		if (list && !jsw_afind(list, soname)) {
+			jsw_ainsert(list, soname);
+		}
+	}
+
+	sqlite3_finalize(st);
+	return count;
+}
+
+char *zpm_findpkg(struct zpm *zpm, char *pkgstr, char *where) {
+	char *select = "select pkgid, package, version, release from packages_pkgid";
+#if 0
+	char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp";
+#else
+	char *group = "order by package, version collate vercmp desc, cast(release as integer)";
+	//group = "order by package, version , cast(release as integer)";
+#endif
+	sqlite3_str *sql;
+	char *query, *pkgid = 0;
+
+	/* null pkgstr find "best" package
+	 * best is shortest complete package if any are complete
+	 * shortest incomplete if any are incomplete
+	 * where more than one version is in those sets, best is
+	 * latest as determined by vercmp
+	 */
 
 	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 +202,80 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
 	}
 
 	query = sqlite3_str_finish(sql);
-	sqlite3_prepare_v2(zpm->db, query, strlen(query), &stmt, NULL);
+
+	pkgid = zpm_db_string(zpm, query);;
+
 	sqlite3_free(query);
 
-#if 0
-	if (zpm->pkgid) {
-		free(zpm->pkgid);
+	return pkgid;
+}
+
+char *zpm_findpkg_range(struct zpm *zpm, char *minpkg, char *maxpkg, char *where, int wantleast) {
+	int release;
+	char version[32];
+	char package[32];
+
+	char *select = "select pkgid, package, version, release from packages_pkgid";
+	char *last = "order by version collate vercmp desc, cast(release as integer) desc";
+	char *first = "order by version collate vercmp, cast(release as integer)";
+	char *group;
+
+	char *query, *pkgid = 0;
+	sqlite3_str *sql;
+
+	group = wantleast ? first : last;
+	/* null pkgstr find "best" package
+	 * best is shortest complete package if any are complete
+	 * shortest incomplete if any are incomplete
+	 * where more than one version is in those sets, best is
+	 * latest as determined by vercmp
+	 */
+
+	sql = sqlite3_str_new(zpm->db);
+
+	sqlite3_str_appendall(sql, select);
+	sqlite3_str_appendall(sql, " where true");
+
+	if (minpkg) {
+		sqlite3_str_appendf(sql, " and pkgid >= %Q collate vercmp",
+				minpkg);
+		zpm_parse_package(minpkg, package, version, &release);
+		if (*package != 0) {
+			sqlite3_str_appendf(sql, " and package = %Q",
+					package);
+		}
+	}
+
+	if (maxpkg) {
+		sqlite3_str_appendf(sql, " and pkgid <= %Q collate vercmp",
+				maxpkg);
+		zpm_parse_package(maxpkg, package, version, &release);
+		if (*package != 0) {
+			sqlite3_str_appendf(sql, " and package = %Q",
+					package);
+		}
 	}
-	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;
+	if (where) {
+		sqlite3_str_appendall(sql, " and ");
+		sqlite3_str_appendall(sql, where);
 	}
-	sqlite3_finalize(stmt);
+
+	sqlite3_str_appendall(sql, " ");
+	sqlite3_str_appendall(sql, group);
+	sqlite3_str_appendall(sql, " limit 1;");
+
+	if (sqlite3_str_errcode(sql)) {
+		zpm->error = 1;
+		sqlite3_free(sqlite3_str_finish(sql));
+		return 0;
+	}
+
+	query = sqlite3_str_finish(sql);
+
+	pkgid = zpm_db_string(zpm, query);;
+
+	sqlite3_free(query);
 
 	return pkgid;
 }