X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fproto.h;h=6c6a81d2a2fd83be6b97e5c3eda20f62f3666d4e;hb=1d2f32707c0d46f1fe11826fadbb2537fd90fac7;hp=651125ebe28a6aa1ee407809c5eb90f49f8cc00c;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431;p=yaz-moved-to-github.git

diff --git a/include/yaz/proto.h b/include/yaz/proto.h
index 651125e..6c6a81d 100644
--- a/include/yaz/proto.h
+++ b/include/yaz/proto.h
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data.
+ * Copyright (C) 1995-2009 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:
@@ -65,64 +65,13 @@
 #include <yaz/z-charneg.h>
 #include <yaz/z-mterm2.h>
 #include <yaz/wrbuf.h>
+#include <yaz/matchstr.h>
 #include <yaz/zgdu.h>
 #include <yaz/z-oclcui.h>
 
 #include <yaz/marcdisp.h>
 YAZ_BEGIN_CDECL
 
-#if 1
-#define Z_PRES_SUCCESS   Z_PresentStatus_success
-#define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1
-#define Z_PRES_PARTIAL_2 Z_PresentStatus_partial_2
-#define Z_PRES_PARTIAL_3 Z_PresentStatus_partial_3
-#define Z_PRES_PARTIAL_4 Z_PresentStatus_partial_4
-#define Z_PRES_FAILURE   Z_PresentStatus_failure
-
-#define Z_RES_SUBSET  Z_SearchResponse_subset
-#define Z_RES_INTERIM Z_SearchResponse_interim
-#define Z_RES_NONE    Z_SearchResponse_none
-
-#define Z_SortStatus_success Z_SortResponse_success 
-#define Z_SortStatus_partial_1 Z_SortResponse_partial_1
-#define Z_SortStatus_failure Z_SortResponse_failure
-
-#define Z_SortRelation_ascending            Z_SortKeySpec_ascending 
-#define Z_SortRelation_descending           Z_SortKeySpec_descending
-#define Z_SortRelation_ascendingByFreq      Z_SortKeySpec_ascendingByFrequency
-#define Z_SortRelation_descendingByFreq     Z_SortKeySpec_descendingByfrequency 
-
-#define Z_SortCase_caseSensitive            Z_SortKeySpec_caseSensitive
-#define Z_SortCase_caseInsensitive          Z_SortKeySpec_caseInsensitive
-
-#define Z_TriggerResourceCtrl_resourceReport Z_TriggerResourceControlRequest_resourceReport
-#define Z_TriggerResourceCtrl_resourceControl  Z_TriggerResourceControlRequest_resourceControl
-#define Z_TriggerResourceCtrl_cancel Z_TriggerResourceControlRequest_cancel
-
-#define Z_DeleteRequest_list    Z_DeleteResultSetRequest_list
-#define Z_DeleteRequest_all     Z_DeleteResultSetRequest_all
-
-#define Z_AccessRequest_simpleForm Z_AccessControlRequest_simpleForm
-#define Z_AccessRequest_externallyDefined Z_AccessControlRequest_externallyDefined
-
-#define Z_AccessResponse_simpleForm Z_AccessControlResponse_simpleForm
-#define Z_AccessResponse_externallyDefined Z_AccessControlResponse_externallyDefined
-
-#define Z_ResourceReportStatus_success   Z_ResourceReportResponse_success
-#define Z_ResourceReportStatus_partial   Z_ResourceReportResponse_partial
-#define Z_ResourceReportStatus_failure_1 Z_ResourceReportResponse_failure_1
-#define Z_ResourceReportStatus_failure_2 Z_ResourceReportResponse_failure_2
-#define Z_ResourceReportStatus_failure_3 Z_ResourceReportResponse_failure_3
-#define Z_ResourceReportStatus_failure_4 Z_ResourceReportResponse_failure_4
-#define Z_ResourceReportStatus_failure_5 Z_ResourceReportResponse_failure_5
-#define Z_ResourceReportStatus_failure_6 Z_ResourceReportResponse_failure_6
-
-#define Z_SortResultSetStatus_empty       Z_SortResponse_empty
-#define Z_SortResultSetStatus_interim     Z_SortResponse_interim
-#define Z_SortResultSetStatus_unchanged   Z_SortResponse_unchanged
-#define Z_SortResultSetStatus_none        Z_SortResponse_none
-#endif
-
 typedef Z_External Z_DatabaseRecord;
 typedef struct Z_IOItemOrder Z_ItemOrder;
 
@@ -191,6 +140,7 @@ YAZ_END_CDECL
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab