wipo-gbd-transformation 1.1.81__py3-none-any.whl → 1.1.84__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of wipo-gbd-transformation might be problematic. Click here for more details.

Files changed (33) hide show
  1. gbdtransformation/brands/catm/filters.py +12 -3
  2. gbdtransformation/brands/catm/template.yml +7 -0
  3. gbdtransformation/brands/detm/filters.py +22 -5
  4. gbdtransformation/brands/jotm/tests/test.xml +84 -0
  5. gbdtransformation/brands/kwtm/tests/test.xml +84 -0
  6. gbdtransformation/brands/latm/tests/test.xml +112 -0
  7. gbdtransformation/brands/mgtm/tests/test.xml +107 -0
  8. gbdtransformation/brands/omtm/tests/test.xml +84 -0
  9. gbdtransformation/brands/sdtm/tests/test.xml +84 -0
  10. gbdtransformation/brands/smtm/tests/test.xml +133 -0
  11. gbdtransformation/brands/thtm/tests/test.xml +84 -0
  12. gbdtransformation/brands/totm/tests/test.xml +84 -0
  13. gbdtransformation/brands/ustm/__init__.py +29 -19
  14. gbdtransformation/brands/ustm/filters.py +22 -14
  15. gbdtransformation/brands/ustm/template.yml +8 -0
  16. gbdtransformation/brands/wstm/tests/test.xml +132 -0
  17. gbdtransformation/brands/xxxx/template.yml +1 -1
  18. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/METADATA +1 -1
  19. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/RECORD +23 -23
  20. gbdtransformation/brands/jotm/tests/test.xml.gz +0 -0
  21. gbdtransformation/brands/kwtm/tests/test.xml.gz +0 -0
  22. gbdtransformation/brands/latm/tests/test.xml.gz +0 -0
  23. gbdtransformation/brands/mgtm/tests/test.xml.gz +0 -0
  24. gbdtransformation/brands/omtm/tests/test.xml.gz +0 -0
  25. gbdtransformation/brands/sdtm/tests/test.xml.gz +0 -0
  26. gbdtransformation/brands/smtm/tests/test.xml.gz +0 -0
  27. gbdtransformation/brands/thtm/tests/test.xml.gz +0 -0
  28. gbdtransformation/brands/totm/tests/test.xml.gz +0 -0
  29. gbdtransformation/brands/wstm/tests/test.xml.gz +0 -0
  30. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/LICENSE.md +0 -0
  31. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/WHEEL +0 -0
  32. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/entry_points.txt +0 -0
  33. {wipo_gbd_transformation-1.1.81.dist-info → wipo_gbd_transformation-1.1.84.dist-info}/top_level.txt +0 -0
