Commit 5ed1429f authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Correcting recordSetDescription errors and $id values

parent 1bf10b54

103705/examples/example1/csp_records.schema.json

+5 −5
Original line number Diff line number Diff line 
{

  "$id": "etsi.org_ts103705_records",

  "$id": "urn:etsi:li:ts103705_record_schema_id:0.3.0",

  "$schema": "https://json-schema.org/draft/2020-12/schema",

  "title": "CSP Record Schema",

  "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)",
@@ -11,13 +11,13 @@ 
      "record" : {

        "oneOf" : [{

          "allOf" : [

            { "$ref" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord" },

            { "properties" : { "type" : { "const" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord"}}}

            { "$ref" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord" },

            { "properties" : { "type" : { "const" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord"}}}

          ]},

          {

            "allOf" : [

              { "$ref" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/MessagingRecord" },

              { "properties" : { "type" : { "const" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/MessagingRecord"}}}

              { "$ref" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/MessagingRecord" },

              { "properties" : { "type" : { "const" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/MessagingRecord"}}}

            ]}            

          ]

      }

103705/examples/example1/csp_results.json

+5 −4
Original line number Diff line number Diff line 
{

    "recordSetDescription": {

        "etsiSchemaId": "etsi.org/ts_103_705/1.1.1",

        "etsiVersion": "1.1.1",

        "etsiSchemaId": "urn:etsi:li:ts103705_schema_id:0.3.0",

        "etsiSpecificationVersion": "0.3.0",

        "cspSchemaId" : "csp.example_1",

        "cspSchemaVersion" : "1.0.0",

        "resultSetId": "9a25db0c-d0f3-4ae5-b618-bd1a9a0056c2",

        "queryReference": "LDID",

        "created": "2024-04-25T09:31:56.000000Z"
@@ -10,7 +11,7 @@ 
    "recordSet": [

        {

            "id": "3da91ade-f526-4e55-b5da-0c8178f25c24",

            "type": "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord",

            "type": "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord",

            "timeBegin": "2024-04-20T10:04:00.000000Z",

            "timeEnd": "2024-04-20T10:05:00.000000Z",

            "endReason": 16,
@@ -27,7 +28,7 @@ 
        },

        {

            "id": "8be3fc6b-a2dd-4104-9af1-d6b1f70081a0",

            "type": "etsi.org_ts103705_1.3.1_etsi-types#/$defs/MessagingRecord",

            "type": "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/MessagingRecord",

            "timeBegin": "2024-04-18T10:04:00.000000Z",

            "parties": [

                {

103705/examples/example2/csp_records.schema.json

+3 −3
Original line number Diff line number Diff line 
{

  "$id": "etsi.org_ts103705_records",

  "$id": "urn:etsi:li:ts103705_record_schema_id:0.3.0",

  "$schema": "https://json-schema.org/draft/2020-12/schema",

  "title": "CSP Record Schema",

  "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)",
@@ -11,8 +11,8 @@ 
      "record" : {

          "oneOf" : [{

            "allOf" : [

              { "$ref" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord" },

              { "properties" : { "type" : { "const" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord"}}}

              { "$ref" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord" },

              { "properties" : { "type" : { "const" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord"}}}

            ]},

            {

              "allOf" : [

103705/examples/example2/csp_results.json

+4 −3
Original line number Diff line number Diff line 
{

    "recordSetDescription": {

        "etsiSchemaId": "etsi.org/ts_103_705/1.1.1",

        "etsiVersion": "1.1.1",

        "etsiSchemaId": "urn:etsi:li:ts103705_schema_id:0.3.0",

        "etsiSpecificationVersion": "0.3.0",

        "cspSchemaId" : "csp.example_2",

        "cspSchemaVersion" : "1.0.0",

        "resultSetId": "9a25db0c-d0f3-4ae5-b618-bd1a9a0056c2",

        "queryReference": "LDID",

        "created": "2024-04-25T09:31:56.000000Z"
@@ -10,7 +11,7 @@ 
    "recordSet": [

        {

            "id": "3da91ade-f526-4e55-b5da-0c8178f25c24",

            "type": "etsi.org_ts103705_1.3.1_etsi-types#/$defs/CallRecord",

            "type": "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/CallRecord",

            "timeBegin": "2024-04-20T10:04:00.000000Z",

            "timeEnd": "2024-04-20T10:05:00.000000Z",

            "endReason": 16,

103705/examples/example2/csp_types.schema.json

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    "description": "JSON schema for ETSI-defined types (see clause 6.1 and Annex A)",

    "$defs": {

        "CSPMessagingRecord" : {

            "allOf" : [{ "$ref" : "etsi.org_ts103705_1.3.1_etsi-types#/$defs/MessagingRecord"}],

            "allOf" : [{ "$ref" : "urn:etsi:li:ts103705_type_schema_id:0.3.0#/$defs/MessagingRecord"}],

            "properties" : {

                "CSPMessagingReference" : { "$ref" : "ts_103280_2017_07#/$defs/UUID"}

            }