* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.68 1998-07-20 12:37:06 adam
+ * Revision 1.73 1998-10-20 13:55:43 quinn
+ * Fixed Scan bug in asn and client
+ *
+ * Revision 1.72 1998/10/20 13:23:15 quinn
+ * changed preferred pos to 1
+ *
+ * Revision 1.71 1998/10/20 13:21:43 adam
+ * Fixed scan response handler.
+ *
+ * Revision 1.70 1998/09/22 09:40:37 adam
+ * Minor changes in sort spec.
+ *
+ * Revision 1.69 1998/08/19 16:10:06 adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.68 1998/07/20 12:37:06 adam
* Added 'delete <resultset>' command. Changed open command so that
* it reconnects if already connected.
*
req->referenceId = set_refid (out);
- req->num_ids = 1;
+ req->num_resultSetList = 1;
req->resultSetList = (char **)
odr_malloc (out, sizeof(*req->resultSetList));
*req->resultSetList = arg;
fflush(stdout);
send_itemorder(arg);
- return(1);
+ return(2);
}
static int cmd_find(char *arg)
case 'a':
case 'A':
case '>':
- *sks->sortRelation = Z_SortRelation_ascending;
+ *sks->sortRelation = Z_SortRelation_descending;
break;
case 'd':
case 'D':
case '<':
- *sks->sortRelation = Z_SortRelation_descending;
+ *sks->sortRelation = Z_SortRelation_ascending;
break;
case 'i':
case 'I':
printf("Scan returned code %d\n", *res->scanStatus);
if (!res->entries)
return;
-#ifdef ASN_COMPILED
if ((entries = res->entries->entries))
num_entries = res->entries->num_entries;
-#else
- if (res->entries->which == Z_ListEntries_entries)
- {
- entries = res->entries->u.entries->entries;
- num_entries = res->entries->u.entries->num_entries;
- }
-#endif
for (i = 0; i < num_entries; i++)
+ {
+ int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1;
if (entries[i]->which == Z_Entry_termInfo)
{
- printf("%c ", i + 1 == *res->positionOfTerm ? '*' : ' ');
+ printf("%c ", i + 1 == pos_term ? '*' : ' ');
display_term(entries[i]->u.termInfo);
}
else
display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
-#ifdef ASN_COMPILED
+ }
if (res->entries->nonsurrogateDiagnostics)
display_diagrecs (res->entries->nonsurrogateDiagnostics,
res->entries->num_nonsurrogateDiagnostics);
-#else
- if (res->entries->which == Z_ListEntries_nonSurrogateDiagnostics)
- display_diagrecs(&res->entries->
- u.nonSurrogateDiagnostics->diagRecs[0], 1);
-#endif
}
void process_sortResponse(Z_SortResponse *res)
}
if (*arg)
{
- if (send_scanrequest(arg, 5, 20) < 0)
+ if (send_scanrequest(arg, 1, 20) < 0)
return 0;
}
else