License, documentation, and memory fixes

diff --git a/README b/README
index 4a73ff8..9f29dd6 100644 (file)
--- a/README
+++ b/README
@@ -1,21 +1,15 @@
 
 

- * Copyright (C) 1994, Index Data.
- * All rights reserved. See the file LICENSE for details.
+ * Copyright (C) 1995, Index Data.
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
 
 Compilation and installation
 
  * Sebastian Hammer, Adam Dickmeiss
 
 Compilation and installation
 

-The primary output of the source here is the libyaz.a library, which
-contains support functions for implementing the server or client role
-of Z39.50/SR. Currently, the library is placed in a directory 'lib'
-which is one level *above* the distribution directory (yaz). This was
-initially done because the library is often used along with several
-other packages, and it was useful to gather the different libraries in
-a common place. If you don't like it, changing the 'LIBDIR' macro in
-the toplevel makefile should be sufficient. Obscurely, the header
-files are located in the include-directory *under* the yaz/ directory.
-
-The toplevel makefile also contains directions on how to enable Peter
+The primary output of the source here is the lib/libyaz.a library,
+which contains support functions for implementing the server or client
+role of Z39.50/SR.
+
+The toplevel makefile contains directions on how to enable Peter

 Furniss' XTIMOSI package. The package can be downloaded from
 ftp://pluto.ulcc.ac.uk/ulcc/thinosi/... (or something close to that).
 If you place the xtimosi directory on the same level as the yaz
 Furniss' XTIMOSI package. The package can be downloaded from
 ftp://pluto.ulcc.ac.uk/ulcc/thinosi/... (or something close to that).
 If you place the xtimosi directory on the same level as the yaz

@@ -55,18 +49,21 @@ directory.
 
 The directories:
 
 
 The directories:
 

-doc     - Documentation. Check this out if you'd like to use the code.
+doc     - Documentation.

 
 util    - Various little utility functions. Logging, memory debugging,
 
 util    - Various little utility functions. Logging, memory debugging,

-       primitive ISO2709 presentation for the client, etc.
+       primitive ISO 2709 presentation for the client, etc.

 
 odr     - Open Data Representation. This module implements the BER
 
 odr     - Open Data Representation. This module implements the BER

-       encoding rules. Documentation is found in the files odr.man
+       encoding rules. Documentation is found in the files odr-use.man

        and odr.txt.
 
 asn     - This module implements the Z39.50/SR protocol. The best way
        to find out how it works is to look in the sample
        and odr.txt.
 
 asn     - This module implements the Z39.50/SR protocol. The best way
        to find out how it works is to look in the sample

-       client/server code in server/seshigh.c or yazlib/tst.c.
+       client/server code in server/seshigh.c or yazlib/tst.c. The
+       interface is still wholly described by the file proto.h
+       which defines structure and type definitions for each of the
+       types introduced in the protocol specification.

 
 yazlib  - This module primarily implements the transport transparency
        stack (COMSTACK). The comstack implements a generic interface
 
 yazlib  - This module primarily implements the transport transparency
        stack (COMSTACK). The comstack implements a generic interface

@@ -75,11 +72,6 @@ yazlib  - This module primarily implements the transport transparency
        TCP/IP, and uses Peter Furniss' XTIMOSI package over RFC1006.
        Look for documentation in the file comstack.man.
 
        TCP/IP, and uses Peter Furniss' XTIMOSI package over RFC1006.
        Look for documentation in the file comstack.man.
 

-server  - This is the implementation of the server frontend. It
-       It provides event-handling and server managament functions,
-       and calls the backend primitives (best documentation of these
-       is in the file include/backend.h).
-

 rfc1006 - Xtimosi requires an implementation of the OSI transport
        with an XTI-based API. Some systems (HP and DEC, notably)
        provide this. For others, we provide an implementation of the
 rfc1006 - Xtimosi requires an implementation of the OSI transport
        with an XTI-based API. Some systems (HP and DEC, notably)
        provide this. For others, we provide an implementation of the

@@ -87,6 +79,11 @@ rfc1006 - Xtimosi requires an implementation of the OSI transport
        typically use). This module is not neeeded if you don't use
        xtimosi.
 
        typically use). This module is not neeeded if you don't use
        xtimosi.
 

+server  - This is the implementation of the server frontend. It
+       provides event-handling and server managament functions,
+       and calls the backend primitives (best documentation of these
+       is in the file include/backend.h). See server.txt.
+

 include - The various header files.
 
 makelib - This is a simple utility that gathers the libraries from the
 include - The various header files.
 
 makelib - This is a simple utility that gathers the libraries from the

diff --git a/asn/diagbib1.c b/asn/diagbib1.c
index 66d22fb..a2c7129 100644 (file)
--- a/asn/diagbib1.c
+++ b/asn/diagbib1.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: diagbib1.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: diagbib1.c,v $

