X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fretrieval.h;h=9fdccb92818a81105ae98fa9a0582c2c4605d3be;hp=9592bc0a3561aca3faa1f8276ccc3fd00eaa4283;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=d305f63028800611fd05a3bfc54db24e2634d7ad

diff --git a/include/yaz/retrieval.h b/include/yaz/retrieval.h
index 9592bc0..9fdccb9 100644
--- a/include/yaz/retrieval.h
+++ b/include/yaz/retrieval.h
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2005-2006, Index Data ApS
- *
- * 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 file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * 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.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: retrieval.h,v 1.3 2006-05-07 14:48:24 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /**
  * \file retrieval.h
  * \brief Retrieval Utility
@@ -36,7 +36,7 @@
 #include <stddef.h>
 #include <yaz/wrbuf.h>
 #include <yaz/yconfig.h>
-
+#include <yaz/oid_util.h>
 #include <yaz/record_conv.h>
 
 YAZ_BEGIN_CDECL
@@ -64,24 +64,28 @@ YAZ_EXPORT void yaz_retrieval_destroy(yaz_retrieval_t p);
     
     For retrieval:
     \verbatim
-    <retrievalinfo>
-       <retrieval syntax="usmarc" schema="marcxml"
-            identifier="info:srw/schema/1/marcxml-v1.1"
-            backendsyntax="xml" backendschema="dc"
-       >
-         <title>MARCXML</title>
-         <convert>
-            <marc inputformat="marc" outputformat="marcxml"
-                         inputcharset="marc-8"/>
-            <xslt stylesheet="marcxml2mods.xsl"/>
-            <xslt stylesheet="mods2dc.xsl"/>
-         </convert>
+     <retrievalinfo>
+       <retrieval syntax="usmarc" name="F"/>
+       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="xml" name="marcxml"
+		  identifier="info:srw/schema/1/marcxml-v1.1">
+         <backend syntax="usmarc" name="F">
+	   <marc inputformat="marc" outputformat="marcxml"
+		 inputcharset="marc-8"/>
+	 </backend>
+       </retrieval>
+       <retrieval syntax="xml" name="dc">
+         <backend syntax="usmarc" name="F">
+	   <marc inputformat="marc" outputformat="marcxml"
+		 inputcharset="marc-8"/>
+           <xslt stylesheet="MARC21slim2DC.xsl"/>
+	 </backend>
        </retrieval>
-    </retrievalinfo>
+     </retrievalinfo>
     \endverbatim
 */
 YAZ_EXPORT
-int yaz_retrieval_configure(yaz_retrieval_t p, const void *node);
+int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *node);
 
 
 /** performs retrieval request based on schema and format
@@ -97,16 +101,15 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const void *node);
     \retval -1 failure, use yaz_retrieval_get_error() for reason
     \retval 1 schema does not match
     \retval 2 syntax does not match
-    \retval 3 neither schema, nor syntax matches
-    \retval 4 both match but not together
+    \retval 3 both match but not together
 */
 YAZ_EXPORT
 int yaz_retrieval_request(yaz_retrieval_t p,
-                          const char *schema, int *syntax,
-                          const char **match_schema, int **match_syntax,
+                          const char *schema, Odr_oid *syntax,
+                          const char **match_schema, Odr_oid **match_syntax,
                           yaz_record_conv_t *rc,
                           const char **backend_schema,
-                          int **backend_syntax);
+                          Odr_oid **backend_syntax);
 
 /** returns error string (for last error)
     \param p record conversion handle