Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

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

diff --git a/src/prt-ext.c b/src/prt-ext.c
index 2fa8c71..6d0d66a 100644 (file)
--- a/src/prt-ext.c
+++ b/src/prt-ext.c
@@ -1,12 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
-
 /**
  * \file prt-ext.c
  * \brief Implements handling of various Z39.50 Externals
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <yaz/proto.h>
 
@@ -44,6 +46,7 @@ static Z_ext_typeent type_table[] =
     {{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},
     {{1, 2, 840, 10003, 10, 3,-1}, Z_External_userInfo1, (Odr_fun) z_OtherInformation},
+    {{1, 2, 840, 10003, 10, 1000, 81, 5,-1}, Z_External_userFacets, (Odr_fun) z_FacetList},
     {{1, 2, 840, 10003, 15, 3,-1}, Z_External_charSetandLanguageNegotiation, (Odr_fun)
                   z_CharSetandLanguageNegotiation},
     {{1, 2, 840, 10003, 8, 1,-1}, Z_External_acfPrompt1, (Odr_fun) z_PromptObject1},
@@ -51,6 +54,11 @@ static Z_ext_typeent type_table[] =
     {{1, 2, 840, 10003, 8, 3,-1}, Z_External_acfKrb1, (Odr_fun) z_KRBObject},
     {{1, 2, 840, 10003, 10, 5,-1}, Z_External_multisrch2, (Odr_fun) z_MultipleSearchTerms_2},
     {{1, 2, 840, 10003, 16,  2, -1}, Z_External_CQL, (Odr_fun) z_InternationalString},
+    {{1, 2, 840, 10003, 9, 1,-1}, Z_External_persistentResultSet, (Odr_fun)z_PRPersistentResultSet},
+    {{1, 2, 840, 10003, 9, 2,-1}, Z_External_persistentQuery, (Odr_fun)z_PQueryPersistentQuery},
+    {{1, 2, 840, 10003, 9, 3,-1}, Z_External_periodicQuerySchedule, (Odr_fun)z_PQSPeriodicQuerySchedule},
+    {{1, 2, 840, 10003, 9, 6,-1}, Z_External_exportSpecification, (Odr_fun)z_ESExportSpecification},
+    {{1, 2, 840, 10003, 9, 7,-1}, Z_External_exportInvocation, (Odr_fun)z_EIExportInvocation},
     {{-1}, 0, 0}
 };
 
@@ -137,6 +145,8 @@ int z_External(ODR o, Z_External **p, int opt, const char *name)
          (Odr_fun)z_IU0Update, 0},
         {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userInfo1,
          (Odr_fun)z_OtherInformation, 0},
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userFacets,
+         (Odr_fun)z_FacetList, "FacetList" },
         {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_charSetandLanguageNegotiation,
          (Odr_fun)z_CharSetandLanguageNegotiation, 0},
         {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_acfPrompt1,
@@ -152,6 +162,17 @@ int z_External(ODR o, Z_External **p, int opt, const char *name)
          (Odr_fun)z_InternationalString, 0},
         {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OCLCUserInfo,
          (Odr_fun)z_OCLC_UserInformation, 0},
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_persistentResultSet,
+         (Odr_fun)z_PRPersistentResultSet, 0},
+
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_persistentQuery,
+         (Odr_fun)z_PQueryPersistentQuery, 0},
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_periodicQuerySchedule,
+         (Odr_fun)z_PQSPeriodicQuerySchedule, 0},
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_exportSpecification,
+         (Odr_fun)z_ESExportSpecification, 0},
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_exportInvocation,
+         (Odr_fun)z_EIExportInvocation, 0},
         {-1, -1, -1, -1, 0, 0}
     };
 
@@ -367,6 +388,7 @@ Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab