X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_expout.c;h=3757f284c5cb5e7250db80520a6a823447b3cba8;hb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;hp=9a85cec810be94248a62df5110172931b0db32d5;hpb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;p=idzebra-moved-to-github.git

diff --git a/data1/d1_expout.c b/data1/d1_expout.c
index 9a85cec..3757f28 100644
--- a/data1/d1_expout.c
+++ b/data1/d1_expout.c
@@ -1,6 +1,6 @@
-/* $Id: d1_expout.c,v 1.5 2004-12-13 20:51:28 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_expout.c,v 1.10 2007-04-16 08:44:31 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 /*
@@ -30,6 +30,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/log.h>
 #include <yaz/proto.h>
+#include <yaz/oid_db.h>
+#include <yaz/snprintf.h>
 #include <idzebra/data1.h>
 
 typedef struct {
@@ -113,31 +115,15 @@ static bool_t *f_bool(ExpHandle *eh, data1_node *c)
 static Odr_oid *f_oid(ExpHandle *eh, data1_node *c, oid_class oclass)
 {
     char oidstr[64];
-    int oid_this[20];
-    oid_value value_for_this;
 
     c = c->child;
     if (!is_data_tag (eh, c) || c->u.data.len > 63)
 	return 0;
-    sprintf(oidstr, "%.*s", c->u.data.len, c->u.data.data);
-    value_for_this = oid_getvalbyname(oidstr);
-    if (value_for_this == VAL_NONE)
-    {
-	Odr_oid *oid = odr_getoidbystr(eh->o, oidstr);
-	assert (oid);
-	return oid;
-    }
-    else
-    {
-	struct oident ident;
+    yaz_snprintf(oidstr, sizeof(oidstr)-1, 
+                 "%.*s", c->u.data.len, c->u.data.data);
 
-	ident.oclass = oclass;
-	ident.proto = PROTO_Z3950;
-	ident.value = value_for_this;
-	
-	oid_ent_to_oid (&ident, oid_this);
-    }
-    return odr_oiddup (eh->o, oid_this);
+    return yaz_string_to_oid_odr(yaz_oid_std(),
+                                 CLASS_GENERAL, oidstr, eh->o);
 }
 
 static Z_IntUnit *f_intunit(ExpHandle *eh, data1_node *c)
@@ -1418,3 +1404,11 @@ Z_ExplainRecord *data1_nodetoexplain (data1_handle dh, data1_node *n,
     yaz_log(YLOG_WARN, "No category in Explain record");
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+