Commit 2c8079b4 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing doc prefix

parent 6b3953e6

103120/examples/request3.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>

                            <doc:DocumentReference>W000001</doc:DocumentReference>

                            <doc:DocumentTimespan>

                                <doc:StartTime>2015-09-01T12:00:00Z</doc:StartTime>

                                <doc:StartTime>2015-09-01T12:00:00BlahBlahZ</doc:StartTime>

                                <doc:EndTime>2015-12-01T12:00:00Z</doc:EndTime>

                            </doc:DocumentTimespan>

                            <doc:DocumentType>

103120/schema/json/ts_103120_Document.schema.json

+24 −24
Original line number Diff line number Diff line
@@ -33,40 +33,40 @@ 
        "NationalHandlingParameters": {

          "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters"

        },

        "document:DocumentReference": {

        "doc:DocumentReference": {

          "$ref": "ts_103280_2017_07#/$defs/LongString"

        },

        "document:DocumentName": {

        "doc:DocumentName": {

          "$ref": "ts_103280_2017_07#/$defs/LongString"

        },

        "document:DocumentStatus": {

        "doc:DocumentStatus": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "document:DocumentDesiredStatus": {

        "doc:DocumentDesiredStatus": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "document:DocumentTimespan": {

        "doc:DocumentTimespan": {

          "$ref": "#/$defs/DocumentTimespan"

        },

        "document:DocumentType": {

        "doc:DocumentType": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "document:DocumentProperties": {

        "doc:DocumentProperties": {

          "$ref": "#/$defs/DocumentProperties"

        },

        "document:DocumentBody": {

        "doc:DocumentBody": {

          "$ref": "#/$defs/DocumentBody"

        },

        "document:DocumentSignature": {

        "doc:DocumentSignature": {

          "type": "array",

          "items": {

            "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails"

          }

        },

        "document:DocumentInvalidReason": {

        "doc:DocumentInvalidReason": {

          "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation"

        },

        "document:NationalDocumentParameters": {

        "doc:NationalDocumentParameters": {

          "$ref": "#/$defs/NationalDocumentParameters"

        }

      },
@@ -78,10 +78,10 @@ 
    "DocumentTimespan": {

      "type": "object",

      "properties": {

        "document:StartTime": {

        "doc:StartTime": {

          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"

        },

        "document:EndTime": {

        "doc:EndTime": {

          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"

        }

      },
@@ -90,7 +90,7 @@ 
    "DocumentProperties": {

      "type": "object",

      "properties": {

        "document:DocumentProperty": {

        "doc:DocumentProperty": {

          "type": "array",

          "items": {

            "$ref": "#/$defs/DocumentProperty"
@@ -102,32 +102,32 @@ 
    "DocumentProperty": {

      "type": "object",

      "properties": {

        "document:PropertyType": {

        "doc:PropertyType": {

          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"

        },

        "document:PropertyValue": {

        "doc:PropertyValue": {

          "$ref": "ts_103280_2017_07#/$defs/LongString"

        }

      },

      "required": [

        "document:PropertyType",

        "document:PropertyValue"

        "doc:PropertyType",

        "doc:PropertyValue"

      ]

    },

    "DocumentBody": {

      "type": "object",

      "properties": {

        "document:Contents": {

        "doc:Contents": {

          "type": "string",

          "pattern": "^[-A-Za-z0-9+/]*={0,3}$"

        },

        "document:ContentType": {

        "doc:ContentType": {

          "$ref": "ts_103280_2017_07#/$defs/ShortString"

        },

        "document:Checksum": {

        "doc:Checksum": {

          "$ref": "ts_103280_2017_07#/$defs/ShortString"

        },

        "document:ChecksumType": {

        "doc:ChecksumType": {

          "$ref": "ts_103280_2017_07#/$defs/ShortString"

        }

      },
@@ -136,12 +136,12 @@ 
    "NationalDocumentParameters": {

      "type": "object",

      "properties": {

        "document:CountryCode": {

        "doc:CountryCode": {

          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"

        }

      },

      "required": [

        "document:CountryCode"

        "doc:CountryCode"

      ]

    }

  }

utils/translate/SequenceMapping.py

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ class SequenceMapping(ComplexTypeMapping): 
        inner_choice = None

        for c in list(content.iter_model()):

            log.debug(f"Processing model item {c}")

            print("Model item -------------")

            if type(c) is XsdElement:

                element_name = c.local_name

                if c.target_namespace in self.ns_to_id_map:

utils/ts103120_config.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
            "prefix" : "delivery"

        },

        "./103120/schema/ts_103120_Document.xsd" : {

            "prefix" : "document"

            "prefix" : "doc"

        },

        "./103120/schema/ts_103120_Notification.xsd" : {

            "prefix" : "notification"

utils/xml_to_json.py

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ coerce_to_list = [ 
    'ActionResponse',

    'ListResponseRecord',

    'AssociatedObject',

    'document:DocumentSignature',

    'document:DocumentProperty',

    'doc:DocumentSignature',

    'doc:DocumentProperty',

    'notification:AssociatedObjectStatus',

    'task:ApprovalDetails',

    'task:TargetIdentifierValue',