From 205549626352a3cc49c85b8fa055ffde318aad42 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 17 May 2001 14:16:15 +0000 Subject: [PATCH] Added EXTERNAL handling for item update0 (1.0). --- include/yaz/prt-ext.h | 2 ++ include/yaz/z-proto.h | 6 +++++- util/cvs-date.tcl | 5 +++-- zutil/prt-ext.c | 10 +++++++--- zutil/zget.c | 13 ++++++++----- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/include/yaz/prt-ext.h b/include/yaz/prt-ext.h index d3e5bf8..5d78106 100644 --- a/include/yaz/prt-ext.h +++ b/include/yaz/prt-ext.h @@ -78,6 +78,7 @@ struct Z_External #define Z_External_dateTime 17 #define Z_External_universeReport 18 #define Z_External_ESAdmin 19 +#define Z_External_update0 20 union { /* Generic types */ @@ -103,6 +104,7 @@ struct Z_External Z_UniverseReport *universeReport; #ifdef ASN_COMPILED Z_Admin *adminService; + Z_IU0Update *update0; #endif } u; }; diff --git a/include/yaz/z-proto.h b/include/yaz/z-proto.h index 4662f91..1717330 100644 --- a/include/yaz/z-proto.h +++ b/include/yaz/z-proto.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: z-proto.h,v $ - * Revision 1.4 2000-03-14 09:19:49 ian + * Revision 1.5 2001-05-17 14:16:15 adam + * Added EXTERNAL handling for item update0 (1.0). + * + * Revision 1.4 2000/03/14 09:19:49 ian * Added admin extended service encoders & decoders. * * Revision 1.3 2000/02/28 11:20:06 adam @@ -61,6 +64,7 @@ #include #include #include +#include YAZ_BEGIN_CDECL diff --git a/util/cvs-date.tcl b/util/cvs-date.tcl index b1f9dd4..658c3a8 100755 --- a/util/cvs-date.tcl +++ b/util/cvs-date.tcl @@ -2,7 +2,7 @@ # the next line restarts using tclsh \ exec tclsh "$0" "$@" # -# $Id: cvs-date.tcl,v 1.1 2001-05-16 07:37:39 adam Exp $ +# $Id: cvs-date.tcl,v 1.2 2001-05-17 14:16:15 adam Exp $ set sec 0 proc cvslog {} { @@ -25,7 +25,8 @@ if {$sec} { set fname [lindex $argv 0] if {[string length $fname]} { set f [open [lindex $argv 0] w] - puts $f "#define YAZ_DATE \"$sec\"" + puts $f "#define YAZ_DATE ${sec}L" + puts $f "#define YAZ_DATE_STR \"$sec\"" close $f } else { puts $sec diff --git a/zutil/prt-ext.c b/zutil/prt-ext.c index 14ff4a0..099155a 100644 --- a/zutil/prt-ext.c +++ b/zutil/prt-ext.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: prt-ext.c,v $ - * Revision 1.5 2001-03-25 21:55:13 adam + * Revision 1.6 2001-05-17 14:16:15 adam + * Added EXTERNAL handling for item update0 (1.0). + * + * Revision 1.5 2001/03/25 21:55:13 adam * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. * * Revision 1.4 2000/03/14 15:22:04 ian @@ -188,8 +191,9 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) #ifdef ASN_COMPILED {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_ESAdmin, (Odr_fun)z_Admin, 0}, -#endif - {-1, -1, -1, -1, 0, 0} + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update0, + (Odr_fun)z_IU0Update, 0}, +#endif {-1, -1, -1, -1, 0, 0} }; odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL); diff --git a/zutil/zget.c b/zutil/zget.c index 7f8d205..1ee79fc 100644 --- a/zutil/zget.c +++ b/zutil/zget.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zget.c,v $ - * Revision 1.7 2001-05-16 07:22:56 adam + * Revision 1.8 2001-05-17 14:16:15 adam + * Added EXTERNAL handling for item update0 (1.0). + * + * Revision 1.7 2001/05/16 07:22:56 adam * YAZ CVS Date part of implementationVersion in init{request,Response}. * * Revision 1.6 2001/03/25 21:55:13 adam @@ -99,8 +102,8 @@ Z_InitRequest *zget_InitRequest(ODR o) r->implementationId = "81"; r->implementationName = "Index Data/YAZ"; r->implementationVersion = YAZ_VERSION -#ifdef YAZ_DATE - " (" YAZ_DATE ")" +#ifdef YAZ_DATE_STR + " (" YAZ_DATE_STR ")" #endif ; r->userInformationField = 0; @@ -123,8 +126,8 @@ Z_InitResponse *zget_InitResponse(ODR o) r->implementationId = "81"; r->implementationName = "Index Data/YAZ"; r->implementationVersion = YAZ_VERSION -#ifdef YAZ_DATE - " (" YAZ_DATE ")" +#ifdef YAZ_DATE_STR + " (" YAZ_DATE_STR ")" #endif ; r->userInformationField = 0; -- 1.7.10.4