From 3046d5072a66fe49ffc19b890b3a69dda0aed5a3 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 10 May 2004 08:38:45 +0000
Subject: [PATCH] Do not use obsolete YAZ defines

---
 NEWS     |    5 ++++-
 ir-tcl.c |   29 ++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index f87c965..b238265 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+
+05/10/04 Do not use obsolete YAZ defines.
+
 ------------------------------------------------------
 26/04/04 Release of ir-tcl-1.4.2
 
@@ -173,4 +176,4 @@
 ------------------------------------------------------
 06/19/95 Release of ir-tcl-1.0b
 
-$Id: NEWS,v 1.2 2004-04-26 09:09:06 adam Exp $
+$Id: NEWS,v 1.3 2004-05-10 08:38:45 adam Exp $
diff --git a/ir-tcl.c b/ir-tcl.c
index 2d3e9ef..0a2bf49 100644
--- a/ir-tcl.c
+++ b/ir-tcl.c
@@ -4,7 +4,10 @@
  * See the file LICENSE for details.
  *
  * $Log: ir-tcl.c,v $
- * Revision 1.126  2003-11-29 17:24:09  adam
+ * Revision 1.127  2004-05-10 08:38:45  adam
+ * Do not use obsolete YAZ defines
+ *
+ * Revision 1.126  2003/11/29 17:24:09  adam
  * Added getXml method (Franck Falcoz)
  *
  * Revision 1.125  2003/04/29 10:51:23  adam
@@ -1582,7 +1585,7 @@ static int do_triggerResourceControl (void *obj, Tcl_Interp *interp,
     }
     apdu = zget_APDU (p->odr_out, Z_APDU_triggerResourceControlRequest);
     req = apdu->u.triggerResourceControlRequest;
-    *req->requestedAction = Z_TriggerResourceCtrl_cancel;
+    *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
     req->resultSetWanted = &is_false; 
     
     return ir_tcl_send_APDU (interp, p, apdu, "triggerResourceControl",
@@ -2436,16 +2439,16 @@ static int do_sortStatus (void *o, Tcl_Interp *interp,
 
     if (argc <= 0)
     {
-	obj->sortStatus = Z_SortStatus_failure;
+	obj->sortStatus = Z_SortResponse_failure;
         return TCL_OK;
     }
     switch (obj->sortStatus)
     {
-    case Z_SortStatus_success:
+    case Z_SortResponse_success:
         res = "success"; break;
-    case Z_SortStatus_partial_1:
+    case Z_SortResponse_partial_1:
         res = "partial"; break;
-    case Z_SortStatus_failure:
+    case Z_SortResponse_failure:
         res = "failure"; break;
     default:
 	res = "unknown"; break;
@@ -3282,10 +3285,10 @@ static int do_sort (void *o, Tcl_Interp *interp, int argc, char **argv)
         }
         sks->sortRelation = (int *)
 	    odr_malloc (p->odr_out, sizeof(*sks->sortRelation));
-        *sks->sortRelation = Z_SortRelation_ascending;
+        *sks->sortRelation = Z_SortKeySpec_ascending;
         sks->caseSensitivity = (int *)
 	    odr_malloc (p->odr_out, sizeof(*sks->caseSensitivity));
-        *sks->caseSensitivity = Z_SortCase_caseSensitive;
+        *sks->caseSensitivity = Z_SortKeySpec_caseSensitive;
 	
 #ifdef ASN_COMPILED
         sks->which = Z_SortKeySpec_null;
@@ -3301,20 +3304,20 @@ static int do_sort (void *o, Tcl_Interp *interp, int argc, char **argv)
             case 'a':
             case 'A':
             case '>':
-                *sks->sortRelation = Z_SortRelation_descending;
+                *sks->sortRelation = Z_SortKeySpec_descending;
                 break;
             case 'd':
             case 'D':
             case '<':
-                *sks->sortRelation = Z_SortRelation_ascending;
+                *sks->sortRelation = Z_SortKeySpec_ascending;
                 break;
             case 'i':
             case 'I':
-                *sks->caseSensitivity = Z_SortCase_caseInsensitive;
+                *sks->caseSensitivity = Z_SortKeySpec_caseInsensitive;
                 break;
             case 'S':
             case 's':
-                *sks->caseSensitivity = Z_SortCase_caseSensitive;
+                *sks->caseSensitivity = Z_SortKeySpec_caseSensitive;
                 break;
             }
         }
@@ -4299,7 +4302,7 @@ static void ir_searchResponse (void *o, Z_SearchResponse *searchrs,
     if (searchrs->presentStatus)
         setobj->presentStatus = *searchrs->presentStatus;
     else
-        setobj->presentStatus = Z_RES_NONE;
+        setobj->presentStatus = Z_SearchResponse_none;
     if (searchrs->nextResultSetPosition)
         setobj->nextResultSetPosition = *searchrs->nextResultSetPosition;
 
-- 
1.7.10.4