- * Revision 1.1  1995-03-15 13:46:09  adam
+ * Revision 1.2  1995-05-16 08:50:21  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/15  13:46:09  adam

  * New function diagbib1_str.
  *
  */
  * New function diagbib1_str.
  *
  */

diff --git a/asn/proto.c b/asn/proto.c
index 3fe4401..66664ab 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $

- * Revision 1.20  1995-05-15 11:55:25  quinn
+ * Revision 1.21  1995-05-16 08:50:24  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.20  1995/05/15  11:55:25  quinn

  * Smallish.
  *
  * Revision 1.19  1995/04/11  11:58:35  quinn
  * Smallish.
  *
  * Revision 1.19  1995/04/11  11:58:35  quinn

@@ -100,7 +103,7 @@ int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
 int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_visiblestring(o, &(*p)->user, 0) &&
        odr_visiblestring(o, &(*p)->password, 0) &&
     return
        odr_visiblestring(o, &(*p)->user, 0) &&
        odr_visiblestring(o, &(*p)->password, 0) &&

@@ -111,7 +114,7 @@ int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 int z_IdPass(ODR o, Z_IdPass **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_IdPass(ODR o, Z_IdPass **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
        odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
     return
        odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
        odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&

@@ -395,7 +398,7 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
        odr_constructed_end(o))
        return 1;
     *p = 0;
        odr_constructed_end(o))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_Operand(ODR o, Z_Operand **p, int opt)
 }
 
 int z_Operand(ODR o, Z_Operand **p, int opt)

@@ -414,7 +417,7 @@ int z_Operand(ODR o, Z_Operand **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
 }
 
 int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);

@@ -422,7 +425,7 @@ int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
 int z_Complex(ODR o, Z_Complex **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_Complex(ODR o, Z_Complex **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        z_RPNStructure(o, &(*p)->s1, 0) &&
        z_RPNStructure(o, &(*p)->s2, 0) &&
     return
        z_RPNStructure(o, &(*p)->s1, 0) &&
        z_RPNStructure(o, &(*p)->s2, 0) &&

@@ -446,13 +449,13 @@ int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_RPNQuery(ODR o, Z_RPNQuery **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 }
 
 int z_RPNQuery(ODR o, Z_RPNQuery **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_oid(o, &(*p)->attributeSetId, 0) &&
        z_RPNStructure(o, &(*p)->RPNStructure, 0) &&
     return
        odr_oid(o, &(*p)->attributeSetId, 0) &&
        z_RPNStructure(o, &(*p)->RPNStructure, 0) &&

@@ -477,7 +480,7 @@ int z_Query(ODR o, Z_Query **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
 }
 
 int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)

@@ -485,7 +488,7 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
     Z_SearchRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     Z_SearchRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&
     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&

@@ -520,7 +523,7 @@ int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt)
 int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_oid(o, &(*p)->diagnosticSetId, 1) &&       /* SHOULD NOT BE OPT */
        odr_integer(o, &(*p)->condition, 0) &&
     return
        odr_oid(o, &(*p)->diagnosticSetId, 1) &&       /* SHOULD NOT BE OPT */
        odr_integer(o, &(*p)->condition, 0) &&

@@ -541,7 +544,7 @@ int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
     };
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     };
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
            0, 1) &&
     return
        odr_implicit(o, z_DatabaseName, &(*p)->databaseName, ODR_CONTEXT,
            0, 1) &&

@@ -578,7 +581,7 @@ int z_Records(ODR o, Z_Records **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 /* ------------------------ SCAN SERVICE -------------------- */
 }
 
 /* ------------------------ SCAN SERVICE -------------------- */

