Added Sort PDU. Moved StringList to main protocol file.

diff --git a/asn/proto.c b/asn/proto.c
index 29e652c..edaf95b 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $

- * Revision 1.41  1996-01-10 15:21:24  quinn
+ * Revision 1.42  1996-01-22 09:46:31  quinn
+ * Added Sort PDU. Moved StringList to main protocol file.
+ *
+ * Revision 1.41  1996/01/10  15:21:24  quinn

  * Added links to access control PDUs
  *
  * Revision 1.40  1996/01/02  11:46:40  quinn
  * Added links to access control PDUs
  *
  * Revision 1.40  1996/01/02  11:46:40  quinn

@@ -272,6 +275,19 @@ int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
        odr_sequence_end(o);
 }
 
        odr_sequence_end(o);
 }
 

+int z_StringList(ODR o, Z_StringList **p, int opt)
+{
+    if (o->direction == ODR_DECODE)
+       *p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+       return opt;
+    if (odr_sequence_of(o, z_InternationalString, &(*p)->strings,
+       &(*p)->num_strings))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+

 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
 #if 0
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
 #if 0

@@ -1480,6 +1496,151 @@ int z_ExtendedServicesResponse(ODR o, Z_ExtendedServicesResponse **p, int opt)
         odr_sequence_end(o);
 }
 
         odr_sequence_end(o);
 }
 

