projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed NextresultSetPosition bug fixed.
[yaz-moved-to-github.git]
/
server
/
seshigh.c
diff --git
a/server/seshigh.c
b/server/seshigh.c
index
ab54a94
..
8fdef83
100644
(file)
--- a/
server/seshigh.c
+++ b/
server/seshigh.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.58 1996-02-20 12:53:04 quinn
+ * Revision 1.60 1996-05-30 11:03:10 quinn
+ * Fixed NextresultSetPosition bug fixed.
+ *
+ * Revision 1.59 1996/05/14 09:26:46 quinn
+ * Added attribute set to scan backend
+ *
+ * Revision 1.58 1996/02/20 12:53:04 quinn
* Chanes to SCAN
*
* Revision 1.57 1996/01/02 08:57:47 quinn
* Chanes to SCAN
*
* Revision 1.57 1996/01/02 08:57:47 quinn
@@
-918,6
+924,7
@@
static Z_Records *pack_records(association *a, char *setname, int start,
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 16, 0);
reclist.num_records++;
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 16, 0);
reclist.num_records++;
+ *next = fres->last_in_set ? 0 : recno + 1;
continue;
}
}
continue;
}
}
@@
-927,6
+934,7
@@
static Z_Records *pack_records(association *a, char *setname, int start,
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 17, 0);
reclist.num_records++;
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 17, 0);
reclist.num_records++;
+ *next = fres->last_in_set ? 0 : recno + 1;
continue;
}
}
continue;
}
}
@@
-1195,6
+1203,7
@@
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
static Z_Entry *tab[SCAN_MAX_ENTRIES];
bend_scanrequest srq;
bend_scanresult *srs;
static Z_Entry *tab[SCAN_MAX_ENTRIES];
bend_scanrequest srq;
bend_scanresult *srs;
+ oident *attset;
logf(LOG_LOG, "Got scanrequest");
apdu.which = Z_APDU_scanResponse;
logf(LOG_LOG, "Got scanrequest");
apdu.which = Z_APDU_scanResponse;
@@
-1226,6
+1235,11
@@
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
srq.basenames = req->databaseNames;
srq.num_entries = *req->numberOfTermsRequested;
srq.term = req->termListAndStartPoint;
srq.basenames = req->databaseNames;
srq.num_entries = *req->numberOfTermsRequested;
srq.term = req->termListAndStartPoint;
+ if (!(attset = oid_getentbyoid(req->attributeSet)) ||
+ attset->oclass != CLASS_RECSYN)
+ srq.attributeset = VAL_NONE;
+ else
+ srq.attributeset = attset->value;
srq.term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
if (!(srs = bend_scan(assoc->backend, &srq, 0)))
srq.term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
if (!(srs = bend_scan(assoc->backend, &srq, 0)))