@@ -595,7 +598,7 @@ int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
        &(*p)->num_attributes))
        return 1;
     *p = 0;
        &(*p)->num_attributes))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 /*
 }
 
 /*

@@ -611,7 +614,7 @@ int z_WillowAttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 4))
     {
        o->t_class = -1;
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 4))
     {
        o->t_class = -1;

-       return opt;
+       return opt && odr_ok(o);

     }
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 1))
        return 0;
     }
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 1))
        return 0;

@@ -641,7 +644,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
     else if (!*p)
     {
        o->t_class = -1;
     else if (!*p)
     {
        o->t_class = -1;

-       return opt;
+       return opt && odr_ok(o);

     }
 
     if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
     }
 
     if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,

@@ -654,7 +657,7 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, 1, 1)&&
        odr_explicit(o, odr_integer, &(*p)->global, ODR_CONTEXT, 2, 1) &&
     return
        odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, 1, 1)&&
        odr_explicit(o, odr_integer, &(*p)->global, ODR_CONTEXT, 2, 1) &&

@@ -664,7 +667,7 @@ int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        (willow_scan ? 
            odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :
     return
        (willow_scan ? 
            odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :

@@ -695,7 +698,7 @@ int z_Entry(ODR o, Z_Entry **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_Entries(ODR o, Z_Entries **p, int opt)
 }
 
 int z_Entries(ODR o, Z_Entries **p, int opt)

@@ -742,13 +745,13 @@ int z_ListEntries(ODR o, Z_ListEntries **p, int opt)
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;

-    return opt && !o->error;
+    return opt && odr_ok(o);

 }
 
 int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 }
 
 int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     willow_scan = 0;
     return
        z_ReferenceId(o, &(*p)->referenceId, 1) &&
     willow_scan = 0;
     return
        z_ReferenceId(o, &(*p)->referenceId, 1) &&

@@ -770,7 +773,7 @@ int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
 int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
 int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     return
        z_ReferenceId(o, &(*p)->referenceId, 1) &&
        odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 3, 1) &&
     return
        z_ReferenceId(o, &(*p)->referenceId, 1) &&
        odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 3, 1) &&

@@ -805,7 +808,7 @@ int z_SearchResponse(ODR o, Z_SearchResponse **p, int opt)
     Z_SearchResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     Z_SearchResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&
     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&

@@ -826,7 +829,7 @@ int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt)
     Z_PresentRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     Z_PresentRequest *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&
     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&

@@ -845,7 +848,7 @@ int z_PresentResponse(ODR o, Z_PresentResponse **p, int opt)
     Z_PresentResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     Z_PresentResponse *pp;
 
     if (!odr_sequence_begin(o, p, sizeof(**p)))

-       return opt;
+       return opt && odr_ok(o);

     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&
     pp = *p;
     return
        z_ReferenceId(o, &pp->referenceId, 1) &&

@@ -889,7 +892,7 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
     {
        if (o->direction == ODR_DECODE)
            *p = 0;
     {
        if (o->direction == ODR_DECODE)
            *p = 0;

-       return opt && !o->error;
+       return opt && odr_ok(o);

     }
     return 1;
 }
     }
     return 1;
 }

diff --git a/header.c b/header.c
index 3aa0c0f..9fc5a4e 100644 (file)
--- a/header.c
+++ b/header.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data.
+ * Copyright (c) 1995, Index Data.

  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: header.c,v $
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: header.c,v $

- * Revision 1.2  1995-05-15 11:55:15  quinn
+ * Revision 1.3  1995-05-16 08:50:16  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/05/15  11:55:15  quinn

  * Documentation & other details.
  *
  * Revision 1.1  1995/03/10  18:22:18  quinn
  * Documentation & other details.
  *
  * Revision 1.1  1995/03/10  18:22:18  quinn

diff --git a/include/backend.h b/include/backend.h
index 50978bc..a7c7bf5 100644 (file)
--- a/include/backend.h
+++ b/include/backend.h
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ */
+

 #ifndef BACKEND_H
 #define BACKEND_H
 
 #ifndef BACKEND_H
 #define BACKEND_H
 

diff --git a/include/comstack.h b/include/comstack.h
index 59ed215..304b6cf 100644 (file)
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: comstack.h,v $
  *
  * $Log: comstack.h,v $

- * Revision 1.3  1995-04-20 15:12:44  quinn
+ * Revision 1.4  1995-05-16 08:50:29  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/04/20  15:12:44  quinn

  * Cosmetic
  *
  * Revision 1.2  1995/04/17  11:28:17  quinn
  * Cosmetic
  *
  * Revision 1.2  1995/04/17  11:28:17  quinn

diff --git a/include/diagbib1.h b/include/diagbib1.h
index 38a08f3..b79fce8 100644 (file)
--- a/include/diagbib1.h
+++ b/include/diagbib1.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: diagbib1.h,v $
  *
  * $Log: diagbib1.h,v $

- * Revision 1.1  1995-03-30 09:39:40  quinn
+ * Revision 1.2  1995-05-16 08:50:30  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:40  quinn

  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/15  13:46:09  adam
  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/15  13:46:09  adam

diff --git a/include/dmalloc.h b/include/dmalloc.h
index f38af77..e8adc07 100644 (file)
--- a/include/dmalloc.h
+++ b/include/dmalloc.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: dmalloc.h,v $
  *
  * $Log: dmalloc.h,v $

- * Revision 1.1  1995-03-30 09:39:40  quinn
+ * Revision 1.2  1995-05-16 08:50:30  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:40  quinn

  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:35:18  quinn
  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:35:18  quinn

diff --git a/include/log.h b/include/log.h
index 0cfb211..b1644e2 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: log.h,v $
  *
  * $Log: log.h,v $

- * Revision 1.1  1995-03-30 09:39:41  quinn
+ * Revision 1.2  1995-05-16 08:50:31  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:41  quinn

  * Moved .h files to include directory
  *
  * Revision 1.4  1994/09/28  13:07:22  adam
  * Moved .h files to include directory
  *
  * Revision 1.4  1994/09/28  13:07:22  adam

diff --git a/include/marcdisp.h b/include/marcdisp.h
index 0efca23..d7e1436 100644 (file)
--- a/include/marcdisp.h
+++ b/include/marcdisp.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: marcdisp.h,v $
  *
  * $Log: marcdisp.h,v $