@@ -0,0 +1,84 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+
3
+ <Transaction xmlns="http://www.wipo.int/standards/XMLSchema/trademarks" xmlns:wo="http://www.wipo.int/standards/XMLSchema/wo-trademarks">
4
+ <TradeMarkTransactionBody>
5
+ <TransactionContentDetails>
6
+ <TransactionIdentifier>M</TransactionIdentifier>
7
+ <TransactionCode>Trademark</TransactionCode>
8
+ <TransactionSubCode>Mark</TransactionSubCode>
9
+ <TransactionData>
10
+ <TradeMarkApplication>
11
+ <TradeMarkDetails>
12
+ <TradeMark>
13
+ <RegistrationOfficeCode>TO</RegistrationOfficeCode>
14
+ <ApplicationNumber>2017/3420</ApplicationNumber>
15
+ <ApplicationDate>2017-07-26</ApplicationDate>
16
+ <ApplicationLanguageCode>en</ApplicationLanguageCode>
17
+ <MarkCurrentStatusDate>2017-09-04</MarkCurrentStatusDate>
18
+ <KindMark>Individual</KindMark>
19
+ <MarkImageDetails>
20
+ <MarkImage/>
21
+ </MarkImageDetails>
22
+ <GoodsServicesDetails>
23
+ <GoodsServices>
24
+ <ClassDescriptionDetails>
25
+ <ClassDescription>
26
+ <ClassNumber>25</ClassNumber>
27
+ <GoodsServicesDescription languageCode="en">Slippers</GoodsServicesDescription>
28
+ </ClassDescription>
29
+ </ClassDescriptionDetails>
30
+ </GoodsServices>
31
+ </GoodsServicesDetails>
32
+ <PublicationDetails>
33
+ <Publication>
34
+ <PublicationDate>2017-11-30</PublicationDate>
35
+ </Publication>
36
+ </PublicationDetails>
37
+ <ApplicantDetails>
38
+ <Applicant>
39
+ <ApplicantAddressBook>
40
+ <FormattedNameAddress>
41
+ <Name>
42
+ <FreeFormatName>
43
+ <FreeFormatNameDetails>
44
+ <FreeFormatNameLine languageCode="en">Lei Signs</FreeFormatNameLine>
45
+ </FreeFormatNameDetails>
46
+ </FreeFormatName>
47
+ </Name>
48
+ <Address>
49
+ <AddressCountryCode>TO</AddressCountryCode>
50
+ <FreeFormatAddress>
51
+ <FreeFormatAddressLine>Fund Management, Nuku'alofa</FreeFormatAddressLine>
52
+ </FreeFormatAddress>
53
+ </Address>
54
+ </FormattedNameAddress>
55
+ </ApplicantAddressBook>
56
+ </Applicant>
57
+ </ApplicantDetails>
58
+ <wo:WordMarkSpecification>
59
+ <wo:MarkVerbalElementText languageCode="en">TOKO</wo:MarkVerbalElementText>
60
+ </wo:WordMarkSpecification>
61
+ <wo:MarkEventDetails>
62
+ <wo:MarkEvent>
63
+ <wo:MarkEventDate>2017-07-26</wo:MarkEventDate>
64
+ <wo:MarkEventCode>Filed</wo:MarkEventCode>
65
+ </wo:MarkEvent>
66
+ <wo:MarkEvent>
67
+ <wo:MarkEventDate>2017-11-30</wo:MarkEventDate>
68
+ <wo:MarkEventCode>Published</wo:MarkEventCode>
69
+ </wo:MarkEvent>
70
+ <wo:MarkEvent>
71
+ <wo:MarkEventDate>2017-09-04</wo:MarkEventDate>
72
+ <wo:MarkEventCode>Examined</wo:MarkEventCode>
73
+ <wo:OfficeSpecificMarkEventCode>1044</wo:OfficeSpecificMarkEventCode>
74
+ <wo:OfficeSpecificMarkEventDescription languageCode="en">To Issue Publication Notice</wo:OfficeSpecificMarkEventDescription>
75
+ </wo:MarkEvent>
76
+ </wo:MarkEventDetails>
77
+ <wo:MarkCurrentStatusCode>Examined</wo:MarkCurrentStatusCode>
78
+ </TradeMark>
79
+ </TradeMarkDetails>
80
+ </TradeMarkApplication>
81
+ </TransactionData>
82
+ </TransactionContentDetails>
83
+ </TradeMarkTransactionBody>
84
+ </Transaction>
@@ -0,0 +1,133 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+
3
+ <Transaction xmlns="http://www.wipo.int/standards/XMLSchema/trademarks" xmlns:wo="http://www.wipo.int/standards/XMLSchema/wo-trademarks">
4
+ <TradeMarkTransactionBody>
5
+ <TransactionContentDetails>
6
+ <TransactionIdentifier>M</TransactionIdentifier>
7
+ <TransactionCode>Marchi Nazionale (Both Name and Logo)</TransactionCode>
8
+ <TransactionSubCode>Marchi Prodotti e Servizi</TransactionSubCode>
9
+ <TransactionData>
10
+ <TradeMarkApplication>
11
+ <TradeMarkDetails>
12
+ <TradeMark>
13
+ <RegistrationOfficeCode>SM</RegistrationOfficeCode>
14
+ <ApplicationNumber>SM/M/2010/000119</ApplicationNumber>
15
+ <ApplicationDate>2010-12-29</ApplicationDate>
16
+ <RegistrationNumber>2010000119</RegistrationNumber>
17
+ <RegistrationDate>2012-01-23</RegistrationDate>
18
+ <ApplicationLanguageCode>it</ApplicationLanguageCode>
19
+ <ExpiryDate>2020-12-29</ExpiryDate>
20
+ <MarkCurrentStatusDate>2020-12-29</MarkCurrentStatusDate>
21
+ <MarkFeature>Marchi Nazionale (Both Name and Logo)</MarkFeature>
22
+ <MarkImageDetails>
23
+ <MarkImage>
24
+ <MarkImageFilename>ATTACHMENT/logo</MarkImageFilename>
25
+ <MarkImageFileFormat>JPEG</MarkImageFileFormat>
26
+ </MarkImage>
27
+ </MarkImageDetails>
28
+ <GoodsServicesDetails>
29
+ <GoodsServices>
30
+ <ClassDescriptionDetails>
31
+ <ClassDescription>
32
+ <ClassNumber>9</ClassNumber>
33
+ <GoodsServicesDescription languageCode="it"></GoodsServicesDescription>
34
+ </ClassDescription>
35
+ <ClassDescription>
36
+ <ClassNumber>25</ClassNumber>
37
+ <GoodsServicesDescription languageCode="it"></GoodsServicesDescription>
38
+ </ClassDescription>
39
+ <ClassDescription>
40
+ <ClassNumber>35</ClassNumber>
41
+ <GoodsServicesDescription languageCode="it"></GoodsServicesDescription>
42
+ </ClassDescription>
43
+ <ClassDescription>
44
+ <ClassNumber>38</ClassNumber>
45
+ <GoodsServicesDescription languageCode="it"></GoodsServicesDescription>
46
+ </ClassDescription>
47
+ <ClassDescription>
48
+ <ClassNumber>41</ClassNumber>
49
+ <GoodsServicesDescription languageCode="it"></GoodsServicesDescription>
50
+ </ClassDescription>
51
+ </ClassDescriptionDetails>
52
+ </GoodsServices>
53
+ </GoodsServicesDetails>
54
+ <PublicationDetails>
55
+ <Publication>
56
+ <PublicationIdentifier>SM/M/2010/000119</PublicationIdentifier>
57
+ <PublicationDate>2012-03-05</PublicationDate>
58
+ </Publication>
59
+ <Publication>
60
+ <PublicationIdentifier>SM/M/2010/000119</PublicationIdentifier>
61
+ <PublicationDate>2011-03-07</PublicationDate>
62
+ </Publication>
63
+ </PublicationDetails>
64
+ <ApplicantDetails>
65
+ <Applicant>
66
+ <ApplicantAddressBook>
67
+ <FormattedNameAddress>
68
+ <Name>
69
+ <FreeFormatName>
70
+ <FreeFormatNameDetails>
71
+ <FreeFormatNameLine languageCode="it">SAN MARINO RTV SPA</FreeFormatNameLine>
72
+ </FreeFormatNameDetails>
73
+ </FreeFormatName>
74
+ </Name>
75
+ <Address>
76
+ <AddressCountryCode>SM</AddressCountryCode>
77
+ <FreeFormatAddress>
78
+ <FreeFormatAddressLine>Viale Kennedy, 13 47890 San Marino, , SM</FreeFormatAddressLine>
79
+ </FreeFormatAddress>
80
+ </Address>
81
+ </FormattedNameAddress>
82
+ </ApplicantAddressBook>
83
+ </Applicant>
84
+ </ApplicantDetails>
85
+ <RepresentativeDetails>
86
+ <Representative>
87
+ <RepresentativeAddressBook>
88
+ <FormattedNameAddress>
89
+ <Name>
90
+ <FreeFormatName>
91
+ <FreeFormatNameDetails>
92
+ <FreeFormatNameLine languageCode="it">GEONI LUCA MASSIMO</FreeFormatNameLine>
93
+ </FreeFormatNameDetails>
94
+ </FreeFormatName>
95
+ </Name>
96
+ <Address>
97
+ <AddressCountryCode>IT</AddressCountryCode>
98
+ <FreeFormatAddress>
99
+ <FreeFormatAddressLine>Via 28 Luglio, 218 47893 Borgo Maggiore, , SM</FreeFormatAddressLine>
100
+ </FreeFormatAddress>
101
+ </Address>
102
+ </FormattedNameAddress>
103
+ </RepresentativeAddressBook>
104
+ </Representative>
105
+ </RepresentativeDetails>
106
+ <wo:WordMarkSpecification>
107
+ <wo:MarkVerbalElementText languageCode="it">SAN MARINO CHANNEL ONE</wo:MarkVerbalElementText>
108
+ </wo:WordMarkSpecification>
109
+ <wo:MarkEventDetails>
110
+ <wo:MarkEvent>
111
+ <wo:MarkEventDate>2010-12-29</wo:MarkEventDate>
112
+ <wo:MarkEventCode>Filed</wo:MarkEventCode>
113
+ <wo:OfficeSpecificMarkEventName>Application Filing</wo:OfficeSpecificMarkEventName>
114
+ </wo:MarkEvent>
115
+ <wo:MarkEvent>
116
+ <wo:MarkEventDate>2011-01-25</wo:MarkEventDate>
117
+ <wo:MarkEventCode>Published</wo:MarkEventCode>
118
+ <wo:OfficeSpecificMarkEventName>Marchio Pubblicato</wo:OfficeSpecificMarkEventName>
119
+ </wo:MarkEvent>
120
+ <wo:MarkEvent>
121
+ <wo:MarkEventDate>2012-01-23</wo:MarkEventDate>
122
+ <wo:MarkEventCode>Published</wo:MarkEventCode>
123
+ <wo:OfficeSpecificMarkEventName>Marchio registrazione</wo:OfficeSpecificMarkEventName>
124
+ </wo:MarkEvent>
125
+ </wo:MarkEventDetails>
126
+ <wo:MarkCurrentStatusCode>Registered</wo:MarkCurrentStatusCode>
127
+ </TradeMark>
128
+ </TradeMarkDetails>
129
+ </TradeMarkApplication>
130
+ </TransactionData>
131
+ </TransactionContentDetails>
132
+ </TradeMarkTransactionBody>
133
+ </Transaction>
@@ -0,0 +1,84 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+
3
+ <Transaction xmlns="http://www.wipo.int/standards/XMLSchema/trademarks" xmlns:wo="http://www.wipo.int/standards/XMLSchema/wo-trademarks">
4
+ <TradeMarkTransactionBody>
5
+ <TransactionContentDetails>
6
+ <TransactionIdentifier>M</TransactionIdentifier>
7
+ <TransactionCode>Trademark</TransactionCode>
8
+ <TransactionSubCode>Mark</TransactionSubCode>
9
+ <TransactionData>
10
+ <TradeMarkApplication>
11
+ <TradeMarkDetails>
12
+ <TradeMark>
13
+ <RegistrationOfficeCode>TO</RegistrationOfficeCode>
14
+ <ApplicationNumber>2017/3420</ApplicationNumber>
15
+ <ApplicationDate>2017-07-26</ApplicationDate>
16
+ <ApplicationLanguageCode>en</ApplicationLanguageCode>
17
+ <MarkCurrentStatusDate>2017-09-04</MarkCurrentStatusDate>
18
+ <KindMark>Individual</KindMark>
19
+ <MarkImageDetails>
20
+ <MarkImage/>
21
+ </MarkImageDetails>
22
+ <GoodsServicesDetails>
23
+ <GoodsServices>
24
+ <ClassDescriptionDetails>
25
+ <ClassDescription>
26
+ <ClassNumber>25</ClassNumber>
27
+ <GoodsServicesDescription languageCode="en">Slippers</GoodsServicesDescription>
28
+ </ClassDescription>
29
+ </ClassDescriptionDetails>
30
+ </GoodsServices>
31
+ </GoodsServicesDetails>
32
+ <PublicationDetails>
33
+ <Publication>
34
+ <PublicationDate>2017-11-30</PublicationDate>
35
+ </Publication>
36
+ </PublicationDetails>
37
+ <ApplicantDetails>
38
+ <Applicant>
39
+ <ApplicantAddressBook>
40
+ <FormattedNameAddress>
41
+ <Name>
42
+ <FreeFormatName>
43
+ <FreeFormatNameDetails>
44
+ <FreeFormatNameLine languageCode="en">Lei Signs</FreeFormatNameLine>
45
+ </FreeFormatNameDetails>
46
+ </FreeFormatName>
47
+ </Name>
48
+ <Address>
49
+ <AddressCountryCode>TO</AddressCountryCode>
50
+ <FreeFormatAddress>
51
+ <FreeFormatAddressLine>Fund Management, Nuku'alofa</FreeFormatAddressLine>
52
+ </FreeFormatAddress>
53
+ </Address>
54
+ </FormattedNameAddress>
55
+ </ApplicantAddressBook>
56
+ </Applicant>
57
+ </ApplicantDetails>
58
+ <wo:WordMarkSpecification>
59
+ <wo:MarkVerbalElementText languageCode="en">TOKO</wo:MarkVerbalElementText>
60
+ </wo:WordMarkSpecification>
61
+ <wo:MarkEventDetails>
62
+ <wo:MarkEvent>
63
+ <wo:MarkEventDate>2017-07-26</wo:MarkEventDate>
64
+ <wo:MarkEventCode>Filed</wo:MarkEventCode>
65
+ </wo:MarkEvent>
66
+ <wo:MarkEvent>
67
+ <wo:MarkEventDate>2017-11-30</wo:MarkEventDate>
68
+ <wo:MarkEventCode>Published</wo:MarkEventCode>
69
+ </wo:MarkEvent>
70
+ <wo:MarkEvent>
71
+ <wo:MarkEventDate>2017-09-04</wo:MarkEventDate>
72
+ <wo:MarkEventCode>Examined</wo:MarkEventCode>
73
+ <wo:OfficeSpecificMarkEventCode>1044</wo:OfficeSpecificMarkEventCode>
74
+ <wo:OfficeSpecificMarkEventDescription languageCode="en">To Issue Publication Notice</wo:OfficeSpecificMarkEventDescription>
75
+ </wo:MarkEvent>
76
+ </wo:MarkEventDetails>
77
+ <wo:MarkCurrentStatusCode>Examined</wo:MarkCurrentStatusCode>
78
+ </TradeMark>
79
+ </TradeMarkDetails>
80
+ </TradeMarkApplication>
81
+ </TransactionData>
82
+ </TransactionContentDetails>
83
+ </TradeMarkTransactionBody>
84
+ </Transaction>
@@ -0,0 +1,84 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+
3
+ <Transaction xmlns="http://www.wipo.int/standards/XMLSchema/trademarks" xmlns:wo="http://www.wipo.int/standards/XMLSchema/wo-trademarks">
4
+ <TradeMarkTransactionBody>
5
+ <TransactionContentDetails>
6
+ <TransactionIdentifier>M</TransactionIdentifier>
7
+ <TransactionCode>Trademark</TransactionCode>
8
+ <TransactionSubCode>Mark</TransactionSubCode>
9
+ <TransactionData>
10
+ <TradeMarkApplication>
11
+ <TradeMarkDetails>
12
+ <TradeMark>
13
+ <RegistrationOfficeCode>TO</RegistrationOfficeCode>
14
+ <ApplicationNumber>2017/3420</ApplicationNumber>
15
+ <ApplicationDate>2017-07-26</ApplicationDate>
16
+ <ApplicationLanguageCode>en</ApplicationLanguageCode>
17
+ <MarkCurrentStatusDate>2017-09-04</MarkCurrentStatusDate>
18
+ <KindMark>Individual</KindMark>
19
+ <MarkImageDetails>
20
+ <MarkImage/>
21
+ </MarkImageDetails>
22
+ <GoodsServicesDetails>
23
+ <GoodsServices>
24
+ <ClassDescriptionDetails>
25
+ <ClassDescription>
26
+ <ClassNumber>25</ClassNumber>
27
+ <GoodsServicesDescription languageCode="en">Slippers</GoodsServicesDescription>
28
+ </ClassDescription>
29
+ </ClassDescriptionDetails>
30
+ </GoodsServices>
31
+ </GoodsServicesDetails>
32
+ <PublicationDetails>
33
+ <Publication>
34
+ <PublicationDate>2017-11-30</PublicationDate>
35
+ </Publication>
36
+ </PublicationDetails>
37
+ <ApplicantDetails>
38
+ <Applicant>
39
+ <ApplicantAddressBook>
40
+ <FormattedNameAddress>
41
+ <Name>
42
+ <FreeFormatName>
43
+ <FreeFormatNameDetails>
44
+ <FreeFormatNameLine languageCode="en">Lei Signs</FreeFormatNameLine>
45
+ </FreeFormatNameDetails>
46
+ </FreeFormatName>
47
+ </Name>
48
+ <Address>
49
+ <AddressCountryCode>TO</AddressCountryCode>
50
+ <FreeFormatAddress>
51
+ <FreeFormatAddressLine>Fund Management, Nuku'alofa</FreeFormatAddressLine>
52
+ </FreeFormatAddress>
53
+ </Address>
54
+ </FormattedNameAddress>
55
+ </ApplicantAddressBook>
56
+ </Applicant>
57
+ </ApplicantDetails>
58
+ <wo:WordMarkSpecification>
59
+ <wo:MarkVerbalElementText languageCode="en">TOKO</wo:MarkVerbalElementText>
60
+ </wo:WordMarkSpecification>
61
+ <wo:MarkEventDetails>
62
+ <wo:MarkEvent>
63
+ <wo:MarkEventDate>2017-07-26</wo:MarkEventDate>
64
+ <wo:MarkEventCode>Filed</wo:MarkEventCode>
65
+ </wo:MarkEvent>
66
+ <wo:MarkEvent>
67
+ <wo:MarkEventDate>2017-11-30</wo:MarkEventDate>
68
+ <wo:MarkEventCode>Published</wo:MarkEventCode>
69
+ </wo:MarkEvent>
70
+ <wo:MarkEvent>
71
+ <wo:MarkEventDate>2017-09-04</wo:MarkEventDate>
72
+ <wo:MarkEventCode>Examined</wo:MarkEventCode>
73
+ <wo:OfficeSpecificMarkEventCode>1044</wo:OfficeSpecificMarkEventCode>
74
+ <wo:OfficeSpecificMarkEventDescription languageCode="en">To Issue Publication Notice</wo:OfficeSpecificMarkEventDescription>
75
+ </wo:MarkEvent>
76
+ </wo:MarkEventDetails>
77
+ <wo:MarkCurrentStatusCode>Examined</wo:MarkCurrentStatusCode>
78
+ </TradeMark>
79
+ </TradeMarkDetails>
80
+ </TradeMarkApplication>
81
+ </TransactionData>
82
+ </TransactionContentDetails>
83
+ </TradeMarkTransactionBody>
84
+ </Transaction>
@@ -6,28 +6,23 @@ status_map = {
6
6
  '000': {'gbd': 'Delete', 'office': 'Indifferent'},
7
7
  '626': {'gbd': 'Delete', 'office': 'Dead/Cancelled'},
8
8
 
9
- '416': {'gbd': 'Unknown', 'office': 'Other'},
10
- '901': {'gbd': 'Unknown', 'office': 'Other'},
11
- '968': {'gbd': 'Unknown', 'office': 'Other'},
12
- '969': {'gbd': 'Unknown', 'office': 'Other'},
9
+ '622': {'gbd': 'Other', 'office': 'Indifferent'},
13
10
 
14
- '900': {'gbd': 'Expired', 'office': 'Dead/Expired'},
15
-
16
- '622': {'gbd': 'Ended', 'office': 'Dead/Refused'},
17
- '632': {'gbd': 'Ended', 'office': 'Dead/Refused'},
18
- '401': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
19
- '400': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
11
+
12
+ '401': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
13
+ '400': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
20
14
  '402': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
21
15
  '403': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
22
16
  '404': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
23
- '405': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
17
+ '405': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
24
18
  '406': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
25
19
  '411': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
26
20
  '412': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
27
21
  '414': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
28
22
  '415': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
23
+ '416': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
29
24
  '417': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
30
- '618': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
25
+
31
26
  '600': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
32
27
  '601': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
33
28
  '602': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
@@ -38,17 +33,20 @@ status_map = {
38
33
  '607': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
39
34
  '608': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
40
35
  '609': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
41
- '610': {'gbd': 'Ended', 'office': 'Dead/Refused/Dismissed'},
36
+ '610': {'gbd': 'Ended', 'office': 'Dead'},
42
37
  '612': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
43
38
  '614': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
39
+ '618': {'gbd': 'Ended', 'office': 'Dead/Abandoned'},
40
+ '632': {'gbd': 'Ended', 'office': 'Dead'},
41
+
44
42
  '709': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
45
43
  '710': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
46
44
  '711': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
47
45
  '712': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
48
46
  '713': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
49
47
  '714': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
50
- '781': {'gbd': 'Ended', 'office': 'Cancelled/Invalidated'},
51
- '782': {'gbd': 'Ended', 'office': 'Cancelled/Invalidated'},
48
+ '781': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
49
+ '782': {'gbd': 'Ended', 'office': 'Dead/Cancelled'},
52
50
 
53
51
  '700': {'gbd': 'Registered', 'office': 'Live/Registered'},
54
52
  '701': {'gbd': 'Registered', 'office': 'Live/Registered'},
@@ -59,9 +57,10 @@ status_map = {
59
57
  '706': {'gbd': 'Registered', 'office': 'Live/Registered'},
60
58
  '707': {'gbd': 'Registered', 'office': 'Live/Registered'},
61
59
  '708': {'gbd': 'Registered', 'office': 'Live/Registered'},
60
+ '717': {'gbd': 'Registered', 'office': 'Live'},
62
61
  '624': {'gbd': 'Registered', 'office': 'Live/Registered'},
63
62
  '625': {'gbd': 'Registered', 'office': 'Live/Registered'},
64
- '413': {'gbd': 'Registered', 'office': 'Live/Registered'},
63
+
65
64
  '778': {'gbd': 'Registered', 'office': 'Live/Registered'},
66
65
  '780': {'gbd': 'Registered', 'office': 'Live/Registered'},
67
66
  '790': {'gbd': 'Registered', 'office': 'Live/Registered'},
@@ -69,6 +68,8 @@ status_map = {
69
68
  '800': {'gbd': 'Registered', 'office': 'Live/Registered'},
70
69
 
71
70
  '410': {'gbd': 'Pending', 'office': 'Live/Pending'},
71
+ '413': {'gbd': 'Pending', 'office': 'Live/Pending'},
72
+
72
73
  '616': {'gbd': 'Pending', 'office': 'Live/Pending'},
73
74
  '620': {'gbd': 'Pending', 'office': 'Live/Pending'},
74
75
  '630': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -113,6 +114,7 @@ status_map = {
113
114
  '692': {'gbd': 'Pending', 'office': 'Live/Pending'},
114
115
  '693': {'gbd': 'Pending', 'office': 'Live/Pending'},
115
116
  '694': {'gbd': 'Pending', 'office': 'Live/Pending'},
117
+
116
118
  '718': {'gbd': 'Pending', 'office': 'Live/Pending'},
117
119
  '719': {'gbd': 'Pending', 'office': 'Live/Pending'},
118
120
  '720': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -125,7 +127,8 @@ status_map = {
125
127
  '732': {'gbd': 'Pending', 'office': 'Live/Pending'},
126
128
  '733': {'gbd': 'Pending', 'office': 'Live/Pending'},
127
129
  '734': {'gbd': 'Pending', 'office': 'Live/Pending'},
128
- # '740': {'gbd': 'Pending', 'office': ''},
130
+
131
+ '740': {'gbd': 'Pending', 'office': 'Live/Pending'},
129
132
  '744': {'gbd': 'Pending', 'office': 'Live/Pending'},
130
133
  '745': {'gbd': 'Pending', 'office': 'Live/Pending'},
131
134
  '746': {'gbd': 'Pending', 'office': 'Live/Pending'},
@@ -172,6 +175,13 @@ status_map = {
172
175
  '823': {'gbd': 'Pending', 'office': 'Live/Pending'},
173
176
  '824': {'gbd': 'Pending', 'office': 'Live/Pending'},
174
177
  '825': {'gbd': 'Pending', 'office': 'Live/Pending'},
175
- '715': {'gbd': 'Pending', 'office': 'Live/Pending'},
176
- '973': {'gbd': 'Unknown', 'office': 'Suspended Pending Administrative Review'},
178
+
179
+ '715': {'gbd': 'Pending', 'office': 'Indifferent/Cancelled'},
180
+
181
+ '900': {'gbd': 'Expired', 'office': 'Dead/Expired'},
182
+ '901': {'gbd': 'Ended', 'office': 'Dead'},
183
+ '968': {'gbd': 'Ended', 'office': 'Dead'},
184
+ '969': {'gbd': 'Pending', 'office': 'Live/Pending'},
185
+ '973': {'gbd': 'Unknown', 'office': 'Suspended Pending Administrative Review'}
186
+
177
187
  }
@@ -4,14 +4,16 @@ from . import status_map
4
4
  # namespaces defined in XML and to be ignored in procecssing
5
5
  ignore_namespace = []
6
6
 
7
-
8
- # -------------------------------------------------------------
9
- # data translation helpers:
10
- # translate values from office interpretation to gbd equivalent
11
- # -------------------------------------------------------------
7
+ # WARNING: pypers is making a transformation of the original USPTO XML
8
+ # into a "compressed" format that changes in particula the names of tags
9
+ # for example <mark-drawing-code> becomes <drawCode>, so
10
+ # the USPTO documentation has to be "translated" to this weirdo intermediary
11
+ # format (why doing simple and readable? :)
12
+ # to see this "pypers" mapping:
13
+ # https://git.wipo.int/projects/BDDS/repos/gbd_etl_pypers/browse/pypers/steps/fetch/extract/us/ustm-tags.xml
12
14
 
13
15
  def translate_kind(flags):
14
- is_tradmark = flags[2] == '1'
16
+ is_trademark = flags[2] == '1'
15
17
  is_collective = flags[3] == '1'
16
18
  is_service = flags[4] == '1'
17
19
  is_service_collective = flags[5] == '1'
@@ -19,21 +21,24 @@ def translate_kind(flags):
19
21
  is_certificate = flags[7] == '1'
20
22
 
21
23
  kind = []
22
- if is_tradmark : kind = [ 'Individual' ]
24
+ if is_trademark : kind = [ 'Individual' ]
23
25
  if is_collective : kind = [ 'Collective' ]
24
26
  if is_service : kind = [ 'Individual' ]
25
27
  if is_service_collective: kind = [ 'Collective' ]
26
28
  if is_membership_collective : kind = [ 'Membership', 'Collective' ]
27
29
  if is_certificate : kind = [ 'Certificate' ]
28
30
 
29
- if len(kind): return kind
30
- else: return ['Other']
31
+ if len(kind):
32
+ return kind
33
+ else:
34
+ return ['Other']
31
35
 
32
36
  def translate_status(status):
33
37
  """translation of mark status"""
34
38
  # a required data from office. if not present and no way to guess,
35
39
  # return Unknown
36
- if not status: return 'Unknown'
40
+ if not status:
41
+ return 'Unknown'
37
42
 
38
43
  try:
39
44
  return status_map[status]
@@ -41,23 +46,26 @@ def translate_status(status):
41
46
  return ['Unknown']
42
47
  #raise Exception('Status "%s" unmapped' % status)
43
48
 
44
-
45
49
  def translate_feature(drawcode):
46
50
  if not drawcode: return 'Undefined'
47
51
 
48
52
  code = drawcode [0]
53
+ # PL: '0' means "Mark drawing code not yet assigned"
49
54
  if code == '1': return 'Word' #1000
50
55
  if code == '2': return 'Figurative'
51
56
  if code == '3': return 'Combined'
52
57
  if code == '4': return 'Word' #4000
53
58
  if code == '5': return 'Stylized characters'
54
- if code == '6': return 'Olfactory' #6000
59
+ # PL: the code '6'' was incorrectly mapped to 'Olfactory',
60
+ # Official documentation: '6' means "Where no drawing is possible, such as for sound", so it means "other".
61
+ # Unfortunately until June 2025, everything was mapped to 'Olfactory', so sound or 3D trademarks are all
62
+ # 'Olfactory' in GBD until this date
63
+ if code == '6': return 'Other' #6000
55
64
 
56
65
  return ['Other']
66
+ # note: documentation explains that mark-drawing-code is optional, so we don't want to raise an exception here
57
67
  #raise Exception('DrawCode "%s" unmapped' % drawcode)
58
68
 
59
- ##-----------------
60
-
61
69
  def get_img_class(dessearches):
62
70
  if not dessearches: return None
63
71
  if not isinstance(dessearches, list):
@@ -1,3 +1,11 @@
1
+ # WARNING: pypers is making a transformation of the original USPTO XML
2
+ # into a "compressed" format that change the names of tags
3
+ # for example <mark-drawing-code> becomes <drawCode>, so
4
+ # the USPTO documentation has to be "translated" to this weirdo intermediary
5
+ # format (why doing simple and readable? :)
6
+ # to see this "pypers" mapping:
7
+ # https://git.wipo.int/projects/BDDS/repos/gbd_etl_pypers/browse/pypers/steps/fetch/extract/us/ustm-tags.xml
8
+
1
9
  {% from 'navigation.tmpl' import match %}
2
10
 
3
11
  {% set flags = file.head._flags %}