X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=7b558ebfe35644e67bf8e1019d3b65b601f1be0e;hp=5f2131a45053b07f8c3327d989d7c6e6ee2c1497;hb=7ff711579bfae14782a3334ca8b3c255c44cf3d2;hpb=c4b184d02212b522facfd4bb8d86f7c3e933b14c

diff --git a/server/seshigh.c b/server/seshigh.c
index 5f2131a..7b558eb 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.54  1995-11-08 15:11:29  quinn
+ * 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
+ * Smallish.
+ *
+ * Revision 1.54  1995/11/08  15:11:29  quinn
  * Log of close transmit.
  *
  * Revision 1.53  1995/11/01  13:54:58  quinn
@@ -452,7 +467,7 @@ void ir_session(IOCHAN h, int event)
 		break;
 	    case 0: /* all sent - release the request structure */
 	    	logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
-		odr_release_mem(req->request_mem);
+		nmem_destroy(req->request_mem);
 		request_deq(&assoc->outgoing);
 		request_release(req);
 		if (!request_head(&assoc->outgoing))
@@ -573,6 +588,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     {
     	logf(LOG_WARN, "ODR error when encoding response: %s",
 	    odr_errlist[odr_geterror(assoc->decode)]);
+	odr_reset(assoc->encode);
 	return -1;
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
@@ -725,7 +741,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 :
@@ -763,7 +779,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);
@@ -801,7 +817,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;
@@ -928,7 +944,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));
@@ -1085,7 +1101,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;
@@ -1148,7 +1164,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;
@@ -1182,6 +1198,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;
@@ -1199,7 +1216,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);
@@ -1213,6 +1230,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)))
@@ -1247,8 +1269,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;