diff --git a/.gitignore b/.gitignore index 9858ca6..dd15ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ celerybeat-schedule .env # virtualenv +.venv venv/ ENV/ diff --git a/cromulent/data/vocab_classes.json b/cromulent/data/vocab_classes.json index 1e77d47..cd8c2d4 100644 --- a/cromulent/data/vocab_classes.json +++ b/cromulent/data/vocab_classes.json @@ -216,26 +216,30 @@ "ArchiveSet": {"parent": "Set", "id":"300375748", "label": "Archive", "req": "recommend"}, "ArchiveGroupSet": {"parent": "Set", "id":"300404022", "label": "Archival Grouping", "req": "recommend"}, "ArchiveSubGroupSet": {"parent": "Set", "id":"300404023", "label": "Archival SubGrouping", "req": "recommend"}, - - "PrimaryName": {"parent": "Name", "id":"300404670", "label": "Primary Name", "req": "required"}, - "AlternateName": {"parent": "Name", "id":"300264273", "label":"Alternate Name", "req": "recommend"}, - "SortName": {"parent": "Name", "id":"300451544", "label": "Sorting Name", "req": "required"}, - "Title": {"parent": "Name", "id":"300195168", "label": "Title"}, - "Subtitle": {"parent": "Name", "id":"300312006", "label":"Subtitle"}, - "DisplayName": {"parent": "Name", "id": "300404669", "label": "Display Title", "req": "required"}, - "TranslatedTitle": {"parent": "Name", "id":"300417194", "label": "Translated Title"}, - "PersonalName": {"parent": "Name", "id":"300266386", "label": "Personal Name"}, - "AliasName": {"parent": "Name", "id": "300404664", "label": "Alias"}, - "Pseudonym": {"parent": "Name", "id": "300404657", "label": "Psueudonym"}, - "MaidenName": {"parent": "Name", "id": "300404682", "label": "Maiden Name"}, - "FormerName": {"parent": "Name", "id": "300435719", "label": "Former Name"}, - "GivenName": {"parent": "Name", "id":"300404651", "label": "Given Name", "req": "recommend"}, - "FamilyName": {"parent": "Name", "id":"300404652", "label": "Family Name", "req": "recommend"}, - "MiddleName": {"parent": "Name", "id":"300404654", "label": "Middle Name", "req": "recommend"}, - "NameSuffix": {"parent": "Name", "id":"300404662", "label": "Name Suffix", "req": "recommend"}, - "NamePrefix": {"parent": "Name", "id":"300404845", "label": "Name Prefix", "req": "recommend"}, - "CityName": {"parent": "Name", "id": "300008389", "label": "City"}, - "CountryName": {"parent": "Name", "id": "300128207", "label": "Country"}, + + "AliasName": {"parent": "Name", "id": "300404664", "label": "Alias"}, + "AlternateName": {"parent": "Name", "id": "300264273", "label": "Alternate Name","req": "recommend"}, + "CityName": {"parent": "Name", "id": "300008389", "label": "City"}, + "CountryName": {"parent": "Name", "id": "300128207", "label": "Country"}, + "DisplayName": {"parent": "Name", "id": "300404669", "label": "Display Title", "req": "required"}, + "FamilyName": {"parent": "Name", "id": "300404652", "label": "Family Name", "req": "recommend"}, + "FormerName": {"parent": "Name", "id": "300435719", "label": "Former Name"}, + "FullName": {"parent": "Name", "id": "300404688", "label": "Full Name"}, + "GivenName": {"parent": "Name", "id": "300404651", "label": "Given Name", "req": "recommend"}, + "MaidenName": {"parent": "Name", "id": "300404682", "label": "Maiden Name"}, + "MarriedName": {"parent": "Name", "id": "300404683", "label": "Married Name"}, + "MiddleName": {"parent": "Name", "id": "300404654", "label": "Middle Name", "req": "recommend"}, + "NamePrefix": {"parent": "Name", "id": "300404845", "label": "Name Prefix", "req": "recommend"}, + "NameSuffix": {"parent": "Name", "id": "300404662", "label": "Name Suffix", "req": "recommend"}, + "Nickname": {"parent": "Name", "id": "300404656", "label": "Nickname/Pseudonym"}, + "OriginalName": {"parent": "Name", "id": "300417204", "label": "Original Name"}, + "PersonalName": {"parent": "Name", "id": "300266386", "label": "Personal Name"}, + "PrimaryName": {"parent": "Name", "id": "300404670", "label": "Primary Name", "req": "required"}, + "Pseudonym": {"parent": "Name", "id": "300404657", "label": "Psueudonym"}, + "SortName": {"parent": "Name", "id": "300451544", "label": "Sorting Name", "req": "required"}, + "Subtitle": {"parent": "Name", "id": "300312006", "label": "Subtitle"}, + "Title": {"parent": "Name", "id": "300195168", "label": "Title"}, + "TranslatedTitle": {"parent": "Name", "id": "300417194", "label": "Translated Title"}, "Building": {"parent": "HumanMadeObject", "id": "300004792", "label":"Building"}, diff --git a/cromulent/data/vocab_instances.json b/cromulent/data/vocab_instances.json index d6e9b0f..2b1cd12 100644 --- a/cromulent/data/vocab_instances.json +++ b/cromulent/data/vocab_instances.json @@ -41,6 +41,7 @@ "kilograms": {"parent": "MeasurementUnit", "id": "300379226", "label": "kilograms", "req": "recommend"}, "ounces":{"parent": "MeasurementUnit", "id": "300379229", "label": "ounces"}, "pounds": {"parent": "MeasurementUnit", "id": "300379254", "label": "pounds", "req": "recommend"}, + "tons": {"parent": "MeasurementUnit", "id": "300379228", "label": "tons"}, "seconds": {"parent": "MeasurementUnit", "id": "300379239", "label": "seconds", "req": "recommend"}, "minutes": {"parent": "MeasurementUnit", "id": "300379240", "label": "minutes", "req": "recommend"}, "hours": {"parent": "MeasurementUnit", "id": "300379241", "label": "hours", "req": "recommend"}, @@ -204,12 +205,14 @@ "austrian nationality": {"parent": "Nationality", "id": "300111153", "label": "Austrian", "req": "recommend"}, "australian nationality": {"parent": "Nationality", "id": "300021861", "label": "Australian", "req": "recommend"}, "belgian nationality": {"parent": "Nationality", "id": "300111156", "label": "Belgian", "req": "recommend"}, + "bohemian nationality": {"parent": "Nationality", "id": "300266148", "label": "Bohemian", "req": "recommend"}, "british nationality": {"parent": "Nationality", "id": "300111159", "label": "British", "req": "recommend"}, "canadian nationality": {"parent": "Nationality", "id": "300107962", "label": "Canadian", "req": "recommend"}, "chinese nationality": {"parent": "Nationality", "id": "300018322", "label": "Chinese", "req": "recommend"}, "czech nationality": {"parent": "Nationality", "id": "300111166", "label": "Czech", "req": "recommend"}, "danish nationality": {"parent": "Nationality", "id": "300111172", "label": "Danish", "req": "recommend"}, "dutch nationality": {"parent": "Nationality", "id": "300111175", "label": "Dutch", "req": "recommend"}, + "english nationality": {"parent": "Nationality", "id": "300111178", "label": "English", "req": "recommend"}, "egyptian nationality": {"parent": "Nationality", "id": "300020251", "label": "Egyptian", "req": "recommend"}, "flemish nationality": {"parent": "Nationality", "id": "300111184", "label": "Flemish", "req": "recommend"}, "french nationality": {"parent": "Nationality", "id": "300111188", "label": "French", "req": "recommend"}, @@ -220,7 +223,9 @@ "irish nationality": {"parent": "Nationality", "id": "300111259", "label": "Irish", "req": "recommend"}, "italian nationality": {"parent": "Nationality", "id": "300111198", "label": "Italian", "req": "recommend"}, "japanese nationality": {"parent": "Nationality", "id": "300018519", "label": "Japanese", "req": "recommend"}, + "liechtenstein nationality": {"parent": "Nationality", "id": "300386388", "label": "Liechtenstein", "req": "recommend"}, "mexican nationality": {"parent": "Nationality", "id": "300107963", "label": "Mexican", "req": "recommend"}, + "netherlandish": {"parent": "Nationality", "id": "300020929", "label": "Netherlandish", "req": "recommend"}, "new zealand nationality": {"parent": "Nationality", "id": "300021959", "label": "New Zealander", "req": "recommend"}, "norwegian nationality": {"parent": "Nationality", "id": "300111201", "label": "Norwegian", "req": "recommend"}, "polish nationality": {"parent": "Nationality", "id": "300111204", "label": "Polish", "req": "recommend"},