X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=ab54a948013e4981edd1e516402e68f124ed52f5;hp=6866f9857d099294fcc10b6678388d015cd4e25a;hb=dee13aeae17005ba0ef3adf7bf99958160e393d9;hpb=abfbb8adfc5e2cbc048b623d41eaf36f05cf8bd9

diff --git a/server/seshigh.c b/server/seshigh.c
index 6866f98..ab54a94 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.56  1995-12-14 11:09:57  quinn
+ * 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
@@ -732,7 +738,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 +776,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 +814,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;
@@ -935,7 +941,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));
@@ -1092,7 +1098,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 +1161,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;
@@ -1206,7 +1212,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);
@@ -1254,8 +1260,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;