- * Revision 1.1  1995-04-10 10:28:28  quinn
+ * Revision 1.2  1995-05-16 08:50:32  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/04/10  10:28:28  quinn

  * Added copy of CCL.
  *
  */
  * Added copy of CCL.
  *
  */

diff --git a/include/odr.h b/include/odr.h
index fa59a53..20ee8c5 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -1,11 +1,33 @@
-

 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: odr.h,v $
  *
  * $Log: odr.h,v $

- * Revision 1.3  1995-05-15 11:55:54  quinn
+ * Revision 1.4  1995-05-16 08:50:33  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/05/15  11:55:54  quinn

  * Work on asynchronous activity.
  *
  * Revision 1.2  1995/04/18  08:14:37  quinn
  * Work on asynchronous activity.
  *
  * Revision 1.2  1995/04/18  08:14:37  quinn

@@ -251,7 +273,7 @@ void odr_release_mem(ODR_MEM p);
 /*
  * write a single character at the current position - grow buffer if
  * necessary.
 /*
  * write a single character at the current position - grow buffer if
  * necessary.

- * (no, we're not usually this anal about our macros, but this one is
+ * (no, we're not usually this anal about our macros, but this baby is

  *  next to unreadable without some indentation  :)
  */
 #define odr_putc(o, c) \
  *  next to unreadable without some indentation  :)
  */
 #define odr_putc(o, c) \

@@ -286,7 +308,7 @@ void odr_release_mem(ODR_MEM p);
 ) \
 
 #define odr_tell(o) ((o)->ecb.pos)
 ) \
 
 #define odr_tell(o) ((o)->ecb.pos)

-#define odr_ok(o) (!(o)->ecb.error)
+#define odr_ok(o) (!(o)->error)

 
 #define ODR_MAXNAME 256
 
 
 #define ODR_MAXNAME 256
 

diff --git a/include/odr_use.h b/include/odr_use.h
index 5ad078b..6da24cf 100644 (file)
--- a/include/odr_use.h
+++ b/include/odr_use.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: odr_use.h,v $
  *
  * $Log: odr_use.h,v $

- * Revision 1.1  1995-03-30 09:39:41  quinn
+ * Revision 1.2  1995-05-16 08:50:34  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:41  quinn

  * Moved .h files to include directory
  *
  * Revision 1.2  1995/02/09  15:51:50  quinn
  * Moved .h files to include directory
  *
  * Revision 1.2  1995/02/09  15:51:50  quinn

diff --git a/include/oid.h b/include/oid.h
index 45b8f83..33aac90 100644 (file)
--- a/include/oid.h
+++ b/include/oid.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: oid.h,v $
  *
  * $Log: oid.h,v $

- * Revision 1.1  1995-03-30 09:39:41  quinn
+ * Revision 1.2  1995-05-16 08:50:35  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:41  quinn

  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:32:13  quinn
  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:32:13  quinn

diff --git a/include/options.h b/include/options.h
index 8922b3e..a282e48 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: options.h,v $
  *
  * $Log: options.h,v $

- * Revision 1.1  1995-03-30 09:39:42  quinn
+ * Revision 1.2  1995-05-16 08:50:36  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:42  quinn

  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:35:19  quinn
  * Moved .h files to include directory
  *
  * Revision 1.1  1995/03/27  08:35:19  quinn

diff --git a/include/proto.h b/include/proto.h
index 8d43b04..eae9d09 100644 (file)
--- a/include/proto.h
+++ b/include/proto.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: proto.h,v $
  *
  * $Log: proto.h,v $

- * Revision 1.6  1995-05-15 11:55:55  quinn
+ * Revision 1.7  1995-05-16 08:50:37  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/05/15  11:55:55  quinn

  * Work on asynchronous activity.
  *
  * Revision 1.5  1995/04/17  11:28:18  quinn
  * Work on asynchronous activity.
  *
  * Revision 1.5  1995/04/17  11:28:18  quinn

diff --git a/include/statserv.h b/include/statserv.h
index f2bbfaa..88a0a2d 100644 (file)
--- a/include/statserv.h
+++ b/include/statserv.h
@@ -1,3 +1,35 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Log: statserv.h,v $
+ * Revision 1.3  1995-05-16 08:50:38  quinn
+ * License, documentation, and memory fixes
+ *
+ *
+ */
+

 #ifndef STATSERVER_H
 #define STATSERVER_H
 
 #ifndef STATSERVER_H
 #define STATSERVER_H
 

diff --git a/include/tcpip.h b/include/tcpip.h
index c4b3efb..3a4e1a6 100644 (file)
--- a/include/tcpip.h
+++ b/include/tcpip.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: tcpip.h,v $
  *
  * $Log: tcpip.h,v $

