Update headers and omit CVS Ids.

[yaz-moved-to-github.git] / src / prt-ext.c

diff --git a/src/prt-ext.c b/src/prt-ext.c
index 80d3418..84234ed 100644 (file)
--- a/src/prt-ext.c
+++ b/src/prt-ext.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: prt-ext.c,v 1.9 2007-04-13 09:55:41 adam Exp $
  */
 
 /**
@@ -26,8 +24,8 @@
  */
 static Z_ext_typeent type_table[] =
 {
-    {{1, 2, 830, 10003, 5, 101,-1}, Z_External_sutrs, (Odr_fun) z_SUTRS},
-    {{1, 2, 830, 10003, 5, 100,-1}, Z_External_explainRecord, (Odr_fun)z_ExplainRecord},
+    {{1, 2, 840, 10003, 5, 101,-1}, Z_External_sutrs, (Odr_fun) z_SUTRS},
+    {{1, 2, 840, 10003, 5, 100,-1}, Z_External_explainRecord, (Odr_fun)z_ExplainRecord},
     {{1, 2, 840, 10003, 7, 1,-1}, Z_External_resourceReport1, (Odr_fun)z_ResourceReport1},
     {{1, 2, 840, 10003, 7, 2,-1}, Z_External_resourceReport2, (Odr_fun)z_ResourceReport2},
     {{1, 2, 840, 10003, 8, 1,-1}, Z_External_promptObject1, (Odr_fun)z_PromptObject1 },
@@ -39,9 +37,9 @@ static Z_ext_typeent type_table[] =
     {{1, 2, 840, 10003, 5, 103,-1}, Z_External_summary, (Odr_fun)z_BriefBib},
     {{1, 2, 840, 10003, 5, 102,-1}, Z_External_OPAC, (Odr_fun)z_OPACRecord},
     {{1, 2, 840, 10003, 10, 1,-1}, Z_External_searchResult1, (Odr_fun)z_SearchInfoReport},
-    {{1, 2, 840, 10003, 9, 5,-1}, Z_External_update, (Odr_fun)z_IUUpdate},
-    {{1, 2, 840, 10003, 9, 5,1,-1}, Z_External_update0, (Odr_fun)z_IU0Update},
-    {{1, 2, 840, 10003, 9, 5, 1, 1,-1}, Z_External_update0, (Odr_fun)z_IU0Update},
+    {{1, 2, 840, 10003, 9, 5,-1}, Z_External_update0, (Odr_fun)z_IU0Update},
+    {{1, 2, 840, 10003, 9, 5, 1,-1}, Z_External_update0, (Odr_fun)z_IU0Update},
+    {{1, 2, 840, 10003, 9, 5, 1, 1,-1}, Z_External_update, (Odr_fun)z_IUUpdate},
     {{1, 2, 840, 10003, 10, 6,-1}, Z_External_dateTime, (Odr_fun)z_DateTime},
     {{1, 2, 840, 10003, 7, 1000, 81, 1,-1}, Z_External_universeReport,(Odr_fun)z_UniverseReport},
     {{1, 2, 840, 10003, 9, 1000, 81, 1,-1}, Z_External_ESAdmin, (Odr_fun)z_Admin},
@@ -56,7 +54,7 @@ static Z_ext_typeent type_table[] =
     {{-1}, 0, 0}
 };
 
-Z_ext_typeent *z_ext_getentbyref(const int *oid)
+Z_ext_typeent *z_ext_getentbyref(const Odr_oid *oid)
 {
     Z_ext_typeent *p;
 
@@ -239,12 +237,12 @@ int z_External(ODR o, Z_External **p, int opt, const char *name)
         odr_sequence_end(o);
 }
 
-Z_External *z_ext_record_oid(ODR o, const int *oid, const char *buf, int len)
+Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len)
 {
     Z_External *thisext;
     char oid_str_buf[OID_STR_MAX];
     const char *oid_str;
-    int oclass;
+    oid_class oclass;
 
     if (!oid)
         return 0;
@@ -266,27 +264,27 @@ Z_External *z_ext_record_oid(ODR o, const int *oid, const char *buf, int len)
          */
         thisext->u.grs1 = (Z_GenericRecord*) buf;
 
-        if (!strcmp(oid_str, OID_STR_SUTRS))
+        if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
         {
             thisext->which = Z_External_sutrs;
         }
-        else if (!strcmp(oid_str, OID_STR_GRS1))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
         {
             thisext->which = Z_External_grs1;
         }
-        else if (!strcmp(oid_str, OID_STR_EXPLAIN))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_explain))
         {
             thisext->which = Z_External_explainRecord;
         }
-        else if (!strcmp(oid_str, OID_STR_SUMMARY))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_summary))
         {
             thisext->which = Z_External_summary;
         }
-        else if (!strcmp(oid_str, OID_STR_OPAC))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_opac))
         {
             thisext->which = Z_External_OPAC;
         }
-        else if (!strcmp(oid_str, OID_STR_EXTENDED))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_extended))
         {
             thisext->which = Z_External_extendedService;
         }
@@ -295,7 +293,7 @@ Z_External *z_ext_record_oid(ODR o, const int *oid, const char *buf, int len)
             return 0;
         }
     }
-    else if (!strcmp(oid_str, OID_STR_SUTRS)) /* SUTRS is a single-ASN.1-type */
+    else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) /* SUTRS is a single-ASN.1-type */
     {
         Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs));
         
@@ -322,23 +320,17 @@ Z_External *z_ext_record_oid(ODR o, const int *oid, const char *buf, int len)
 
 Z_External *z_ext_record_xml(ODR o, const char *buf, int len)
 {
-    const int *oid = yaz_string_to_oid(yaz_oid_std(),
-                                       CLASS_RECSYN, OID_STR_XML);
-    return z_ext_record_oid(o, oid, buf, len);
+    return z_ext_record_oid(o, yaz_oid_recsyn_xml, buf, len);
 }
 
 Z_External *z_ext_record_sutrs(ODR o, const char *buf, int len)
 {
-    const int *oid = yaz_string_to_oid(yaz_oid_std(),
-                                       CLASS_RECSYN, OID_STR_SUTRS);
-    return z_ext_record_oid(o, oid, buf, len);
+    return z_ext_record_oid(o, yaz_oid_recsyn_sutrs, buf, len);
 }
 
 Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len)
 {
-    const int *oid = yaz_string_to_oid(yaz_oid_std(),
-                                       CLASS_RECSYN, OID_STR_USMARC);
-    return z_ext_record_oid(o, oid, buf, len);
+    return z_ext_record_oid(o, yaz_oid_recsyn_usmarc, buf, len);
 }
 
 /*