X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=586af6505b2ccf489098c245659bf99264ca4db8;hp=6866f9857d099294fcc10b6678388d015cd4e25a;hb=88941d4a9e272daca9323cd19bf4829b6d32871b;hpb=abfbb8adfc5e2cbc048b623d41eaf36f05cf8bd9 diff --git a/server/seshigh.c b/server/seshigh.c index 6866f98..586af65 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,31 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.56 1995-12-14 11:09:57 quinn + * Revision 1.64 1997-04-30 08:52:11 quinn + * Null + * + * Revision 1.63 1996/10/11 11:57:26 quinn + * Smallish + * + * Revision 1.62 1996/07/06 19:58:35 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.61 1996/06/10 08:56:16 quinn + * Work on Summary. + * + * 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 + * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass + * + * Revision 1.56 1995/12/14 11:09:57 quinn * Work on Explain * * Revision 1.55 1995/11/08 17:41:37 quinn @@ -202,11 +226,11 @@ * */ +#include #include #include #include #include -#include #include #include @@ -732,7 +756,7 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) #endif bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : @@ -770,7 +794,7 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, #endif bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); @@ -808,7 +832,7 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo); bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; err = error; @@ -834,7 +858,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, int *next, int *pres, oid_value format) { - int recno, total_length = 0, toget = *num; + int recno, total_length = 0, toget = *num, dumped_records = 0; static Z_Records records; static Z_NamePlusRecordList reclist; static Z_NamePlusRecord *list[MAX_RECORDS]; @@ -864,7 +888,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, * allocation done by the backend - this should give us a reasonable * idea of the total size of the data so far. */ - total_length = odr_total(a->encode); + total_length = odr_total(a->encode) - dumped_records; if (reclist.num_records == MAX_RECORDS - 1) { *pres = Z_PRES_PARTIAL_2; @@ -912,6 +936,8 @@ 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++; + *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } @@ -921,6 +947,8 @@ 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++; + *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } @@ -935,7 +963,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, sizeof(Z_DatabaseRecord)))) return 0; recform.proto = a->proto; - recform.class = CLASS_RECSYN; + recform.oclass = CLASS_RECSYN; recform.value = fres->format; thisext->direct_reference = odr_oiddup(a->encode, oid_getoidbyent(&recform)); @@ -949,6 +977,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, case VAL_GRS1: thisext->which = Z_External_grs1; break; case VAL_EXPLAIN: thisext->which = Z_External_explainRecord; break; + case VAL_SUMMARY: thisext->which = Z_External_summary; break; + case VAL_OPAC: thisext->which = Z_External_OPAC; break; default: logf(LOG_FATAL, "Unknown structured format from backend."); @@ -1092,7 +1122,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, oid_value form; if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || - prefformat->class != CLASS_RECSYN) + prefformat->oclass != CLASS_RECSYN) form = VAL_NONE; else form = prefformat->value; @@ -1155,7 +1185,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, #endif if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || - prefformat->class != CLASS_RECSYN) + prefformat->oclass != CLASS_RECSYN) form = VAL_NONE; else form = prefformat->value; @@ -1189,6 +1219,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; + oident *attset; logf(LOG_LOG, "Got scanrequest"); apdu.which = Z_APDU_scanResponse; @@ -1206,7 +1237,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) #endif if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || - attent->class != CLASS_ATTSET || attent->value != VAL_BIB1)) + attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1)) ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0); else if (req->stepSize && *req->stepSize > 0) ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0); @@ -1220,6 +1251,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; + 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))) @@ -1254,8 +1290,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) e->which = Z_Entry_termInfo; e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t)); t->suggestedAttributes = 0; + t->displayTerm = 0; t->alternativeTerm = 0; t->byAttributes = 0; + t->otherTermInfo = 0; t->globalOccurrences = &srs->entries[i].occurrences; t->term = odr_malloc(assoc->encode, sizeof(*t->term)); t->term->which = Z_Term_general;