- * Revision 1.1  1995-03-30 09:39:43  quinn
+ * Revision 1.2  1995-05-16 08:50:39  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:43  quinn

  * Moved .h files to include directory
  *
  * Revision 1.3  1995/03/27  08:36:11  quinn
  * Moved .h files to include directory
  *
  * Revision 1.3  1995/03/27  08:36:11  quinn

diff --git a/include/xmosi.h b/include/xmosi.h
index 7570a00..540b9ac 100644 (file)
--- a/include/xmosi.h
+++ b/include/xmosi.h
@@ -1,10 +1,33 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.

  *
  * $Log: xmosi.h,v $
  *
  * $Log: xmosi.h,v $

- * Revision 1.1  1995-03-30 09:39:43  quinn
+ * Revision 1.2  1995-05-16 08:50:39  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/30  09:39:43  quinn

  * Moved .h files to include directory
  *
  * Revision 1.3  1995/03/27  08:36:16  quinn
  * Moved .h files to include directory
  *
  * Revision 1.3  1995/03/27  08:36:16  quinn

diff --git a/include/yaz-ccl.h b/include/yaz-ccl.h
index 050be3f..d840f75 100644 (file)
--- a/include/yaz-ccl.h
+++ b/include/yaz-ccl.h
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 1995, Index Data.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The name of Index Data or the individual authors may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
+ * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * $Log: yaz-ccl.h,v $
+ * Revision 1.3  1995-05-16 08:50:40  quinn
+ * License, documentation, and memory fixes
+ *
+ *
+ */

 
 #ifndef YAZ_CCL_H
 #define YAZ_CCL_H
 
 #ifndef YAZ_CCL_H
 #define YAZ_CCL_H

diff --git a/odr/ber_any.c b/odr/ber_any.c
index 2e1de76..51dc7f3 100644 (file)
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $

- * Revision 1.9  1995-04-18 08:15:12  quinn
+ * Revision 1.10  1995-05-16 08:50:42  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9  1995/04/18  08:15:12  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index db58414..d939426 100644 (file)
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $

- * Revision 1.4  1995-04-18 08:15:13  quinn
+ * Revision 1.5  1995-05-16 08:50:43  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/04/18  08:15:13  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index 233de65..56b9e88 100644 (file)
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bool.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bool.c,v $

- * Revision 1.5  1995-04-18 08:15:14  quinn
+ * Revision 1.6  1995-05-16 08:50:43  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/04/18  08:15:14  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_int.c b/odr/ber_int.c
index 46422d3..c22f7d5 100644 (file)
--- a/odr/ber_int.c
+++ b/odr/ber_int.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_int.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_int.c,v $

- * Revision 1.6  1995-04-18 08:15:14  quinn
+ * Revision 1.7  1995-05-16 08:50:44  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/04/18  08:15:14  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_len.c b/odr/ber_len.c
index ee70563..79de57e 100644 (file)
--- a/odr/ber_len.c
+++ b/odr/ber_len.c
@@ -1,3 +1,15 @@
+/*
+ * Copyright (C) 1995, Index Data.
+ * See the file LICENSE for details.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: ber_len.c,v $
+ * Revision 1.4  1995-05-16 08:50:45  quinn
+ * License, documentation, and memory fixes
+ *
+ *
+ */
+

 #include <stdio.h>
 #include <odr.h>
 
 #include <stdio.h>
 #include <odr.h>
 

diff --git a/odr/ber_null.c b/odr/ber_null.c
index 1d00305..7473ba7 100644 (file)
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_null.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_null.c,v $

- * Revision 1.4  1995-04-18 08:15:16  quinn
+ * Revision 1.5  1995-05-16 08:50:46  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/04/18  08:15:16  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 6f285ce..46e6297 100644 (file)
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $

- * Revision 1.7  1995-04-18 08:15:17  quinn
+ * Revision 1.8  1995-05-16 08:50:47  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.7  1995/04/18  08:15:17  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_oid.c b/odr/ber_oid.c
index 6c2813d..d6012a6 100644 (file)
--- a/odr/ber_oid.c
+++ b/odr/ber_oid.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oid.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oid.c,v $

- * Revision 1.6  1995-04-18 08:15:18  quinn
+ * Revision 1.7  1995-05-16 08:50:47  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/04/18  08:15:18  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index 49c1a34..fa4a5ab 100644 (file)
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $

- * Revision 1.10  1995-04-18 08:15:18  quinn
+ * Revision 1.11  1995-05-16 08:50:48  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.10  1995/04/18  08:15:18  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/odr.c b/odr/odr.c
index 9b397b9..5c21f2f 100644 (file)
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $

- * Revision 1.11  1995-05-15 11:56:08  quinn
+ * Revision 1.12  1995-05-16 08:50:49  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.11  1995/05/15  11:56:08  quinn

  * More work on memory management.
  *
  * Revision 1.10  1995/04/18  08:15:20  quinn
  * More work on memory management.
  *
  * Revision 1.10  1995/04/18  08:15:20  quinn

