X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Falvis.c;h=0822faba44331a1446d4ff2f3d7b915ef5b4b3c3;hb=ca820b5e84bec416bf0f5790d1aac509842b4faf;hp=e168da31d2d3e4fcab305b0f33c8a9b12a5e81d3;hpb=3e4a78274a6cb7a99f3e90967ea30c830ffbf8c3;p=idzebra-moved-to-github.git

diff --git a/index/alvis.c b/index/alvis.c
index e168da3..0822fab 100644
--- a/index/alvis.c
+++ b/index/alvis.c
@@ -1,4 +1,4 @@
-/* $Id: alvis.c,v 1.15 2007-03-19 21:50:39 adam Exp $
+/* $Id: alvis.c,v 1.17 2007-04-16 21:54:37 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/diagbib1.h>
 #include <yaz/tpath.h>
+#include <yaz/oid_db.h>
 
 #include <libxml/xmlversion.h>
 #include <libxml/parser.h>
@@ -729,7 +730,8 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     {
 	p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
     }
-    else if (p->input_format == VAL_NONE || p->input_format == VAL_TEXT_XML)
+    else if (!p->input_format 
+             || !oid_oidcmp(p->input_format, yaz_oid_recsyn_xml))
     {
 	xmlChar *buf_out;
 	int len_out;
@@ -740,13 +742,13 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
 	    xmlDocDumpMemory(resDoc, &buf_out, &len_out);            
 
-	p->output_format = VAL_TEXT_XML;
+	p->output_format = yaz_oid_recsyn_xml;
 	p->rec_len = len_out;
 	p->rec_buf = odr_malloc(p->odr, p->rec_len);
 	memcpy(p->rec_buf, buf_out, p->rec_len);
 	xmlFree(buf_out);
     }
-    else if (p->output_format == VAL_SUTRS)
+    else if (!oid_oidcmp(p->output_format, yaz_oid_recsyn_sutrs))
     {
 	xmlChar *buf_out;
 	int len_out;
@@ -757,7 +759,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         else
 	    xmlDocDumpMemory(resDoc, &buf_out, &len_out);            
 
-	p->output_format = VAL_SUTRS;
+	p->output_format = yaz_oid_recsyn_sutrs;
 	p->rec_len = len_out;
 	p->rec_buf = odr_malloc(p->odr, p->rec_len);
 	memcpy(p->rec_buf, buf_out, p->rec_len);