From dd5f78cc0a977733507aaeb5c76b00ba2debe392 Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 29 May 1995 08:12:06 +0000
Subject: [PATCH] Moved oid to util

---
 server/seshigh.c  |   10 +++++-----
 server/statserv.c |    9 ++++++---
 util/Makefile     |    4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/server/seshigh.c b/server/seshigh.c
index 8b4edb8..b380ee5 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.26  1995-05-18 13:02:12  quinn
+ * Revision 1.27  1995-05-29 08:12:06  quinn
+ * Moved oid to util
+ *
+ * Revision 1.26  1995/05/18  13:02:12  quinn
  * Smallish.
  *
  * Revision 1.25  1995/05/17  08:42:26  quinn
@@ -211,10 +214,7 @@ association *create_association(IOCHAN channel, COMSTACK link)
     new->rejected = 0;
     request_initq(&new->incoming);
     request_initq(&new->outgoing);
-    if (cs_getproto(link) == CS_Z3950)
-	new->proto = PROTO_Z3950;
-    else
-	new->proto = PROTO_SR;
+    new->proto = cs_getproto(link);
     return new;
 }
 
diff --git a/server/statserv.c b/server/statserv.c
index 154db57..b172941 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.19  1995-05-16 09:37:27  quinn
+ * Revision 1.20  1995-05-29 08:12:09  quinn
+ * Moved oid to util
+ *
+ * Revision 1.19  1995/05/16  09:37:27  quinn
  * Fixed bug
  *
  * Revision 1.18  1995/05/16  08:51:09  quinn
@@ -329,8 +332,8 @@ int statserv_main(int argc, char **argv)
 		add_listener(arg, protocol);
 		listeners++;
 		break;
-	    case 'z': protocol = CS_Z3950; break;
-	    case 's': protocol = CS_SR; break;
+	    case 'z': protocol = PROTO_Z3950; break;
+	    case 's': protocol = PROTO_SR; break;
 	    case 'S': control_block.dynamic = 0; break;
 	    case 'l':
 	    	strcpy(control_block.logfile, arg ? arg : "");
diff --git a/util/Makefile b/util/Makefile
index 43d171c..03884b5 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.10 1995-05-22 15:31:48 adam Exp $
+# $Id: Makefile,v 1.11 1995-05-29 08:12:16 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -11,7 +11,7 @@ LIBINCLUDE=-L$(LIBDIR)
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o # dmalloc.o
+PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.o # dmalloc.o
 CPP=$(CC) -E
 
 all: $(LIBDIR) $(LIB) marcdump
-- 
1.7.10.4