diff --git a/odr/odr_any.c b/odr/odr_any.c
index cfbff27..0a42072 100644 (file)
--- a/odr/odr_any.c
+++ b/odr/odr_any.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_any.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_any.c,v $

- * Revision 1.3  1995-03-17 10:17:46  quinn
+ * Revision 1.4  1995-05-16 08:50:50  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.3  1995/03/17  10:17:46  quinn

  * Added memory management.
  *
  * Revision 1.2  1995/03/08  12:12:18  quinn
  * Added memory management.
  *
  * Revision 1.2  1995/03/08  12:12:18  quinn

diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 46d7e2e..94bc0a2 100644 (file)
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $

- * Revision 1.7  1995-03-17 10:17:48  quinn
+ * Revision 1.8  1995-05-16 08:50:51  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.7  1995/03/17  10:17:48  quinn

  * Added memory management.
  *
  * Revision 1.6  1995/03/08  12:12:19  quinn
  * Added memory management.
  *
  * Revision 1.6  1995/03/08  12:12:19  quinn

diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index 5279ae2..31fabad 100644 (file)
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bool.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bool.c,v $

- * Revision 1.5  1995-03-17 10:17:49  quinn
+ * Revision 1.6  1995-05-16 08:50:52  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/03/17  10:17:49  quinn

  * Added memory management.
  *
  * Revision 1.4  1995/03/08  12:12:20  quinn
  * Added memory management.
  *
  * Revision 1.4  1995/03/08  12:12:20  quinn

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 1c5d1af..7bc6b28 100644 (file)
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $

- * Revision 1.5  1995-03-18 12:16:31  quinn
+ * Revision 1.6  1995-05-16 08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/03/18  12:16:31  quinn

  * Minor changes.
  *
  * Revision 1.4  1995/03/14  16:59:38  quinn
  * Minor changes.
  *
  * Revision 1.4  1995/03/14  16:59:38  quinn

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 1922aa0..a2435b4 100644 (file)
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $

- * Revision 1.10  1995-04-18 08:15:21  quinn
+ * Revision 1.11  1995-05-16 08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.10  1995/04/18  08:15:21  quinn

  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *

diff --git a/odr/odr_int.c b/odr/odr_int.c
index c5ba969..9ce0b44 100644 (file)
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_int.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_int.c,v $

- * Revision 1.6  1995-03-17 10:17:51  quinn
+ * Revision 1.7  1995-05-16 08:50:54  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/03/17  10:17:51  quinn

  * Added memory management.
  *
  * Revision 1.5  1995/03/08  12:12:25  quinn
  * Added memory management.
  *
  * Revision 1.5  1995/03/08  12:12:25  quinn

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index 01c96f6..bc48fcd 100644 (file)
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $

- * Revision 1.4  1995-05-15 11:56:09  quinn
+ * Revision 1.5  1995-05-16 08:50:55  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/05/15  11:56:09  quinn

  * More work on memory management.
  *
  * Revision 1.3  1995/04/18  08:15:21  quinn
  * More work on memory management.
  *
  * Revision 1.3  1995/04/18  08:15:21  quinn

diff --git a/odr/odr_null.c b/odr/odr_null.c
index d9ed423..35279c7 100644 (file)
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $

- * Revision 1.4  1995-03-08 12:12:26  quinn
+ * Revision 1.5  1995-05-16 08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/03/08  12:12:26  quinn

  * Added better error checking.
  *
  * Revision 1.3  1995/02/10  18:57:25  quinn
  * Added better error checking.
  *
  * Revision 1.3  1995/02/10  18:57:25  quinn

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index fe2ffc5..c1242d2 100644 (file)
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $

- * Revision 1.8  1995-03-17 10:17:54  quinn
+ * Revision 1.9  1995-05-16 08:50:56  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8  1995/03/17  10:17:54  quinn

  * Added memory management.
  *
  * Revision 1.7  1995/03/08  12:12:27  quinn
  * Added memory management.
  *
  * Revision 1.7  1995/03/08  12:12:27  quinn

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index d12226f..1108a4b 100644 (file)
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $

- * Revision 1.8  1995-03-17 10:17:55  quinn
+ * Revision 1.9  1995-05-16 08:50:57  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.8  1995/03/17  10:17:55  quinn

  * Added memory management.
  *
  * Revision 1.7  1995/03/08  12:12:29  quinn
  * Added memory management.
  *
  * Revision 1.7  1995/03/08  12:12:29  quinn

diff --git a/odr/odr_priv.c b/odr/odr_priv.c
index a5a3827..9736a3f 100644 (file)
--- a/odr/odr_priv.c
+++ b/odr/odr_priv.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_priv.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_priv.c,v $

- * Revision 1.2  1995-03-07 09:23:20  quinn
+ * Revision 1.3  1995-05-16 08:50:58  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/03/07  09:23:20  quinn

  * Installing top-level API and documentation.
  *
  *
  * Installing top-level API and documentation.
  *
  *

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 4f6646b..3aabb03 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $

- * Revision 1.9  1995-03-17 10:17:57  quinn
+ * Revision 1.10  1995-05-16 08:50:59  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9  1995/03/17  10:17:57  quinn

  * Added memory management.
  *
  * Revision 1.8  1995/03/15  11:18:05  quinn
  * Added memory management.
  *
  * Revision 1.8  1995/03/15  11:18:05  quinn

diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index f5e7d83..4c5a2b7 100644 (file)
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_tag.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_tag.c,v $

- * Revision 1.2  1995-03-08 12:12:31  quinn
+ * Revision 1.3  1995-05-16 08:51:00  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/03/08  12:12:31  quinn

  * Added better error checking.
  *
  * Revision 1.1  1995/02/02  16:21:54  quinn
  * Added better error checking.
  *
  * Revision 1.1  1995/02/02  16:21:54  quinn

diff --git a/odr/odr_use.c b/odr/odr_use.c
index d983de2..7fca63b 100644 (file)
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $

- * Revision 1.2  1995-02-09 15:51:50  quinn
+ * Revision 1.3  1995-05-16 08:51:00  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/02/09  15:51:50  quinn

  * Works better now.
  *
  * Revision 1.1  1995/02/03  17:04:39  quinn
  * Works better now.
  *
  * Revision 1.1  1995/02/03  17:04:39  quinn

diff --git a/server/eventl.c b/server/eventl.c
index b9b88b5..be99c32 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $

- * Revision 1.7  1995-03-27 15:02:01  quinn
+ * Revision 1.8  1995-05-16 08:51:01  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.7  1995/03/27  15:02:01  quinn

  * Added some includes for better portability
  *
  * Revision 1.6  1995/03/27  08:34:21  quinn
  * Added some includes for better portability
  *
  * Revision 1.6  1995/03/27  08:34:21  quinn

diff --git a/server/eventl.h b/server/eventl.h
index 47c87ad..129bf30 100644 (file)
--- a/server/eventl.h
+++ b/server/eventl.h
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data I/S 
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.h,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.h,v $

- * Revision 1.5  1995-05-15 11:56:37  quinn
+ * Revision 1.6  1995-05-16 08:51:02  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/05/15  11:56:37  quinn

  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.4  1995/03/27  08:34:23  quinn
  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.4  1995/03/27  08:34:23  quinn

diff --git a/server/seshigh.c b/server/seshigh.c
index 5d17c40..9105f10 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $

- * Revision 1.23  1995-05-15 13:25:10  quinn
+ * Revision 1.24  1995-05-16 08:51:04  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.23  1995/05/15  13:25:10  quinn

  * Fixed memory bug.
  *
  * Revision 1.22  1995/05/15  11:56:39  quinn
  * Fixed memory bug.
  *
  * Revision 1.22  1995/05/15  11:56:39  quinn

@@ -119,6 +122,7 @@
 #include <oid.h>
 #include <log.h>
 #include <statserv.h>
 #include <oid.h>
 #include <log.h>
 #include <statserv.h>

+#include "../version.h"

 
 #include <backend.h>
 
 
 #include <backend.h>
 

@@ -161,6 +165,7 @@ association *create_association(IOCHAN channel, COMSTACK link)
        char filename[256];
        FILE *f;
 
        char filename[256];
        FILE *f;
 

+       strcpy(filename, control_block->apdufile);

        if (!(new->print = odr_createmem(ODR_PRINT)))
            return 0;
        if (*control_block->apdufile != '-')
        if (!(new->print = odr_createmem(ODR_PRINT)))
            return 0;
        if (*control_block->apdufile != '-')

@@ -434,7 +439,14 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
        &req->size_response);
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
        &req->size_response);

+    odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we have to quit */

     odr_reset(assoc->encode);
     odr_reset(assoc->encode);

+    if (assoc->print && !z_APDU(assoc->print, &res, 0))
+    {
+       logf(LOG_WARN, "ODR print error: %s", 
+           odr_errlist[odr_geterror(assoc->print)]);
+       odr_reset(assoc->print);
+    }

     /* change this when we make the backend reentrant */
     assert(req == request_head(&assoc->incoming));
     req->state = REQUEST_IDLE;
     /* change this when we make the backend reentrant */
     assert(req == request_head(&assoc->incoming));
     req->state = REQUEST_IDLE;

@@ -512,7 +524,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "Index Data/YAZ Generic Frontend Server";
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "Index Data/YAZ Generic Frontend Server";

-    resp.implementationVersion = "$Revision: 1.23 $";
+    resp.implementationVersion = YAZ_VERSION;

     resp.userInformationField = 0;
     return &apdu;
 }
     resp.userInformationField = 0;
     return &apdu;
 }

diff --git a/server/session.h b/server/session.h
index bf3fc3e..abb3c60 100644 (file)
--- a/server/session.h
+++ b/server/session.h
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (C) 1995, Index Data I/S 
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: session.h,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: session.h,v $

