# Sebastian Hammer, Adam Dickmeiss
#
# $Log: client.tcl,v $
-# Revision 1.41 1995-06-14 15:07:59 adam
+# Revision 1.42 1995-06-16 12:28:13 adam
+# Implemented preferredRecordSyntax.
+# Minor changes in diagnostic handling.
+# Record list deleted when connection closes.
+#
+# Revision 1.41 1995/06/14 15:07:59 adam
# Bug fix in cascade-target-list. Uses yaz-version.h.
#
# Revision 1.40 1995/06/14 13:37:17 adam
set lastSetNo 0
set cancelFlag 0
set searchEnable 0
+set scanEnable 0
set fullMarcSeq 0
set displayFormat 1
+set popupMarcdf 0
set textWrap word
set queryTypes {Simple}
{Subject {1=21}} {Any {1=1016}} } }
wm minsize . 0 0
+set setOffset 0
+set setMax 0
+
proc read-formats {} {
global displayFormats
set formats [glob -nocomplain formats/*.tcl]
proc set-display-format {f} {
global displayFormat
global setNo
+ global busy
set displayFormat $f
if {$setNo == 0} {
return
}
- .bot.a.status configure -text "Reformatting"
+ if {!$busy} {
+ .bot.a.status configure -text "Reformatting"
+ }
update idletasks
add-title-lines 0 10000 1
- .bot.a.status configure -text "Done"
+ if {!$busy} {
+ .bot.a.status configure -text "Ready"
+ }
}
proc initBindings {} {
set w Listbox
bind $w <B1-Motion> {}
bind $w <Shift-B1-Motion> {}
+
+ set w Entry
+}
+
+proc post-menu {wbutton wmenu} {
+ $wmenu activate none
+ focus $wmenu
+ $wmenu post [winfo rootx $wbutton] \
+ [expr [winfo rooty $wbutton]+[winfo height $wbutton]]
+
}
proc destroyGW {w} {
set cancelFlag 1
if {$busy} {
- show-status Cancelled 0 {}
+ show-status Canceling 0 {}
}
}
proc show-status {status b sb} {
global busy
global searchEnable
+ global scanEnable
+ global setOffset
+ global setMax
.bot.a.status configure -text "$status"
if {$b == 1} {
if {$sb} {
.top.service configure -state normal
.mid.search configure -state normal
- .mid.scan configure -state normal
- .mid.present configure -state normal
+ if {$scanEnable} {
+ .mid.scan configure -state normal
+ }
+ if {$setOffset > 0 && $setOffset <= $setMax} {
+ .top.service.m enable 1
+ .mid.present configure -state normal
+ } else {
+ .top.service.m disable 1
+ }
if {[winfo exists .scan-window]} {
.scan-window.bot.2 configure -state normal
.scan-window.bot.4 configure -state normal
set df $popupMarcdf
} else {
set w .full-marc
- if {[info exists popupMarcdf]} {
- set df $popupMarcdf
- } else {
- set popupMarcdf $df
- }
+ set df $popupMarcdf
}
if {[winfo exists $w]} {
set new 0
proc close-target {} {
global hostid
global cancelFlag
+ global setNo
set cancelFlag 0
+ set setNo 0
+ .bot.a.set configure -text ""
set hostid Default
z39 disconnect
show-target {}
show-status {Not connected} 0 0
+ init-title-lines
show-message {}
.top.target.m disable 1
.top.target.m disable 2
proc init-response {} {
global cancelFlag
+ global scanEnable
if {$cancelFlag} {
close-target
return
}
- show-status {Ready} 0 1
if {![z39 initResult]} {
+ show-status {Ready} 0 1
set u [z39 userInformationField]
close-target
tkerror "Connection rejected by target: $u"
+ } else {
+ if {[lsearch [z39 options] scan] >= 0} {
+ set scanEnable 1
+ } else {
+ set scanEnable 0
+ }
+ show-status {Ready} 0 1
}
}
}
incr setNo
ir-set z39.$setNo z39
+ z39.$setNo preferredRecordSyntax SUTRS
if {[lindex $profile($target) 10] == 1} {
z39.$setNo setName $setNo
}
z39 callback {search-response}
z39.$setNo search $query
- show-status {Search} 1 0
+ show-status {Searching} 1 0
}
proc scan-request {} {
z39.scan preferredPositionInResponse 1
z39.scan scan "${attr} 0"
- show-status {Scan} 1 0
+ show-status {Scanning} 1 0
}
proc scan-term-h {attr} {
} else {
z39.scan scan "${attr} \{${scanTerm}\}"
}
- show-status {Scan} 1 0
+ show-status {Scanning} 1 0
}
proc scan-response {attr start toget} {
} else {
z39.scan scan "${attr} \{${scanTerm}\}"
}
- show-status {Scan} 1 0
+ show-status {Scanning} 1 0
return
}
set status [z39.scan scanStatus]
puts "down: $q"
z39.scan numberOfTermsRequested 10
z39.scan preferredPositionInResponse 1
- show-status {Scan} 1 0
+ show-status {Scanning} 1 0
puts "${attr} \{$q\}"
z39.scan scan "${attr} \{$q\}"
return
puts "up: $q"
z39.scan numberOfTermsRequested 10
z39.scan preferredPositionInResponse 11
- show-status {Scan} 1 0
+ show-status {Scanning} 1 0
z39.scan scan "${attr} \{$q\}"
return
}
puts "In search-response"
init-title-lines
- show-status {Ready} 0 1
set setMax [z39.$setNo resultCount]
show-message "${setMax} hits"
set l [format "%-4d %7d" $setNo $setMax]
.top.rset.m add command -label $l \
-command [list add-title-lines $setNo 10000 1]
if {$setMax <= 0} {
+ show-status {Ready} 0 1
set status [z39.$setNo responseStatus]
if {[lindex $status 0] == "NSD"} {
set code [lindex $status 1]
set setMax 20
}
set setOffset 1
+ show-status {Ready} 0 1
if {$cancelFlag} {
set cancelFlag 0
return
}
z39 callback {present-response}
z39.$setNo present $setOffset 1
- show-status {Retrieve} 1 0
+ show-status {Retrieving} 1 0
}
proc present-more {number} {
set toGet 3
}
z39.$setNo present $setOffset $toGet
- show-status {Retrieve} 1 0
+ show-status {Retrieving} 1 0
}
proc init-title-lines {} {
}
z39.$setNo present $setOffset $toGet
} else {
- show-status {Finished} 0 1
+ show-status {Ready} 0 1
}
}
global hotTargets
global textWrap
global displayFormat
+ global popupMarcdf
set windowGeometry(.) [wm geometry .]
puts $f "set hotTargets \{ $hotTargets \}"
puts $f "set textWrap $textWrap"
puts $f "set displayFormat $displayFormat"
+ puts $f "set popupMarcdf $popupMarcdf"
foreach n [array names windowGeometry] {
puts -nonewline $f "set \{windowGeometry($n)\} \{"
puts -nonewline $f $windowGeometry($n)
set newI [.query-add-index.top.index.entry get]
lappend queryInfoTmp [list $newI {}]
- $w.top.index insert end $newI
+ $w.top.index.list insert end $newI
destroy .query-add-index
#destroy $w.top.lines
#frame $w.top.lines -relief ridge -border 2
global queryInfo
global queryButtonsTmp
global queryInfoTmp
+ global queryButtonsFind
+ global queryInfoFind
+
global settingsChanged
set settingsChanged 1
$queryInfoTmp]
set queryButtons [lreplace $queryButtons $queryNo $queryNo \
$queryButtonsTmp]
+ set queryInfoFind $queryInfoTmp
+ set queryButtonsFind $queryButtonsTmp
+
destroy .query-setup
+ index-lines .lines 1 $queryButtonsFind $queryInfoFind activate-index
}
proc activate-e-index {value no i} {
pack .data -side top -fill both -expand yes
pack .bot -fill x
-menubutton .top.file -text "File" -underline 0 -menu .top.file.m
+menubutton .top.file -text "File" -menu .top.file.m
menu .top.file.m
.top.file.m add command -label "Save settings" -command {save-settings}
.top.file.m add separator
.top.file.m add command -label "Exit" -command {exit-action}
-menubutton .top.target -text "Target" -underline 0 -menu .top.target.m
+menubutton .top.target -text "Target" -menu .top.target.m
menu .top.target.m
.top.target.m add cascade -label "Connect" -menu .top.target.m.clist
.top.target.m add command -label "Disconnect" -command {close-target}
menu .top.target.m.slist
cascade-target-list
-menubutton .top.service -text "Service" -underline 0 -menu .top.service.m
+menubutton .top.service -text "Service" -menu .top.service.m
menu .top.service.m
.top.service.m add command -label "Database" -command {database-select}
.top.service.m add cascade -label "Present" -menu .top.service.m.present
.top.rset.m add command -label "Load" -command {load-set}
.top.rset.m add separator
-menubutton .top.options -text "Options" -underline 0 -menu .top.options.m
+menubutton .top.options -text "Options" -menu .top.options.m
menu .top.options.m
.top.options.m add cascade -label "Query" -menu .top.options.m.query
.top.options.m add cascade -label "Format" -menu .top.options.m.formats
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ir-tcl.c,v $
- * Revision 1.40 1995-06-14 13:37:18 adam
+ * Revision 1.41 1995-06-16 12:28:16 adam
+ * Implemented preferredRecordSyntax.
+ * Minor changes in diagnostic handling.
+ * Record list deleted when connection closes.
+ *
+ * Revision 1.40 1995/06/14 13:37:18 adam
* Setting recordType implemented.
* Setting implementationVersion implemented.
* Settings implementationId / implementationName edited.
IrTcl_Method *tab;
} IrTcl_Methods;
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num);
static int do_disconnect (void *obj, Tcl_Interp *interp,
int argc, char **argv);
rl->u.dbrec.buf = NULL;
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- free (rl->u.diag.addinfo);
- rl->u.diag.addinfo = NULL;
+ ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num);
break;
}
break;
return rl;
}
+static struct {
+ enum oid_value value;
+ const char *name;
+} IrTcl_recordSyntaxTab[] = {
+{ VAL_UNIMARC, "UNIMARC" },
+{ VAL_INTERMARC, "INTERMARC" },
+{ VAL_CCF, "CCF" },
+{ VAL_USMARC, "USMARC" },
+{ VAL_UKMARC, "UKMARC" },
+{ VAL_NORMARC, "NORMARC" },
+{ VAL_LIBRISMARC, "LIBRISMARC" },
+{ VAL_DANMARC, "DANMARC" },
+{ VAL_FINMARC, "FINMARC" },
+{ VAL_MAB, "MAB" },
+{ VAL_CANMARC, "CANMARC" },
+{ VAL_SBN, "SBN" },
+{ VAL_PICAMARC, "PICAMARC" },
+{ VAL_AUSMARC, "AUSMARC" },
+{ VAL_IBERMARC, "IBERMARC" },
+{ VAL_SUTRS, "SUTRS" },
+{ 0, NULL }
+};
+
+/*
+ * IrTcl_eval
+ */
+int IrTcl_eval (Tcl_Interp *interp, const char *command)
+{
+ char *tmp = malloc (strlen(command)+1);
+ int r;
+
+ if (!tmp)
+ {
+ logf (LOG_FATAL, "Out of memory in IrTcl_eval");
+ exit (1);
+ }
+ strcpy (tmp, command);
+ r = Tcl_Eval (interp, tmp);
+ free (tmp);
+ return r;
+}
+
+/*
+ * IrTcl_getRecordSyntaxStr: Return record syntax name of object id
+ */
+static const char *IrTcl_getRecordSyntaxStr (enum oid_value value)
+{
+ int i;
+ for (i = 0; IrTcl_recordSyntaxTab[i].name; i++)
+ if (IrTcl_recordSyntaxTab[i].value == value)
+ return IrTcl_recordSyntaxTab[i].name;
+ return "USMARC";
+}
+
+/*
+ * IrTcl_getRecordSyntaxVal: Return record syntax value of string
+ */
+static enum oid_value IrTcl_getRecordSyntaxVal (const char *name)
+{
+ int i;
+ for (i = 0; IrTcl_recordSyntaxTab[i].name; i++)
+ if (!strcmp (IrTcl_recordSyntaxTab[i].name, name))
+ return IrTcl_recordSyntaxTab[i].value;
+ return 0;
+}
+
static IrTcl_RecordList *find_IR_record (IrTcl_SetObj *setobj, int no)
{
IrTcl_RecordList *rl;
free (rl->u.dbrec.buf);
break;
case Z_NamePlusRecord_surrogateDiagnostic:
- free (rl->u.diag.addinfo);
+ ir_deleteDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num);
break;
}
rl1 = rl->next;
}
/*
- * getsetint: Set/get integer value
+ * get_set_int: Set/get integer value
*/
static int get_set_int (int *val, Tcl_Interp *interp, int argc, char **argv)
{
}
/*
- * mk_nonSurrogateDiagnostics: Make Tcl result with diagnostic info
- */
-static int mk_nonSurrogateDiagnostics (Tcl_Interp *interp,
- int condition, const char *addinfo)
-{
- char buf[20];
- const char *cp;
-
- Tcl_AppendElement (interp, "NSD");
- sprintf (buf, "%d", condition);
- Tcl_AppendElement (interp, buf);
- cp = diagbib1_str (condition);
- if (cp)
- Tcl_AppendElement (interp, (char*) cp);
- else
- Tcl_AppendElement (interp, "");
- if (addinfo)
- Tcl_AppendElement (interp, (char*) addinfo);
- else
- Tcl_AppendElement (interp, "");
- return TCL_OK;
-}
-
-/*
* ir_method: Search for method in table and invoke method handler
*/
int ir_method (Tcl_Interp *interp, int argc, char **argv, IrTcl_Methods *tab)
static int do_init_request (void *obj, Tcl_Interp *interp,
int argc, char **argv)
{
- Z_APDU apdu, *apdup = &apdu;
+ Z_APDU *apdu;
IrTcl_Obj *p = obj;
- Z_InitRequest req;
+ Z_InitRequest *req;
int r;
if (argc <= 0)
return TCL_ERROR;
}
odr_reset (p->odr_out);
+ apdu = zget_APDU (p->odr_out, Z_APDU_initRequest);
+ req = apdu->u.initRequest;
- set_referenceId (p->odr_out, &req.referenceId, p->set_inher.referenceId);
- req.options = &p->options;
- req.protocolVersion = &p->protocolVersion;
- req.preferredMessageSize = &p->preferredMessageSize;
- req.maximumRecordSize = &p->maximumRecordSize;
+ set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);
+ req->options = &p->options;
+ req->protocolVersion = &p->protocolVersion;
+ req->preferredMessageSize = &p->preferredMessageSize;
+ req->maximumRecordSize = &p->maximumRecordSize;
if (p->idAuthenticationGroupId)
{
pass->password = p->idAuthenticationPassword;
else
pass->password = NULL;
- req.idAuthentication = auth;
+ req->idAuthentication = auth;
}
else if (!p->idAuthenticationOpen || !*p->idAuthenticationOpen)
- req.idAuthentication = NULL;
+ req->idAuthentication = NULL;
else
{
Z_IdAuthentication *auth = odr_malloc (p->odr_out, sizeof(*auth));
auth->which = Z_IdAuthentication_open;
auth->u.open = p->idAuthenticationOpen;
- req.idAuthentication = auth;
+ req->idAuthentication = auth;
}
- req.implementationId = p->implementationId;
- req.implementationName = p->implementationName;
- req.implementationVersion = p->implementationVersion;
- req.userInformationField = 0;
-
- apdu.u.initRequest = &req;
- apdu.which = Z_APDU_initRequest;
+ req->implementationId = p->implementationId;
+ req->implementationName = p->implementationName;
+ req->implementationVersion = p->implementationVersion;
+ req->userInformationField = 0;
- if (!z_APDU (p->odr_out, &apdup, 0))
+ if (!z_APDU (p->odr_out, &apdu, 0))
{
Tcl_AppendResult (interp, odr_errlist [odr_geterror (p->odr_out)],
NULL);
{
IrTcl_Obj *p = obj;
-#ifndef YAZ_VERSION
-#define YAZ_VERSION "0unknown"
-#endif
if (argc == 0)
return ir_strdup (interp, &p->implementationVersion, YAZ_VERSION);
else if (argc == -1)
void *addr;
IrTcl_Obj *p = obj;
int r;
- int protocol_type = PROTO_Z3950;
if (argc <= 0)
return TCL_OK;
interp->result = "already connected";
return TCL_ERROR;
}
- if (!strcmp (p->protocol_type, "Z3950"))
- protocol_type = PROTO_Z3950;
- else if (!strcmp (p->protocol_type, "SR"))
- protocol_type = PROTO_SR;
- else
- {
- interp->result = "bad protocol type";
- return TCL_ERROR;
- }
if (!strcmp (p->cs_type, "tcpip"))
{
- p->cs_link = cs_create (tcpip_type, CS_BLOCK, protocol_type);
+ p->cs_link = cs_create (tcpip_type, CS_BLOCK, p->protocol_type);
addr = tcpip_strtoaddr (argv[2]);
if (!addr)
{
}
logf (LOG_DEBUG, "tcp/ip connect %s", argv[2]);
}
-#if MOSI
else if (!strcmp (p->cs_type, "mosi"))
{
- p->cs_link = cs_create (mosi_type, CS_BLOCK, protocol_type);
+#if MOSI
+ p->cs_link = cs_create (mosi_type, CS_BLOCK, p->protocol_type);
addr = mosi_strtoaddr (argv[2]);
if (!addr)
{
return TCL_ERROR;
}
logf (LOG_DEBUG, "mosi connect %s", argv[2]);
- }
+#else
+ interp->result = "MOSI support not there";
+ return TCL_ERROR;
#endif
+ }
else
{
- interp->result = "unknown comstack type";
+ Tcl_AppendResult (interp, "Bad comstack type: ",
+ p->cs_type, NULL);
return TCL_ERROR;
}
if (ir_strdup (interp, &p->hostname, argv[2]) == TCL_ERROR)
{
p->connectFlag = 0;
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
}
}
if (p->hostname)
assert (p->cs_link);
cs_close (p->cs_link);
p->cs_link = NULL;
+
+ ODR_MASK_ZERO (&p->options);
+ ODR_MASK_SET (&p->options, 0);
+ ODR_MASK_SET (&p->options, 1);
+ ODR_MASK_SET (&p->options, 7);
+ ODR_MASK_SET (&p->options, 14);
}
assert (!p->cs_link);
return TCL_OK;
return TCL_OK;
}
-/*
- * do_protocol: Set/get protocol method on IR object
- */
-static int do_protocol (void *o, Tcl_Interp *interp,
- int argc, char **argv)
-{
- IrTcl_Obj *obj = o;
-
- if (argc == 0)
- return ir_strdup (interp, &obj->protocol_type, "Z3950");
- else if (argc == -1)
- return ir_strdel (interp, &obj->protocol_type);
- else if (argc == 3)
- {
- free (obj->protocol_type);
- if (ir_strdup (interp, &obj->protocol_type, argv[2]) == TCL_ERROR)
- return TCL_ERROR;
- }
- Tcl_AppendElement (interp, obj->protocol_type);
- return TCL_OK;
-}
/*
* do_callback: add callback
}
/*
+ * do_protocol: Set/get protocol method on IR object
+ */
+static int do_protocol (void *o, Tcl_Interp *interp, int argc, char **argv)
+{
+ IrTcl_Obj *p = o;
+
+ if (argc <= 0)
+ {
+ p->protocol_type = PROTO_Z3950;
+ return TCL_OK;
+ }
+ else if (argc == 3)
+ {
+ if (!strcmp (argv[2], "Z3950"))
+ p->protocol_type = PROTO_Z3950;
+ else if (!strcmp (argv[2], "SR"))
+ p->protocol_type = PROTO_SR;
+ else
+ {
+ Tcl_AppendResult (interp, "Bad protocol: ", argv[2], NULL);
+ return TCL_ERROR;
+ }
+ return TCL_OK;
+ }
+ switch (p->protocol_type)
+ {
+ case PROTO_Z3950:
+ Tcl_AppendElement (interp, "Z3950");
+ break;
+ case PROTO_SR:
+ Tcl_AppendElement (interp, "SR");
+ break;
+ }
+ return TCL_OK;
+}
+
+/*
* do_databaseNames: specify database names
*/
static int do_databaseNames (void *obj, Tcl_Interp *interp,
- int argc, char **argv)
+ int argc, char **argv)
{
int i;
IrTcl_SetCObj *p = obj;
IrTcl_SetCObj *p = obj;
if (argc == 0)
+ {
p->referenceId = NULL;
+ return TCL_OK;
+ }
else if (argc == -1)
return ir_strdel (interp, &p->referenceId);
if (argc == 3)
return TCL_OK;
}
+/*
+ * do_preferredRecordSyntax: Set/get preferred record syntax
+ */
+static int do_preferredRecordSyntax (void *obj, Tcl_Interp *interp,
+ int argc, char **argv)
+{
+ IrTcl_SetCObj *p = obj;
+
+ if (argc == 0)
+ {
+ p->preferredRecordSyntax = NULL;
+ return TCL_OK;
+ }
+ else if (argc == -1)
+ {
+ free (p->preferredRecordSyntax);
+ p->preferredRecordSyntax = NULL;
+ return TCL_OK;
+ }
+ if (argc == 3)
+ {
+ free (p->preferredRecordSyntax);
+ p->preferredRecordSyntax = NULL;
+ if (argv[2][0] && (p->preferredRecordSyntax =
+ malloc (sizeof(*p->preferredRecordSyntax))))
+ *p->preferredRecordSyntax = IrTcl_getRecordSyntaxVal (argv[2]);
+ }
+ return TCL_OK;
+
+}
static IrTcl_Method ir_method_tab[] = {
{ 1, "comstack", do_comstack },
{ 1, "protocol", do_protocol },
{ 0, "databaseNames", do_databaseNames},
{ 0, "replaceIndicator", do_replaceIndicator},
{ 0, "queryType", do_queryType },
+{ 0, "preferredRecordSyntax", do_preferredRecordSyntax },
{ 0, "smallSetUpperBound", do_smallSetUpperBound},
{ 0, "largeSetLowerBound", do_largeSetLowerBound},
{ 0, "mediumSetPresentNumber", do_mediumSetPresentNumber},
/*
* do_search: Do search request
*/
-static int do_search (void *o, Tcl_Interp *interp,
- int argc, char **argv)
+static int do_search (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- Z_SearchRequest req;
+ Z_SearchRequest *req;
Z_Query query;
- Z_APDU apdu, *apdup = &apdu;
+ Z_APDU *apdu;
Odr_oct ccl_query;
IrTcl_SetObj *obj = o;
IrTcl_Obj *p = obj->parent;
return TCL_ERROR;
}
odr_reset (p->odr_out);
- apdu.which = Z_APDU_searchRequest;
- apdu.u.searchRequest = &req;
-
- bib1.proto = PROTO_Z3950;
+ apdu = zget_APDU (p->odr_out, Z_APDU_searchRequest);
+ req = apdu->u.searchRequest;
+
+ bib1.proto = p->protocol_type;
bib1.class = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
-
- req.smallSetUpperBound = &obj->set_inher.smallSetUpperBound;
- req.largeSetLowerBound = &obj->set_inher.largeSetLowerBound;
- req.mediumSetPresentNumber = &obj->set_inher.mediumSetPresentNumber;
- req.replaceIndicator = &obj->set_inher.replaceIndicator;
- req.resultSetName = obj->setName ? obj->setName : "Default";
- logf (LOG_DEBUG, "Search, resultSetName %s", req.resultSetName);
- req.num_databaseNames = obj->set_inher.num_databaseNames;
- req.databaseNames = obj->set_inher.databaseNames;
+ set_referenceId (p->odr_out, &req->referenceId,
+ obj->set_inher.referenceId);
+
+ req->smallSetUpperBound = &obj->set_inher.smallSetUpperBound;
+ req->largeSetLowerBound = &obj->set_inher.largeSetLowerBound;
+ req->mediumSetPresentNumber = &obj->set_inher.mediumSetPresentNumber;
+ req->replaceIndicator = &obj->set_inher.replaceIndicator;
+ req->resultSetName = obj->setName ? obj->setName : "Default";
+ logf (LOG_DEBUG, "Search, resultSetName %s", req->resultSetName);
+ req->num_databaseNames = obj->set_inher.num_databaseNames;
+ req->databaseNames = obj->set_inher.databaseNames;
for (r=0; r < obj->set_inher.num_databaseNames; r++)
logf (LOG_DEBUG, " Database %s", obj->set_inher.databaseNames[r]);
- req.smallSetElementSetNames = 0;
- req.mediumSetElementSetNames = 0;
- req.preferredRecordSyntax = 0;
- req.query = &query;
+ req->smallSetElementSetNames = 0;
+ req->mediumSetElementSetNames = 0;
+ if (obj->set_inher.preferredRecordSyntax)
+ {
+ struct oident ident;
+
+ ident.proto = p->protocol_type;
+ ident.class = CLASS_RECSYN;
+ ident.value = *obj->set_inher.preferredRecordSyntax;
+ req->preferredRecordSyntax = odr_oiddup (p->odr_out,
+ oid_getoidbyent (&ident));
+ }
+ else
+ req->preferredRecordSyntax = 0;
+ req->query = &query;
if (!strcmp (obj->set_inher.queryType, "rpn"))
{
interp->result = "unknown query method";
return TCL_ERROR;
}
- if (!z_APDU (p->odr_out, &apdup, 0))
+ if (!z_APDU (p->odr_out, &apdu, 0))
{
interp->result = odr_errlist [odr_geterror (p->odr_out)];
odr_reset (p->odr_out);
{
IrTcl_SetObj *obj = o;
- if (argc < 0)
+ if (argc <= 0)
+ {
+ obj->numberOfRecordsReturned = 0;
return TCL_OK;
+ }
return get_set_int (&obj->numberOfRecordsReturned, interp, argc, argv);
}
return TCL_OK;
}
+
/*
* do_recordType: Return record type (if any) at position.
*/
IrTcl_SetObj *obj = o;
int offset;
IrTcl_RecordList *rl;
- char *cp;
if (argc == 0)
{
Tcl_AppendResult (interp, "No DB record at #", argv[2], NULL);
return TCL_ERROR;
}
- switch (rl->u.dbrec.type)
+ Tcl_AppendElement (interp, (char*)
+ IrTcl_getRecordSyntaxStr (rl->u.dbrec.type));
+ return TCL_OK;
+}
+
+/*
+ * ir_diagResult
+ */
+static int ir_diagResult (Tcl_Interp *interp, IrTcl_Diagnostic *list, int num)
+{
+ char buf[20];
+ int i;
+ const char *cp;
+
+ for (i = 0; i<num; i++)
{
- case VAL_UNIMARC:
- cp = "UNIMARC";
- break;
- case VAL_INTERMARC:
- cp = "INTERMARC";
- break;
- case VAL_CCF:
- cp = "CCF";
- break;
- case VAL_USMARC:
- cp = "USMARC";
- break;
- case VAL_UKMARC:
- cp = "UKMARC";
- break;
- case VAL_NORMARC:
- cp = "NORMARC";
- break;
- case VAL_LIBRISMARC:
- cp = "LIBRISMARC";
- break;
- case VAL_DANMARC:
- cp = "DANMARC";
- break;
- case VAL_FINMARC:
- cp = "FINMARC";
- break;
- case VAL_MAB:
- cp = "MAB";
- break;
- case VAL_CANMARC:
- cp = "CANMARC";
- break;
- case VAL_SBN:
- cp = "SBN";
- break;
- case VAL_PICAMARC:
- cp = "PICAMARC";
- break;
- case VAL_AUSMARC:
- cp = "AUSMARC";
- break;
- case VAL_IBERMARC:
- cp = "IBERMARC";
- break;
- case VAL_SUTRS:
- cp = "SUTRS";
- break;
- default:
- cp = "";
+ logf (LOG_DEBUG, "Diagnostic, code %d", list[i].condition);
+ sprintf (buf, "%d", list[i].condition);
+ Tcl_AppendElement (interp, buf);
+ cp = diagbib1_str (list[i].condition);
+ if (cp)
+ Tcl_AppendElement (interp, (char*) cp);
+ else
+ Tcl_AppendElement (interp, "");
+ if (list[i].addinfo)
+ Tcl_AppendElement (interp, (char*) list[i].addinfo);
+ else
+ Tcl_AppendElement (interp, "");
}
- Tcl_AppendElement (interp, cp);
return TCL_OK;
}
IrTcl_SetObj *obj = o;
int offset;
IrTcl_RecordList *rl;
- char buf[20];
- const char *cp;
if (argc <= 0)
return TCL_OK;
Tcl_AppendResult (interp, "No Diagnostic record at #", argv[2], NULL);
return TCL_ERROR;
}
-
- sprintf (buf, "%d", rl->u.diag.condition);
- Tcl_AppendElement (interp, buf);
- cp = diagbib1_str (rl->u.diag.condition);
- if (cp)
- Tcl_AppendElement (interp, (char*) cp);
- else
- Tcl_AppendElement (interp, "");
- if (rl->u.diag.addinfo)
- Tcl_AppendElement (interp, (char*) rl->u.diag.addinfo);
- else
- Tcl_AppendElement (interp, "");
- return TCL_OK;
+ return ir_diagResult (interp, rl->u.surrogateDiagnostics.list,
+ rl->u.surrogateDiagnostics.num);
}
/*
if (argc == 0)
{
obj->recordFlag = 0;
- obj->addinfo = NULL;
+ obj->nonSurrogateDiagnosticNum = 0;
+ obj->nonSurrogateDiagnosticList = NULL;
return TCL_OK;
}
else if (argc == -1)
- return ir_strdel (interp, &obj->addinfo);
+ {
+ ir_deleteDiags (&obj->nonSurrogateDiagnosticList,
+ &obj->nonSurrogateDiagnosticNum);
+ return TCL_OK;
+ }
if (!obj->recordFlag)
{
Tcl_AppendElement (interp, "OK");
Tcl_AppendElement (interp, "DBOSD");
break;
case Z_Records_NSD:
- return mk_nonSurrogateDiagnostics (interp, obj->condition,
- obj->addinfo);
+ Tcl_AppendElement (interp, "NSD");
+ return ir_diagResult (interp, obj->nonSurrogateDiagnosticList,
+ obj->nonSurrogateDiagnosticNum);
}
return TCL_OK;
}
{
IrTcl_SetObj *obj = o;
IrTcl_Obj *p = obj->parent;
- Z_APDU apdu, *apdup = &apdu;
- Z_PresentRequest req;
+ Z_APDU *apdu;
+ Z_PresentRequest *req;
int start;
int number;
int r;
obj->start = start;
obj->number = number;
- apdu.which = Z_APDU_presentRequest;
- apdu.u.presentRequest = &req;
+ apdu = zget_APDU (p->odr_out, Z_APDU_presentRequest);
+ req = apdu->u.presentRequest;
- set_referenceId (p->odr_out, &req.referenceId, obj->set_inher.referenceId);
+ set_referenceId (p->odr_out, &req->referenceId,
+ obj->set_inher.referenceId);
- req.resultSetId = obj->setName ? obj->setName : "Default";
+ req->resultSetId = obj->setName ? obj->setName : "Default";
- req.resultSetStartPoint = &start;
- req.numberOfRecordsRequested = &number;
- req.elementSetNames = 0;
- req.preferredRecordSyntax = 0;
+ req->resultSetStartPoint = &start;
+ req->numberOfRecordsRequested = &number;
+ req->preferredRecordSyntax = 0;
- if (!z_APDU (p->odr_out, &apdup, 0))
+ if (!z_APDU (p->odr_out, &apdu, 0))
{
interp->result = odr_errlist [odr_geterror (p->odr_out)];
odr_reset (p->odr_out);
if (ir_strdup (interp, &dst->referenceId, src->referenceId)
== TCL_ERROR)
return TCL_ERROR;
-
+
+ if (src->preferredRecordSyntax &&
+ (dst->preferredRecordSyntax
+ = malloc (sizeof(*dst->preferredRecordSyntax))))
+ *dst->preferredRecordSyntax = *src->preferredRecordSyntax;
+ else
+ dst->preferredRecordSyntax = NULL;
dst->replaceIndicator = src->replaceIndicator;
dst->smallSetUpperBound = src->smallSetUpperBound;
dst->largeSetLowerBound = src->largeSetLowerBound;
*/
static int do_scan (void *o, Tcl_Interp *interp, int argc, char **argv)
{
- Z_ScanRequest req;
- Z_APDU apdu, *apdup = &apdu;
+ Z_ScanRequest *req;
+ Z_APDU *apdu;
IrTcl_ScanObj *obj = o;
IrTcl_Obj *p = obj->parent;
int r;
}
odr_reset (p->odr_out);
- bib1.proto = PROTO_Z3950;
+ bib1.proto = p->protocol_type;
bib1.class = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- apdu.which = Z_APDU_scanRequest;
- apdu.u.scanRequest = &req;
- set_referenceId (p->odr_out, &req.referenceId, p->set_inher.referenceId);
- req.num_databaseNames = p->set_inher.num_databaseNames;
- req.databaseNames = p->set_inher.databaseNames;
- req.attributeSet = oid_getoidbyent (&bib1);
+ apdu = zget_APDU (p->odr_out, Z_APDU_scanRequest);
+ req = apdu->u.scanRequest;
+
+ set_referenceId (p->odr_out, &req->referenceId, p->set_inher.referenceId);
+ req->num_databaseNames = p->set_inher.num_databaseNames;
+ req->databaseNames = p->set_inher.databaseNames;
+ req->attributeSet = oid_getoidbyent (&bib1);
#if !CCL2RPN
- if (!(req.termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
+ if (!(req->termListAndStartPoint = p_query_scan (p->odr_out, argv[2])))
{
Tcl_AppendResult (interp, "Syntax error in query", NULL);
return TCL_ERROR;
}
ccl_pr_tree (rpn, stderr);
fprintf (stderr, "\n");
- if (!(req.termListAndStartPoint = ccl_scan_query (rpn)))
+ if (!(req->termListAndStartPoint = ccl_scan_query (rpn)))
return TCL_ERROR;
#endif
- req.stepSize = &obj->stepSize;
- req.numberOfTermsRequested = &obj->numberOfTermsRequested;
- req.preferredPositionInResponse = &obj->preferredPositionInResponse;
- logf (LOG_DEBUG, "stepSize=%d", *req.stepSize);
+ req->stepSize = &obj->stepSize;
+ req->numberOfTermsRequested = &obj->numberOfTermsRequested;
+ req->preferredPositionInResponse = &obj->preferredPositionInResponse;
+ logf (LOG_DEBUG, "stepSize=%d", *req->stepSize);
logf (LOG_DEBUG, "numberOfTermsRequested=%d",
- *req.numberOfTermsRequested);
+ *req->numberOfTermsRequested);
logf (LOG_DEBUG, "preferredPositionInResponse=%d",
- *req.preferredPositionInResponse);
+ *req->preferredPositionInResponse);
- if (!z_APDU (p->odr_out, &apdup, 0))
+ if (!z_APDU (p->odr_out, &apdu, 0))
{
interp->result = odr_errlist [odr_geterror (p->odr_out)];
odr_reset (p->odr_out);
{
p->entries_flag = 0;
p->entries = NULL;
- p->nonSurrogateDiagnostics = NULL;
+ p->nonSurrogateDiagnosticNum = 0;
+ p->nonSurrogateDiagnosticList = 0;
return TCL_OK;
}
else if (argc == -1)
{
p->entries_flag = 0;
/* release entries */
- p->entries = NULL;
- /* release non diagnostics */
- p->nonSurrogateDiagnostics = NULL;
+ p->entries = NULL;
+
+ ir_deleteDiags (&p->nonSurrogateDiagnosticList,
+ &p->nonSurrogateDiagnosticNum);
return TCL_OK;
}
if (argc != 3)
Tcl_AppendElement (interp, numstr);
break;
case Z_Entry_surrogateDiagnostic:
- return
- mk_nonSurrogateDiagnostics (interp, p->entries[i].u.diag.condition,
- p->entries[i].u.diag.addinfo);
+ Tcl_AppendElement (interp, "SD");
+ return ir_diagResult (interp, p->entries[i].u.diag.list,
+ p->entries[i].u.diag.num);
break;
}
return TCL_OK;
}
}
+static void ir_deleteDiags (IrTcl_Diagnostic **dst_list, int *dst_num)
+{
+ int i;
+ for (i = 0; i<*dst_num; i++)
+ free (dst_list[i]->addinfo);
+ free (*dst_list);
+ *dst_list = NULL;
+ *dst_num = 0;
+}
+
+static void ir_handleDiags (IrTcl_Diagnostic **dst_list, int *dst_num,
+ Z_DiagRec **list, int num)
+{
+ int i;
+ char *addinfo;
+
+ *dst_num = num;
+ *dst_list = malloc (sizeof(**dst_list) * num);
+ if (!*dst_list)
+ {
+ *dst_num = 0;
+ return;
+ }
+ for (i = 0; i<num; i++)
+ {
+ switch (list[i]->which)
+ {
+ case Z_DiagRec_defaultFormat:
+ (*dst_list)[i].condition = *list[i]->u.defaultFormat->condition;
+ addinfo = list[i]->u.defaultFormat->addinfo;
+ if (addinfo &&
+ ((*dst_list)[i].addinfo = malloc (strlen(addinfo)+1)))
+ strcpy ((*dst_list)[i].addinfo, addinfo);
+ break;
+ default:
+ (*dst_list)[i].addinfo = NULL;
+ (*dst_list)[i].condition = 0;
+ }
+ }
+}
+
static void ir_handleRecords (void *o, Z_Records *zrs)
{
IrTcl_Obj *p = o;
IrTcl_SetObj *setobj = p->set_child;
+ int offset;
+ IrTcl_RecordList *rl;
+
setobj->which = zrs->which;
setobj->recordFlag = 1;
- if (zrs->which == Z_Records_NSD)
- {
- const char *addinfo;
-
- setobj->numberOfRecordsReturned = 0;
- setobj->condition = *zrs->u.nonSurrogateDiagnostic->condition;
- free (setobj->addinfo);
- setobj->addinfo = NULL;
- addinfo = zrs->u.nonSurrogateDiagnostic->addinfo;
- if (addinfo && (setobj->addinfo = malloc (strlen(addinfo) + 1)))
- strcpy (setobj->addinfo, addinfo);
- logf (LOG_DEBUG, "Diagnostic response. %s (%d): %s",
- diagbib1_str (setobj->condition),
- setobj->condition,
- setobj->addinfo ? setobj->addinfo : "");
- }
- else
+
+ ir_deleteDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum);
+ if (zrs->which == Z_Records_DBOSD)
{
- int offset;
- IrTcl_RecordList *rl;
-
setobj->numberOfRecordsReturned =
zrs->u.databaseOrSurDiagnostics->num_records;
logf (LOG_DEBUG, "Got %d records", setobj->numberOfRecordsReturned);
records[offset]->which);
if (rl->which == Z_NamePlusRecord_surrogateDiagnostic)
{
- Z_DiagRec *diagrec;
-
- diagrec = zrs->u.databaseOrSurDiagnostics->
- records[offset]->u.surrogateDiagnostic;
-
- rl->u.diag.condition = *diagrec->condition;
- if (diagrec->addinfo && (rl->u.diag.addinfo =
- malloc (strlen (diagrec->addinfo)+1)))
- strcpy (rl->u.diag.addinfo, diagrec->addinfo);
- }
+ ir_handleDiags (&rl->u.surrogateDiagnostics.list,
+ &rl->u.surrogateDiagnostics.num,
+ &zrs->u.databaseOrSurDiagnostics->
+ records[offset]->u.surrogateDiagnostic,
+ 1);
+ }
else
{
Z_DatabaseRecord *zr;
}
}
}
+ else if (zrs->which == Z_Records_multipleNSD)
+ {
+ logf (LOG_DEBUG, "multipleNonSurrogateDiagnostic %d",
+ zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+ setobj->numberOfRecordsReturned = 0;
+ ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum,
+ zrs->u.multipleNonSurDiagnostics->diagRecs,
+ zrs->u.multipleNonSurDiagnostics->num_diagRecs);
+ }
+ else
+ {
+ logf (LOG_DEBUG, "NonSurrogateDiagnostic");
+ setobj->numberOfRecordsReturned = 0;
+ ir_handleDiags (&setobj->nonSurrogateDiagnosticList,
+ &setobj->nonSurrogateDiagnosticNum,
+ &zrs->u.nonSurrogateDiagnostic,
+ 1);
+ }
}
static void ir_searchResponse (void *o, Z_SearchResponse *searchrs)
free (scanobj->entries);
scanobj->entries = NULL;
- free (scanobj->nonSurrogateDiagnostics);
- scanobj->nonSurrogateDiagnostics = NULL;
+ ir_deleteDiags (&scanobj->nonSurrogateDiagnosticList,
+ &scanobj->nonSurrogateDiagnosticNum);
if (scanrs->entries)
{
int i;
scanobj->entries[i].u.term.globalOccurrences = 0;
break;
case Z_Entry_surrogateDiagnostic:
- scanobj->entries[i].u.diag.addinfo =
- malloc (1+strlen(ze->u.surrogateDiagnostic->
- addinfo));
- strcpy (scanobj->entries[i].u.diag.addinfo,
- ze->u.surrogateDiagnostic->addinfo);
- scanobj->entries[i].u.diag.condition =
- *ze->u.surrogateDiagnostic->condition;
+ ir_handleDiags (&scanobj->entries[i].u.diag.list,
+ &scanobj->entries[i].u.diag.num,
+ &ze->u.surrogateDiagnostic,
+ 1);
break;
}
}
break;
case Z_ListEntries_nonSurrogateDiagnostics:
- scanobj->num_diagRecs = scanrs->entries->
- u.nonSurrogateDiagnostics->num_diagRecs;
- scanobj->nonSurrogateDiagnostics = malloc (scanobj->num_diagRecs *
- sizeof(*scanobj->nonSurrogateDiagnostics));
+ ir_handleDiags (&scanobj->nonSurrogateDiagnosticList,
+ &scanobj->nonSurrogateDiagnosticNum,
+ scanrs->entries->u.nonSurrogateDiagnostics->
+ diagRecs,
+ scanrs->entries->u.nonSurrogateDiagnostics->
+ num_diagRecs);
break;
}
}
{
logf (LOG_DEBUG, "cs_rcvconnect error");
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
return;
}
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
return;
}
do
logf (LOG_DEBUG, "cs_get failed, code %d", r);
ir_select_remove (cs_fileno (p->cs_link), p);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
/* relase ir object now if callback deleted it */
{
logf (LOG_DEBUG, "%s", odr_errlist [odr_geterror (p->odr_in)]);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
- /* release ir object now if callback deleted it */
+ /* release ir object now if failback deleted it */
ir_obj_delete (p);
return;
}
default:
logf (LOG_WARN, "Received unknown APDU type (%d)", apdu->which);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
}
odr_reset (p->odr_in);
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
if (p->ref_count == 1)
{
ir_obj_delete (p);
logf (LOG_DEBUG, "cs_rcvconnect error");
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
return;
}
ir_select_remove_write (cs_fileno (p->cs_link), p);
if (p->callback)
- Tcl_Eval (p->interp, p->callback);
+ IrTcl_eval (p->interp, p->callback);
return;
}
if ((r=cs_put (p->cs_link, p->sbuf, p->slen)) < 0)
{
logf (LOG_DEBUG, "select write fail");
if (p->failback)
- Tcl_Eval (p->interp, p->failback);
+ IrTcl_eval (p->interp, p->failback);
do_disconnect (p, NULL, 2, NULL);
}
else if (r == 0) /* remove select bit */
projects / ir-tcl-moved-to-github.git / commitdiff