+/* ------------------------ SORT ------------------------- */
+
+int z_SortAttributes(ODR o, Z_SortAttributes **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        odr_oid(o, &(*p)->id, 0) &&
+       z_AttributeList(o, &(*p)->list, 0) &&
+       odr_sequence_end(o);
+}
+
+int z_SortKey(ODR o, Z_SortKey **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+       {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKey_sortField,
+           z_InternationalString},
+       {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec, z_Specification},
+       {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKey_sortAttributes,
+           z_SortAttributes},
+       {-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_SortDbSpecific(ODR o, Z_SortDbSpecific **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        z_DatabaseName(o, &(*p)->databaseName, 0) &&
+       z_SortKey(o, &(*p)->dbSort, 0) &&
+       odr_sequence_end(o);
+}
+
+int z_SortDbSpecificList(ODR o, Z_SortDbSpecificList **p, int opt)
+{
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_sequence_of(o, z_SortDbSpecific, &(*p)->dbSpecific,
+       &(*p)->num_dbSpecific))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_SortElement(ODR o, Z_SortElement **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+       {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic, z_SortKey},
+       {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortElement_databaseSpecific,
+           z_SortDbSpecificList},
+       {-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_SortMissingValueAction(ODR o, Z_SortMissingValueAction **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+       {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortMissingValAct_abort, odr_null},
+       {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortMissingValAct_null, odr_null},
+       {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortMissingValAct_valData,
+           odr_octetstring},
+       {-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_SortKeySpec(ODR o, Z_SortKeySpec **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        z_SortElement(o, &(*p)->sortElement, 0) &&
+       odr_implicit(o, odr_integer, &(*p)->sortRelation, ODR_CONTEXT, 1, 0) &&
+       odr_implicit(o, odr_integer, &(*p)->caseSensitivity, ODR_CONTEXT,
+           2, 0) &&
+       odr_explicit(o, z_SortMissingValueAction, &(*p)->missingValueAction,
+           ODR_CONTEXT, 3, 1) &&
+       odr_sequence_end(o);
+}
+
+int z_SortResponse(ODR o, Z_SortResponse **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        z_ReferenceId(o, &(*p)->referenceId, 1) &&
+       odr_implicit(o, odr_integer, &(*p)->sortStatus, ODR_CONTEXT,
+           3, 0) &&
+       odr_implicit(o, odr_integer, &(*p)->resultSetStatus, ODR_CONTEXT,
+           4, 1) &&
+       odr_implicit(o, z_DiagRecs, &(*p)->diagnostics, ODR_CONTEXT, 5, 1) &&
+       z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+       odr_sequence_end(o);
+}
+
+int z_SortKeySpecList(ODR o, Z_SortKeySpecList **p, int opt)
+{
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_sequence_of(o, z_SortKeySpec, &(*p)->specs, &(*p)->num_specs))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_SortRequest(ODR o, Z_SortRequest **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        z_ReferenceId(o, &(*p)->referenceId, 1) &&
+       odr_implicit(o, z_StringList, &(*p)->inputResultSetNames, 
+           ODR_CONTEXT, 3, 0) &&
+       odr_implicit(o, z_InternationalString, &(*p)->sortedResultSetName,
+           ODR_CONTEXT, 4, 0) &&
+       odr_implicit(o, z_SortKeySpecList, &(*p)->sortSequence, ODR_CONTEXT,
+           5, 0) &&
+       z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+       odr_sequence_end(o);
+}
+

 /* ------------------------ APDU ------------------------- */
 
 int z_APDU(ODR o, Z_APDU **p, int opt)
 /* ------------------------ APDU ------------------------- */
 
 int z_APDU(ODR o, Z_APDU **p, int opt)

@@ -1511,6 +1672,8 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
            z_TriggerResourceControlRequest},
        {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
        {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
            z_TriggerResourceControlRequest},
        {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
        {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},

+       {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, z_SortRequest},
+       {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse, z_SortResponse},

        {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment},
        {ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest,
            z_ExtendedServicesRequest},
        {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment},
        {ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest,
            z_ExtendedServicesRequest},

diff --git a/asn/prt-dia.c b/asn/prt-dia.c
index f31a0de..2ba2338 100644 (file)
--- a/asn/prt-dia.c
+++ b/asn/prt-dia.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-dia.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-dia.c,v $

- * Revision 1.3  1995-09-29 17:11:54  quinn
+ * Revision 1.4  1996-01-22 09:46:34  quinn
+ * Added Sort PDU. Moved StringList to main protocol file.
+ *
+ * Revision 1.3  1995/09/29  17:11:54  quinn

  * Smallish
  *
  * Revision 1.2  1995/09/27  15:02:41  quinn
  * Smallish
  *
  * Revision 1.2  1995/09/27  15:02:41  quinn

@@ -159,19 +162,6 @@ int z_Scan(ODR o, Z_Scan **p, int opt)
     return opt && odr_ok(o);
 }
 
     return opt && odr_ok(o);
 }
 

-int z_StringList(ODR o, Z_StringList **p, int opt)
-{
-    if (o->direction == ODR_DECODE)
-       *p = odr_malloc(o, sizeof(**p));
-    else if (!*p)
-       return opt;
-    if (odr_sequence_of(o, z_InternationalString, &(*p)->strings,
-       &(*p)->num_strings))
-       return 1;
-    *p = 0;
-    return opt && odr_ok(o);
-}
-

 int z_Sort(ODR o, Z_Sort **p, int opt)
 {
     static Odr_arm arm[] =
 int z_Sort(ODR o, Z_Sort **p, int opt)
 {
     static Odr_arm arm[] =

diff --git a/include/proto.h b/include/proto.h
index 0cd1a22..2f77eea 100644 (file)
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $

- * Revision 1.30  1996-01-10 15:21:32  quinn
+ * Revision 1.31  1996-01-22 09:46:45  quinn
+ * Added Sort PDU. Moved StringList to main protocol file.
+ *
+ * Revision 1.30  1996/01/10  15:21:32  quinn

  * Added links to access control PDUs
  *
  * Revision 1.29  1996/01/02  11:46:49  quinn
  * Added links to access control PDUs
  *
  * Revision 1.29  1996/01/02  11:46:49  quinn

@@ -235,6 +238,12 @@ typedef struct Z_IntUnit
 
 typedef Odr_oct Z_SUTRS;
 
 
 typedef Odr_oct Z_SUTRS;
 

+typedef struct Z_StringList
+{
+    int num_strings;
+    char **strings;
+} Z_StringList;
+

 /* ----------------- INIT SERVICE  ----------------*/
 
 typedef struct
 /* ----------------- INIT SERVICE  ----------------*/
 
 typedef struct

@@ -1052,6 +1061,111 @@ typedef struct Z_ExtendedServicesResponse
     Z_OtherInformation *otherInfo;          /* OPTIONAL */
 } Z_ExtendedServicesResponse;
 
     Z_OtherInformation *otherInfo;          /* OPTIONAL */
 } Z_ExtendedServicesResponse;
 

+/* ------------------------ Sort --------------------------- */
+
+typedef struct Z_SortAttributes
+{
+    Odr_oid *id;
+    Z_AttributeList *list;
+} Z_SortAttributes;
+
+typedef struct Z_SortKey
+{
+    int which;
+#define Z_SortKey_sortField             0
+#define Z_SortKey_elementSpec           1
+#define Z_SortKey_sortAttributes        2
+    union
+    {
+       char *sortField;
+       Z_Specification *elementSpec;
+       Z_SortAttributes *sortAttributes;
+    } u;
+} Z_SortKey;
+
+typedef struct Z_SortDbSpecific
+{
+    char *databaseName;
+    Z_SortKey *dbSort;
+} Z_SortDbSpecific;
+
+typedef struct Z_SortDbSpecificList
+{
+    int num_dbSpecific;
+    Z_SortDbSpecific **dbSpecific;
+} Z_SortDbSpecificList;
+
+typedef struct Z_SortElement
+{
+    int which;
+#define Z_SortElement_generic               0
+#define Z_SortElement_databaseSpecific      1
+    union
+    {
+       Z_SortKey *generic;
+       Z_SortDbSpecificList *databaseSpecific;
+    } u;
+} Z_SortElement;
+
+typedef struct Z_SortMissingValueAction
+{
+    int which;
+#define Z_SortMissingValAct_abort           0
+#define Z_SortMissingValAct_null            1
+#define Z_SortMissingValAct_valData         2
+    union
+    {
+       Odr_null *abort;
+       Odr_null *null;
+       Odr_oct *valData;
+    } u;
+} Z_SortMissingValueAction;
+
+typedef struct Z_SortKeySpec
+{
+    Z_SortElement *sortElement;
+    int *sortRelation;
+#define Z_SortRelation_ascending            0
+#define Z_SortRelation_descending           1
+#define Z_SortRelation_ascendingByFreq      3
+#define Z_SortRelation_descendingByFreq     4
+    int *caseSensitivity;
+#define Z_SortCase_caseSensitive            0
+#define Z_SortCase_caseInsensitive          1
+    Z_SortMissingValueAction *missingValueAction;  /* OPTIONAL */
+} Z_SortKeySpec;
+
+typedef struct Z_SortResponse
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    int *sortStatus;
+#define Z_SortStatus_success              0
+#define Z_SortStatus_partial_1            1
+#define Z_SortStatus_failure              2
+    int *resultSetStatus;                   /* OPTIONAL */
+#define Z_SortResultSetStatus_empty       1
+#define Z_SortResultSetStatus_interim     2
+#define Z_SortResultSetStatus_unchanged   3
+#define Z_SortResultSetStatus_none        4
+    Z_DiagRecs *diagnostics;                /* OPTIONAL */
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_SortResponse;
+
+typedef struct Z_SortKeySpecList
+{
+    int num_specs;
+    Z_SortKeySpec **specs;
+} Z_SortKeySpecList;
+
+typedef struct Z_SortRequest
+{
+    Z_ReferenceId *referenceId;             /* OPTIONAL */
+    Z_StringList *inputResultSetNames;
+    char *sortedResultSetName;
+    Z_SortKeySpecList *sortSequence;
+    Z_OtherInformation *otherInfo;          /* OPTIONAL */
+} Z_SortRequest;
+

 /* ------------------------ APDU ---------------------------- */
 
 typedef struct Z_APDU
 /* ------------------------ APDU ---------------------------- */
 
 typedef struct Z_APDU

@@ -1076,6 +1190,8 @@ typedef struct Z_APDU
 #define Z_APDU_close 16
 #define Z_APDU_accessControlRequest 17
 #define Z_APDU_accessControlResponse 18
 #define Z_APDU_close 16
 #define Z_APDU_accessControlRequest 17
 #define Z_APDU_accessControlResponse 18

+#define Z_APDU_sortRequest 20
+#define Z_APDU_sortResponse 21

     union
     {
        Z_InitRequest  *initRequest;
     union
     {
        Z_InitRequest  *initRequest;

@@ -1093,6 +1209,8 @@ typedef struct Z_APDU
        Z_TriggerResourceControlRequest *triggerResourceControlRequest;
        Z_ScanRequest *scanRequest;
        Z_ScanResponse *scanResponse;
        Z_TriggerResourceControlRequest *triggerResourceControlRequest;
        Z_ScanRequest *scanRequest;
        Z_ScanResponse *scanResponse;

+       Z_SortRequest *sortRequest;
+       Z_SortResponse *sortResponse;

        Z_Segment *segmentRequest;
        Z_ExtendedServicesRequest *extendedServicesRequest;
        Z_ExtendedServicesResponse *extendedServicesResponse;
        Z_Segment *segmentRequest;
        Z_ExtendedServicesRequest *extendedServicesRequest;
        Z_ExtendedServicesResponse *extendedServicesResponse;

@@ -1117,6 +1235,7 @@ Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
 Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
 Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
 Z_Close *zget_Close(ODR o);
 Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
 Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
 Z_Close *zget_Close(ODR o);

+int z_StringList(ODR o, Z_StringList **p, int opt);

 int z_InternationalString(ODR o, char **p, int opt);
 int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
 int z_ElementSetName(ODR o, char **p, int opt);
 int z_InternationalString(ODR o, char **p, int opt);
 int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
 int z_ElementSetName(ODR o, char **p, int opt);

diff --git a/include/prt-dia.h b/include/prt-dia.h
index 356afd1..a7e80d2 100644 (file)
--- a/include/prt-dia.h
+++ b/include/prt-dia.h
@@ -150,12 +150,6 @@ typedef struct Z_Scan
     } u;
 } Z_Scan;
 
     } u;
 } Z_Scan;
 

-typedef struct Z_StringList
-{
-    int num_strings;
-    char **strings;
-} Z_StringList;
-

 typedef struct Z_Sort
 {
     int which;
 typedef struct Z_Sort
 {
     int which;