X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsortspec.c;h=b76a2535048b73f48e79ca9768b3296be2c4e9cc;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=f9a4bc389ec5fb7615f2d2132b27941391df72f6;hpb=4d1e4573d65a535e8f64527fd42434dcb08f0041;p=yaz-moved-to-github.git

diff --git a/src/sortspec.c b/src/sortspec.c
index f9a4bc3..b76a253 100644
--- a/src/sortspec.c
+++ b/src/sortspec.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: sortspec.c,v 1.6 2006-05-30 21:39:15 adam Exp $
+ * $Id: sortspec.c,v 1.9 2007-04-12 13:52:57 adam Exp $
  */
 /**
  * \file sortspec.c
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 
 #include <yaz/proto.h>
-#include <yaz/oid.h>
 #include <yaz/sortspec.h>
+#include <yaz/oid_db.h>
 
 Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg)
 {
@@ -50,7 +50,8 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg)
             sk->u.sortAttributes = (Z_SortAttributes *)
                 odr_malloc (out, sizeof(*sk->u.sortAttributes));
             sk->u.sortAttributes->id = 
-                yaz_oidval_to_z3950oid(out, CLASS_ATTSET, VAL_BIB1);
+                yaz_string_to_oid_odr(yaz_oid_std(),
+                                      CLASS_ATTSET, OID_STR_BIB1, out);
             sk->u.sortAttributes->list = (Z_AttributeList *)
                 odr_malloc (out, sizeof(*sk->u.sortAttributes->list));
             sk->u.sortAttributes->list->attributes = (Z_AttributeElement **)
@@ -120,7 +121,8 @@ Z_SortKeySpecList *yaz_sort_spec (ODR out, const char *arg)
                 i++;
                 sks->u.missingValueData->len = strlen(sort_flags+i);
                 sks->u.missingValueData->size = sks->u.missingValueData->len;
-                sks->u.missingValueData->buf = odr_strdup(out, sort_flags+i);
+                sks->u.missingValueData->buf = (unsigned char*)
+                                          odr_strdup(out, sort_flags+i);
                 i += strlen(sort_flags+i);
             }
         }