- * Revision 1.6  1995-05-15 11:56:41  quinn
+ * Revision 1.7  1995-05-16 08:51:08  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.6  1995/05/15  11:56:41  quinn

  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.5  1995/04/20  15:13:01  quinn
  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.5  1995/04/20  15:13:01  quinn

diff --git a/server/statserv.c b/server/statserv.c
index a8cd95d..ccd95f1 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $

- * Revision 1.17  1995-05-15 11:56:42  quinn
+ * Revision 1.18  1995-05-16 08:51:09  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.17  1995/05/15  11:56:42  quinn

  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.16  1995/04/10  10:23:40  quinn
  * Asynchronous facilities. Restructuring of seshigh code.
  *
  * Revision 1.16  1995/04/10  10:23:40  quinn

@@ -316,6 +319,9 @@ int statserv_main(int argc, char **argv)
 
     me = argv[0];
     while ((ret = options("a:szSl:v:", argv, argc, &arg)) != -2)
 
     me = argv[0];
     while ((ret = options("a:szSl:v:", argv, argc, &arg)) != -2)

+    {
+       if (!arg)
+           arg = "";

        switch (ret)
        {
            case 0:
        switch (ret)
        {
            case 0:

@@ -336,9 +342,10 @@ int statserv_main(int argc, char **argv)
            case 'a':
                strcpy(control_block.apdufile, arg); break;
            default:
            case 'a':
                strcpy(control_block.apdufile, arg); break;
            default:

-               fprintf(stderr, "Usage: %s [ -v <loglevel> -l <logfile> -zsS <listener-addr> ... ]\n", me);
+               fprintf(stderr, "Usage: %s [ -a <apdufile> -v <loglevel> -l <logfile> -zsS <listener-addr> ... ]\n", me);

                exit(1);
        }
                exit(1);
        }

+    }

     if (control_block.dynamic)
        signal(SIGCHLD, catchchld);
     if (!listeners && *control_block.default_listen)
     if (control_block.dynamic)
        signal(SIGCHLD, catchchld);
     if (!listeners && *control_block.default_listen)

diff --git a/util/dmalloc.c b/util/dmalloc.c
index c2453a8..cbe190c 100644 (file)
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $

- * Revision 1.4  1995-05-15 13:25:13  quinn
+ * Revision 1.5  1995-05-16 08:51:10  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/05/15  13:25:13  quinn

  * Fixed memory bug.
  *
  * Revision 1.3  1995/05/15  11:56:55  quinn
  * Fixed memory bug.
  *
  * Revision 1.3  1995/05/15  11:56:55  quinn

diff --git a/util/log.c b/util/log.c
index 9319154..a9fb5fc 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $

- * Revision 1.4  1995-05-15 11:56:55  quinn
+ * Revision 1.5  1995-05-16 08:51:11  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/05/15  11:56:55  quinn

  * Debuggng & adjustments.
  *
  * Revision 1.3  1995/04/10  10:23:51  quinn
  * Debuggng & adjustments.
  *
  * Revision 1.3  1995/04/10  10:23:51  quinn

diff --git a/util/marcdisp.c b/util/marcdisp.c
index 714c561..6ad66ab 100644 (file)
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $

- * Revision 1.1  1995-04-10 10:28:46  quinn
+ * Revision 1.2  1995-05-16 08:51:12  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/04/10  10:28:46  quinn

  * Added copy of CCL and MARC display
  *
  */
  * Added copy of CCL and MARC display
  *
  */

diff --git a/util/marcdump.c b/util/marcdump.c
index 023de27..2eddc42 100644 (file)
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $

- * Revision 1.2  1995-05-15 11:56:56  quinn
+ * Revision 1.3  1995-05-16 08:51:12  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/05/15  11:56:56  quinn

  * Debuggng & adjustments.
  *
  * Revision 1.1  1995/04/10  10:28:47  quinn
  * Debuggng & adjustments.
  *
  * Revision 1.1  1995/04/10  10:28:47  quinn

diff --git a/util/options.c b/util/options.c
index ebe1b93..8a69e6c 100644 (file)
--- a/util/options.c
+++ b/util/options.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: options.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: options.c,v $

- * Revision 1.1  1995-03-27 08:35:18  quinn
+ * Revision 1.2  1995-05-16 08:51:13  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/03/27  08:35:18  quinn

  * Created util library
  * Added memory debugging module. Imported options-manager
  *
  * Created util library
  * Added memory debugging module. Imported options-manager
  *

diff --git a/util/query.c b/util/query.c
index e194430..b8bff70 100644 (file)
--- a/util/query.c
+++ b/util/query.c
@@ -1,10 +1,13 @@
 /*
 /*

- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.

  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: query.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: query.c,v $

- * Revision 1.1  1995-04-10 10:28:47  quinn
+ * Revision 1.2  1995-05-16 08:51:14  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/04/10  10:28:47  quinn

  * Added copy of CCL and MARC display
  *
  *
  * Added copy of CCL and MARC display
  *
  *