X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=42a90d82b340a0bd69829906ecbebd7b2aaae95a;hb=dbf6bee5181285baf2fd8f36511846d138655404;hp=a55478cec6252e3de02ffa92323631cad796460a;hpb=25b7a1f19e0a16578e5918dd7ce70320d915dd23;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index a55478c..42a90d8 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.2  1995-03-16 13:29:01  quinn
+ * Revision 1.6  1995-03-21 12:30:09  quinn
+ * Beginning to add support for record packing.
+ *
+ * Revision 1.5  1995/03/17  10:44:13  quinn
+ * Added catch of null-string in makediagrec
+ *
+ * Revision 1.4  1995/03/17  10:18:08  quinn
+ * Added memory management.
+ *
+ * Revision 1.3  1995/03/16  17:42:39  quinn
+ * Little changes
+ *
+ * Revision 1.2  1995/03/16  13:29:01  quinn
  * Partitioned server.
  *
  * Revision 1.1  1995/03/15  16:02:10  quinn
@@ -88,6 +100,8 @@ void destroy_association(association *h)
     odr_destroy(h->decode);
     odr_destroy(h->encode);
     free(h->encode_buffer);
+    if (h->input_buffer)
+    	free(h->input_buffer);
     free(h);
 }
 
@@ -115,7 +129,7 @@ void ir_session(IOCHAN h, int event)
 		assoc->input_apdu_len = res;
 		if (process_apdu(h) < 0)
 		{
-		    fprintf(stderr, "Bad data from peer\n");
+		    fprintf(stderr, "Operation failed\n");
 		    cs_close(conn);
 		    destroy_association(assoc);
 		    iochan_destroy(h);
@@ -173,6 +187,7 @@ static int process_apdu(IOCHAN chan)
 	    fprintf(stderr, "Bad APDU\n");
 	    return -1;
     }
+    odr_reset(assoc->decode);
     return res;
 }
 
@@ -217,7 +232,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "YAZ/Simple asynchronous test server";
-    resp.implementationVersion = "$Revision: 1.2 $";
+    resp.implementationVersion = "$Revision: 1.6 $";
     resp.userInformationField = 0;
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
@@ -225,6 +240,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }
@@ -242,10 +258,32 @@ static Z_Records *diagrec(int error, char *addinfo)
     rec.u.nonSurrogateDiagnostic = &dr;
     dr.diagnosticSetId = bib1;
     dr.condition = &err;
-    dr.addinfo = addinfo;
+    dr.addinfo = addinfo ? addinfo : "";
     return &rec;
 }
 
+static Z_NamePlusRecord *surrogatediagrec(char *dbname, int error,
+					    char *addinfo)
+{
+    static Z_NamePlusRecord rec;
+    static Z_DiagRec dr;
+    static Odr_oid bib1[] = { 1, 2, 3, 4, 5, -1 };
+    static int err;
+
+    fprintf(stderr, "SurrogateDiagnotic: %d -- %s\n", error, addinfo);
+    rec.databaseName = dbname;
+    rec.which = Z_NamePlusRecord_surrogateDiagnostic;
+    rec.u.surrogateDiagnostic = &dr;
+    dr.diagnosticSetId = bib1;
+    dr.condition = &err;
+    dr.addinfo = addinfo ? addinfo : "";
+    return &rec;
+}
+
+static Z_Records *pack_records(association *a, int num, Z_ElementSetNames *esn)
+{
+}
+
 static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
 {
     Z_APDU apdu, *apdup;
@@ -290,6 +328,7 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }
@@ -319,6 +358,7 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req)
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }