record (surrogate diagnostic). Bug #715.
+Implemented ZOOM_record_error which returns error information for
+record (surrogate diagnostic).
+
--- 2.1.38 2006/10/31
Updates for SRU Update by Ko van der Sloot:
dnl YAZ Toolkit, Index Data 1994-2006
dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.45 2006-10-31 10:07:22 adam Exp $
+dnl $Id: configure.ac,v 1.46 2006-10-31 14:08:01 adam Exp $
AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.38],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[2.1.39],[yaz-help@indexdata.dk])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.8])
dh_fixperms
# dh_perl
# dh_python
- dh_makeshlibs -V 'libyaz (>= 2.1.36)'
+ dh_makeshlibs -V 'libyaz (>= 2.1.39)'
dh_installdeb
dh_shlibdeps -l debian/libyaz/usr/lib
dh_gencontrol
ZOOM_connection_scan1 (ZOOM_connection c, ZOOM_query startterm)
ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
-->
-<!-- $Id: zoom.xml,v 1.53 2006-10-24 11:48:42 mike Exp $ -->
+<!-- $Id: zoom.xml,v 1.54 2006-10-31 14:08:01 adam Exp $ -->
<chapter id="zoom"><title>ZOOM</title>
<para>
&zoom; is an acronym for 'Z39.50 Object-Orientation Model' and is
created from result sets.
</para>
<synopsis>
- void ZOOM_resultset_records (ZOOM_resultset r,
- ZOOM_record *recs,
- size_t start, size_t count);
- ZOOM_record ZOOM_resultset_record (ZOOM_resultset s, size_t pos);
+ void ZOOM_resultset_records(ZOOM_resultset r,
+ ZOOM_record *recs,
+ size_t start, size_t count);
+ ZOOM_record ZOOM_resultset_record(ZOOM_resultset s, size_t pos);
- const char *ZOOM_record_get (ZOOM_record rec, const char *type,
- size_t *len);
+ const char *ZOOM_record_get(ZOOM_record rec, const char *type,
+ size_t *len);
+
+ int ZOOM_record_error(ZOOM_record rec, const char **msg,
+ const char **addinfo, const char **diagset);
ZOOM_record ZOOM_record_clone (ZOOM_record rec);
If no record could be obtained <literal>NULL</literal> is returned.
</para>
<para>
+ Error information for a record can be checked with
+ <function>ZOOM_record_error</function> which returns non-zero
+ (error code) if record is in error, called <emphasis>Surrogate
+ Diagnostics</emphasis> in Z39.50.
+ </para>
+ <para>
Function <function>ZOOM_resultset_records</function> retrieves
a number of records from a result set. Parameter <literal>start</literal>
and <literal>count</literal> specifies the range of records to
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: yaz-version.h,v 1.102 2006-10-31 10:07:23 adam Exp $ */
+/* $Id: yaz-version.h,v 1.103 2006-10-31 14:08:02 adam Exp $ */
/**
* \file yaz-version.h
* \brief Defines YAZ version.
#include <yaz/yconfig.h>
-#define YAZ_VERSION "2.1.38"
-#define YAZ_VERSIONL 0x020126
+#define YAZ_VERSION "2.1.39"
+#define YAZ_VERSIONL 0x020127
#define YAZ_DATE 1
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $Id: zoom.h,v 1.39 2006-10-13 11:30:37 adam Exp $ */
+/* $Id: zoom.h,v 1.40 2006-10-31 14:08:02 adam Exp $ */
/**
* \file zoom.h
ZOOM_API(ZOOM_record)
ZOOM_record_clone (ZOOM_record srec);
+/* return error info (surrogate diagnostic) for record */
+ZOOM_API(int)
+ ZOOM_record_error(ZOOM_record rec, const char **msg,
+ const char **addinfo, const char **diagset);
+
/* ----------------------------------------------------------- */
/* queries */
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.93 2006-10-26 15:34:46 adam Exp $
+ * $Id: zoom-c.c,v 1.94 2006-10-31 14:08:03 adam Exp $
*/
/**
* \file zoom-c.c
odr_prepend(c->odr_out, "ZOOM-C",
ireq->implementationName));
- version = odr_strdup(c->odr_out, "$Revision: 1.93 $");
+ version = odr_strdup(c->odr_out, "$Revision: 1.94 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion =
return buf;
}
+ZOOM_API(int)
+ ZOOM_record_error(ZOOM_record rec, const char **cp,
+ const char **addinfo, const char **diagset)
+{
+ Z_NamePlusRecord *npr;
+
+ if (!rec)
+ return 0;
+ npr = rec->npr;
+ if (npr && npr->which == Z_NamePlusRecord_surrogateDiagnostic)
+ {
+ Z_DiagRec *diag_rec = npr->u.surrogateDiagnostic;
+ int error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ const char *add = 0;
+
+ if (diag_rec->which == Z_DiagRec_defaultFormat)
+ {
+ Z_DefaultDiagFormat *ddf = diag_rec->u.defaultFormat;
+ int oclass;
+
+ error = *ddf->condition;
+ switch (ddf->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ add = ddf->u.v2Addinfo;
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ add = ddf->u.v3Addinfo;
+ break;
+ }
+ if (diagset)
+ *diagset = yaz_z3950oid_to_str(ddf->diagnosticSetId, &oclass);
+ }
+ else
+ {
+ if (diagset)
+ *diagset = "Bib-1";
+ }
+ if (addinfo)
+ *addinfo = add ? add : "";
+ if (cp)
+ *cp = diagbib1_str(error);
+ return error;
+ }
+ return 0;
+}
+
ZOOM_API(const char *)
ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len)
{
* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: zoomsh.c,v 1.41 2006-04-24 10:30:44 adam Exp $
+ * $Id: zoomsh.c,v 1.42 2006-10-31 14:08:03 adam Exp $
*/
/** \file zoomsh.c
int pos = i + start;
ZOOM_record rec = ZOOM_resultset_record (r, pos);
const char *db = ZOOM_record_get (rec, "database", 0);
- int len, opac_len;
- const char *render = ZOOM_record_get (rec, "render", &len);
- const char *opac_render = ZOOM_record_get (rec, "opac", &opac_len);
- const char *syntax = ZOOM_record_get (rec, "syntax", 0);
- /* if rec is non-null, we got a record for display */
- if (rec)
+
+ if (ZOOM_record_error(rec, 0, 0, 0))
+ {
+ const char *msg;
+ const char *addinfo;
+ const char *diagset;
+ int error = ZOOM_record_error(rec, &msg, &addinfo, &diagset);
+
+ printf("%d %s: %s (%s:%d) %s\n", pos, (db ? db : "unknown"),
+ msg, diagset, error, addinfo);
+ }
+ else
{
- char oidbuf[100];
- (void) oid_name_to_dotstring(CLASS_RECSYN, syntax, oidbuf);
- printf ("%d %s %s (%s)\n",
- pos+1, (db ? db : "unknown"), syntax, oidbuf);
- if (render)
- fwrite (render, 1, len, stdout);
- printf ("\n");
- if (opac_render)
- fwrite (opac_render, 1, opac_len, stdout);
+ int len, opac_len;
+ const char *render = ZOOM_record_get (rec, "render", &len);
+ const char *opac_render = ZOOM_record_get (rec, "opac", &opac_len);
+ const char *syntax = ZOOM_record_get (rec, "syntax", 0);
+ /* if rec is non-null, we got a record for display */
+ if (rec)
+ {
+ char oidbuf[100];
+ (void) oid_name_to_dotstring(CLASS_RECSYN, syntax, oidbuf);
+ printf ("%d %s %s (%s)\n",
+ pos, (db ? db : "unknown"), syntax, oidbuf);
+ if (render)
+ fwrite (render, 1, len, stdout);
+ printf ("\n");
+ if (opac_render)
+ fwrite (opac_render, 1, opac_len, stdout);
+ }
}
}