<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117190] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117190">117190</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-02-18 22:24:29 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>allow access to registry metadata from Tcl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrccregistryregistryc">trunk/base/src/cregistry/registry.c</a></li>
<li><a href="#trunkbasesrccregistryregistryh">trunk/base/src/cregistry/registry.h</a></li>
<li><a href="#trunkbasesrcregistry20registryc">trunk/base/src/registry2.0/registry.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrccregistryregistryc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cregistry/registry.c (117189 => 117190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/registry.c 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/cregistry/registry.c 2014-02-19 06:24:29 UTC (rev 117190)
</span><span class="lines">@@ -456,3 +456,147 @@
</span><span class="cx"> sqlite3_close(db);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Functions for access to the metadata table
+ */
+
+/**
+ * @param [in] reg registry to get value from
+ * @param [in] key metadata key to get
+ * @param [out] value the value of the metadata
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_get_metadata(reg_registry* reg, const char* key, char** value,
+ reg_error* errPtr) {
+ int result = 0;
+ sqlite3_stmt* stmt = NULL;
+ char* query = "SELECT value FROM registry.metadata WHERE key=?";
+ const char *text;
+ if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK
+ && (sqlite3_bind_text(stmt, 1, key, -1, SQLITE_STATIC) == SQLITE_OK)) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_ROW:
+ text = (const char*)sqlite3_column_text(stmt, 0);
+ if (text) {
+ *value = strdup(text);
+ result = 1;
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ break;
+ case SQLITE_DONE:
+ errPtr->code = REG_NOT_FOUND;
+ errPtr->description = "no such key in metadata";
+ errPtr->free = NULL;
+ break;
+ case SQLITE_BUSY:
+ continue;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ return result;
+}
+
+/**
+ * @param [in] reg registry to set value in
+ * @param [in] key metadata key to set
+ * @param [in] value the desired value for the key
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_set_metadata(reg_registry* reg, const char* key, const char* value,
+ reg_error* errPtr) {
+ int result = 0;
+ sqlite3_stmt* stmt = NULL;
+ char* query;
+ char *test_value;
+ int get_returnval = reg_get_metadata(reg, key, &test_value, errPtr);
+ if (get_returnval) {
+ free(test_value);
+ query = sqlite3_mprintf("UPDATE registry.metadata SET value = '%q' WHERE key='%q'",
+ value, key);
+ } else if (errPtr->code == REG_NOT_FOUND) {
+ query = sqlite3_mprintf("INSERT INTO registry.metadata (key, value) VALUES ('%q', '%q')",
+ key, value);
+ } else {
+ return get_returnval;
+ }
+ if (sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_DONE:
+ result = 1;
+ break;
+ case SQLITE_BUSY:
+ break;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ sqlite3_free(query);
+ return result;
+}
+
+/**
+ * @param [in] reg the registry to delete the metadata from
+ * @param [in] key the metadata key to delete
+ * @param [out] errPtr on error, a description of the error that occurred
+ * @return true if success; false if failure
+ */
+int reg_del_metadata(reg_registry* reg, const char* key, reg_error* errPtr) {
+ int result = 1;
+ sqlite3_stmt* stmt = NULL;
+ char* query = "DELETE FROM registry.metadata WHERE key=?";
+ if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
+ && (sqlite3_bind_text(stmt, 1, key, -1, SQLITE_STATIC) == SQLITE_OK)) {
+ int r;
+ do {
+ r = sqlite3_step(stmt);
+ switch (r) {
+ case SQLITE_DONE:
+ if (sqlite3_changes(reg->db) == 0) {
+ reg_throw(errPtr, REG_INVALID, "no such metadata key");
+ result = 0;
+ } else {
+ sqlite3_reset(stmt);
+ }
+ break;
+ case SQLITE_BUSY:
+ break;
+ default:
+ reg_sqlite_error(reg->db, errPtr, query);
+ result = 0;
+ break;
+ }
+ } while (r == SQLITE_BUSY);
+ } else {
+ reg_sqlite_error(reg->db, errPtr, query);
+ result = 0;
+ }
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
+ return result;
+}
</ins></span></pre></div>
<a id="trunkbasesrccregistryregistryh"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cregistry/registry.h (117189 => 117190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/registry.h 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/cregistry/registry.h 2014-02-19 06:24:29 UTC (rev 117190)
</span><span class="lines">@@ -88,4 +88,8 @@
</span><span class="cx">
</span><span class="cx"> int reg_vacuum(char* db_path);
</span><span class="cx">
</span><ins>+int reg_get_metadata(reg_registry* reg, const char* key, char** value, reg_error* errPtr);
+int reg_set_metadata(reg_registry* reg, const char* key, const char* value, reg_error* errPtr);
+int reg_del_metadata(reg_registry* reg, const char* key, reg_error* errPtr);
+
</ins><span class="cx"> #endif /* _CREG_H */
</span></span></pre></div>
<a id="trunkbasesrcregistry20registryc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/registry.c (117189 => 117190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/registry.c 2014-02-19 06:01:08 UTC (rev 117189)
+++ trunk/base/src/registry2.0/registry.c 2014-02-19 06:24:29 UTC (rev 117190)
</span><span class="lines">@@ -320,6 +320,57 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/*
+ * registry::metadata cmd ?arg ...?
+ *
+ * Commands manipulating metadata in the registry. This can be called `registry::metadata`
+ */
+int metadata_cmd(ClientData clientData UNUSED, Tcl_Interp* interp, int objc,
+ Tcl_Obj* CONST objv[]) {
+ if (objc < 3) {
+ Tcl_WrongNumArgs(interp, 1, objv, "cmd key ?value?");
+ return TCL_ERROR;
+ }
+ reg_registry* reg = registry_for(interp, reg_attached);
+ if (reg == NULL) {
+ return TCL_ERROR;
+ }
+ const char *cmdstring = Tcl_GetString(objv[1]);
+ reg_error error;
+ if (strcmp(cmdstring, "get") == 0) {
+ char *data;
+ if (reg_get_metadata(reg, Tcl_GetString(objv[2]), &data, &error)) {
+ Tcl_Obj* result = Tcl_NewStringObj(data, -1);
+ Tcl_SetObjResult(interp, result);
+ free(data);
+ return TCL_OK;
+ } else if (error.code == REG_NOT_FOUND) {
+ Tcl_Obj* result = Tcl_NewIntObj(-1);
+ Tcl_SetObjResult(interp, result);
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ } else if (strcmp(cmdstring, "set") == 0) {
+ if (objc < 4) {
+ Tcl_WrongNumArgs(interp, 1, objv, "set key value");
+ return TCL_ERROR;
+ }
+ if (reg_set_metadata(reg, Tcl_GetString(objv[2]), Tcl_GetString(objv[3]), &error)) {
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ } else if (strcmp(cmdstring, "del") == 0) {
+ if (reg_del_metadata(reg, Tcl_GetString(objv[2]), &error)) {
+ return TCL_OK;
+ } else {
+ return registry_failed(interp, &error);
+ }
+ }
+ return TCL_ERROR;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Initializer for the registry lib.
</span><span class="cx"> *
</span><span class="lines">@@ -338,6 +389,7 @@
</span><span class="cx"> /* Tcl_CreateObjCommand(interp, "registry::item", item_cmd, NULL, NULL); */
</span><span class="cx"> Tcl_CreateObjCommand(interp, "registry::entry", entry_cmd, NULL, NULL);
</span><span class="cx"> Tcl_CreateObjCommand(interp, "registry::file", file_cmd, NULL, NULL);
</span><ins>+ Tcl_CreateObjCommand(interp, "registry::metadata", metadata_cmd, NULL, NULL);
</ins><span class="cx"> if (Tcl_PkgProvide(interp, "registry2", "2.0") != TCL_OK) {
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>