From 2cafc0810b5d19722b9cce6913da5d957b9ad597 Mon Sep 17 00:00:00 2001 From: likp Date: Fri, 13 Jun 2025 11:28:09 +0200 Subject: [PATCH 1/2] Added `subjec-code` to the index and also to the ouput. --- Px.Search.Lucene/LuceneIndex.cs | 1 + Px.Search.Lucene/LuceneSearcher.cs | 3 +- Px.Search.Lucene/SearchConstants.cs | 1 + Px.Search/Indexer.cs | 1 + Px.Search/SearchResult.cs | 3 +- Px.Search/TableInformation.cs | 1 + PxWeb/Mappers/TableResponseMapper.cs | 3 +- PxWeb/Mappers/TablesResponseMapper.cs | 3 +- PxWeb/PxWeb.csproj | 2 +- .../ExpectedJson/ListAllTables.json | 461 +++++++++--------- .../ExpectedJson/TableById_tab004.json | 90 ++-- 11 files changed, 275 insertions(+), 294 deletions(-) diff --git a/Px.Search.Lucene/LuceneIndex.cs b/Px.Search.Lucene/LuceneIndex.cs index 7a72fed4..b9750ca8 100644 --- a/Px.Search.Lucene/LuceneIndex.cs +++ b/Px.Search.Lucene/LuceneIndex.cs @@ -209,6 +209,7 @@ private Document GetDocument(TableInformation tbl, PXMeta meta) doc.Add(new TextField(SearchConstants.SEARCH_FIELD_TAGS, GetAllTags(tbl.Tags), Field.Store.YES)); doc.Add(new TextField(SearchConstants.SEARCH_FIELD_SOURCE, tbl.Source, Field.Store.YES)); doc.Add(new TextField(SearchConstants.SEARCH_FIELD_TIME_UNIT, tbl.TimeUnit, Field.Store.YES)); + doc.Add(new TextField(SearchConstants.SEARCH_SUBJECT_CODE, tbl.SubjectCode, Field.Store.YES)); doc.Add(new StoredField(SearchConstants.SEARCH_FIELD_PATHS, GetBytes(tbl.Paths))); if (!string.IsNullOrEmpty(meta.Synonyms)) { diff --git a/Px.Search.Lucene/LuceneSearcher.cs b/Px.Search.Lucene/LuceneSearcher.cs index 215aa0b3..d8336c4c 100644 --- a/Px.Search.Lucene/LuceneSearcher.cs +++ b/Px.Search.Lucene/LuceneSearcher.cs @@ -145,7 +145,8 @@ private static SearchResult GetSearchResult(Document doc) doc.Get(SearchConstants.SEARCH_FIELD_LASTPERIOD), doc.Get(SearchConstants.SEARCH_FIELD_VARIABLES).Split("|"), doc.Get(SearchConstants.SEARCH_FIELD_SOURCE), - doc.Get(SearchConstants.SEARCH_FIELD_TIME_UNIT) + doc.Get(SearchConstants.SEARCH_FIELD_TIME_UNIT), + doc.Get(SearchConstants.SEARCH_SUBJECT_CODE) ); searchResult.Description = doc.Get(SearchConstants.SEARCH_FIELD_DESCRIPTION); diff --git a/Px.Search.Lucene/SearchConstants.cs b/Px.Search.Lucene/SearchConstants.cs index 1532e456..40f56c6f 100644 --- a/Px.Search.Lucene/SearchConstants.cs +++ b/Px.Search.Lucene/SearchConstants.cs @@ -27,5 +27,6 @@ public class SearchConstants public const string SEARCH_FIELD_SOURCE = "source"; public const string SEARCH_FIELD_TIME_UNIT = "timeunit"; public const string SEARCH_FIELD_PATHS = "paths"; + public const string SEARCH_SUBJECT_CODE = "subjectcode"; } } diff --git a/Px.Search/Indexer.cs b/Px.Search/Indexer.cs index 9c0c0915..0095e24d 100644 --- a/Px.Search/Indexer.cs +++ b/Px.Search/Indexer.cs @@ -276,6 +276,7 @@ private TableInformation GetTableInformation(string id, TableLink tblLink, PXMet tbl.SortCode = tblLink.SortCode; tbl.Updated = tblLink.LastUpdated; tbl.Discontinued = null; // TODO: Implement later + tbl.SubjectCode = meta.SubjectCode ?? string.Empty; return tbl; } diff --git a/Px.Search/SearchResult.cs b/Px.Search/SearchResult.cs index 059f9589..0f5a1a07 100644 --- a/Px.Search/SearchResult.cs +++ b/Px.Search/SearchResult.cs @@ -5,11 +5,12 @@ /// public class SearchResult : TableInformation { - public SearchResult(string id, string label, string category, string firstPeriod, string lastPeriod, string[] variableNames, string source, string timeUnit) + public SearchResult(string id, string label, string category, string firstPeriod, string lastPeriod, string[] variableNames, string source, string timeUnit, string subjectCode) : base(id, label, category, firstPeriod, lastPeriod, variableNames) { Source = source; TimeUnit = timeUnit; + SubjectCode = subjectCode; } public float Score { get; set; } diff --git a/Px.Search/TableInformation.cs b/Px.Search/TableInformation.cs index 17da91f3..7e8ef623 100644 --- a/Px.Search/TableInformation.cs +++ b/Px.Search/TableInformation.cs @@ -30,5 +30,6 @@ public TableInformation(string id, string label, string category, string firstPe public List Paths { get; set; } public string Source { get; set; } public string TimeUnit { get; set; } + public string SubjectCode { get; set; } = string.Empty; } } diff --git a/PxWeb/Mappers/TableResponseMapper.cs b/PxWeb/Mappers/TableResponseMapper.cs index 11a78579..4d63a89f 100644 --- a/PxWeb/Mappers/TableResponseMapper.cs +++ b/PxWeb/Mappers/TableResponseMapper.cs @@ -52,7 +52,8 @@ public TableResponse Map(SearchResult searchResult, string lang) VariableNames = searchResult.VariableNames.ToList(), Links = linkList, Language = lang, - SortCode = searchResult.SortCode ?? string.Empty + SortCode = searchResult.SortCode ?? string.Empty, + SubjectCode = searchResult.SubjectCode ?? string.Empty }; return tableResponse; diff --git a/PxWeb/Mappers/TablesResponseMapper.cs b/PxWeb/Mappers/TablesResponseMapper.cs index 38299cc4..44f7f533 100644 --- a/PxWeb/Mappers/TablesResponseMapper.cs +++ b/PxWeb/Mappers/TablesResponseMapper.cs @@ -89,7 +89,8 @@ public TablesResponse Map(SearchResultContainer searchResultContainer, string la Category = EnumConverter.ToCategoryEnum(item.Category), Discontinued = item.Discontinued, VariableNames = item.VariableNames.ToList(), - Links = linkList + Links = linkList, + SubjectCode = item.SubjectCode ?? string.Empty, }; tableList.Add(tb); } diff --git a/PxWeb/PxWeb.csproj b/PxWeb/PxWeb.csproj index 75686a76..62ccf39f 100644 --- a/PxWeb/PxWeb.csproj +++ b/PxWeb/PxWeb.csproj @@ -49,7 +49,7 @@ - + diff --git a/PxWebApi_Mvc.Tests/ExpectedJson/ListAllTables.json b/PxWebApi_Mvc.Tests/ExpectedJson/ListAllTables.json index 07bc5ed9..b60d94a7 100644 --- a/PxWebApi_Mvc.Tests/ExpectedJson/ListAllTables.json +++ b/PxWebApi_Mvc.Tests/ExpectedJson/ListAllTables.json @@ -1,257 +1,234 @@ { - "language": "en", - "tables": [ + "language": "en", + "tables": [ + { + "type": "Table", + "id": "TAB004", + "label": "Total air emissions by sector, greenhouse gas, contents and year", + "description": "", + "updated": "2023-05-25T13:42:00Z", + "firstPeriod": "1990", + "lastPeriod": "2017", + "category": "public", + "variableNames": [ "sector", "greenhouse gas", "contents", "year" ], + "source": "Statistics Sweden", + "subjectCode": "EN", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "EN", + "label": "Environment" + }, + { + "id": "EN02", + "label": "Miscellaneous" + } + ] + ], + "links": [ { - "type": "Table", - "id": "TAB004", - "label": "Total air emissions by sector, greenhouse gas, contents and year", - "description": "", - "updated": "2023-05-25T13:42:00Z", - "firstPeriod": "1990", - "lastPeriod": "2017", - "category": "public", - "variableNames": [ - "sector", - "greenhouse gas", - "contents", - "year" - ], - "source": "Statistics Sweden", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "EN", - "label": "Environment" - }, - { - "id": "EN02", - "label": "Miscellaneous" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004/data?lang=en&outputFormat=px" - } - ] + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004?lang=en" }, { - "type": "Table", - "id": "TAB005", - "label": "Land use in Sweden, hectares by region, land use, contents and year", - "description": "", - "updated": "2023-08-31T13:42:00Z", - "firstPeriod": "2010", - "lastPeriod": "2015", - "category": "public", - "variableNames": [ - "region", - "land use", - "contents", - "year" - ], - "source": "Statistics Sweden", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "EN", - "label": "Environment" - }, - { - "id": "EN02", - "label": "Miscellaneous" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB005?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB005/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB005/data?lang=en&outputFormat=px" - } - ] + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004/metadata?lang=en" }, { - "type": "Table", - "id": "TAB003", - "label": "Disposal facilities by treatment category, waste category, contents and year", - "description": "", - "updated": "2023-05-25T14:13:00Z", - "firstPeriod": "2010", - "lastPeriod": "2016", - "category": "public", - "variableNames": [ - "treatment category", - "waste category", - "contents", - "year" - ], - "source": "Statistics Sweden", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "EN", - "label": "Environment" - }, - { - "id": "EN01", - "label": "Waste" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB003?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB003/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB003/data?lang=en&outputFormat=px" - } - ] + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004/data?lang=en&outputFormat=px" + } + ] + }, + { + "type": "Table", + "id": "TAB005", + "label": "Land use in Sweden, hectares by region, land use, contents and year", + "description": "", + "updated": "2023-08-31T13:42:00Z", + "firstPeriod": "2010", + "lastPeriod": "2015", + "category": "public", + "variableNames": [ "region", "land use", "contents", "year" ], + "source": "Statistics Sweden", + "subjectCode": "EN", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "EN", + "label": "Environment" + }, + { + "id": "EN02", + "label": "Miscellaneous" + } + ] + ], + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB005?lang=en" }, { - "type": "Table", - "id": "TAB001", - "label": "Population by region, sex, age, contents and year", - "description": "", - "updated": "2023-05-25T13:42:00Z", - "firstPeriod": "1981", - "lastPeriod": "2001", - "category": "public", - "variableNames": [ - "region", - "sex", - "age", - "contents", - "year" - ], - "source": "Eurostat", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "PO", - "label": "Population" - }, - { - "id": "PO01", - "label": "Population census" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB001?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB001/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB001/data?lang=en&outputFormat=px" - } - ] + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB005/metadata?lang=en" }, { - "type": "Table", - "id": "TAB002", - "label": "Population by region, sex, age, citizenship, contents and year", - "description": "", - "updated": "2023-05-25T13:42:00Z", - "firstPeriod": "1991", - "lastPeriod": "2001", - "category": "public", - "variableNames": [ - "region", - "sex", - "age", - "citizenship", - "contents", - "year" - ], - "source": "Eurostat", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "PO", - "label": "Population" - }, - { - "id": "PO01", - "label": "Population census" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB002?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB002/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB002/data?lang=en&outputFormat=px" - } - ] + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB005/data?lang=en&outputFormat=px" } - ], - "page": { - "pageNumber": 1, - "pageSize": 20, - "totalElements": 5, - "totalPages": 1, - "links": [] + ] }, - "links": [ + { + "type": "Table", + "id": "TAB003", + "label": "Disposal facilities by treatment category, waste category, contents and year", + "description": "", + "updated": "2023-05-25T14:13:00Z", + "firstPeriod": "2010", + "lastPeriod": "2016", + "category": "public", + "variableNames": [ "treatment category", "waste category", "contents", "year" ], + "source": "Statistics Sweden", + "subjectCode": "EN", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "EN", + "label": "Environment" + }, + { + "id": "EN01", + "label": "Waste" + } + ] + ], + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB003?lang=en" + }, + { + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB003/metadata?lang=en" + }, + { + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB003/data?lang=en&outputFormat=px" + } + ] + }, + { + "type": "Table", + "id": "TAB001", + "label": "Population by region, sex, age, contents and year", + "description": "", + "updated": "2023-05-25T13:42:00Z", + "firstPeriod": "1981", + "lastPeriod": "2001", + "category": "public", + "variableNames": [ "region", "sex", "age", "contents", "year" ], + "source": "Eurostat", + "subjectCode": "PO", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "PO", + "label": "Population" + }, + { + "id": "PO01", + "label": "Population census" + } + ] + ], + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB001?lang=en" + }, + { + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB001/metadata?lang=en" + }, + { + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB001/data?lang=en&outputFormat=px" + } + ] + }, + { + "type": "Table", + "id": "TAB002", + "label": "Population by region, sex, age, citizenship, contents and year", + "description": "", + "updated": "2023-05-25T13:42:00Z", + "firstPeriod": "1991", + "lastPeriod": "2001", + "category": "public", + "variableNames": [ "region", "sex", "age", "citizenship", "contents", "year" ], + "source": "Eurostat", + "subjectCode": "PO", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "PO", + "label": "Population" + }, + { + "id": "PO01", + "label": "Population census" + } + ] + ], + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB002?lang=en" + }, + { + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB002/metadata?lang=en" + }, { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/?lang=en&pagesize=20&pageNumber=1" + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB002/data?lang=en&outputFormat=px" } - ] + ] + } + ], + "page": { + "pageNumber": 1, + "pageSize": 20, + "totalElements": 5, + "totalPages": 1, + "links": [] + }, + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/?lang=en&pagesize=20&pageNumber=1" + } + ] } \ No newline at end of file diff --git a/PxWebApi_Mvc.Tests/ExpectedJson/TableById_tab004.json b/PxWebApi_Mvc.Tests/ExpectedJson/TableById_tab004.json index 70857abb..e20835ff 100644 --- a/PxWebApi_Mvc.Tests/ExpectedJson/TableById_tab004.json +++ b/PxWebApi_Mvc.Tests/ExpectedJson/TableById_tab004.json @@ -1,49 +1,45 @@ { - "type": "Table", - "id": "TAB004", - "label": "Total air emissions by sector, greenhouse gas, contents and year", - "description": "", - "sortCode": "TAB004", - "updated": "2023-05-25T13:42:00Z", - "firstPeriod": "1990", - "lastPeriod": "2017", - "category": "public", - "variableNames": [ - "sector", - "greenhouse gas", - "contents", - "year" - ], - "source": "Statistics Sweden", - "timeUnit": "Annual", - "paths": [ - [ - { - "id": "EN", - "label": "Environment" - }, - { - "id": "EN02", - "label": "Miscellaneous" - } - ] - ], - "links": [ - { - "rel": "self", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004?lang=en" - }, - { - "rel": "metadata", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004/metadata?lang=en" - }, - { - "rel": "data", - "hreflang": "en", - "href": "https://www.pxapi.com/api/v2/tables/TAB004/data?lang=en&outputFormat=px" - } - ], - "language": "en" + "type": "Table", + "id": "TAB004", + "label": "Total air emissions by sector, greenhouse gas, contents and year", + "description": "", + "sortCode": "TAB004", + "updated": "2023-05-25T13:42:00Z", + "firstPeriod": "1990", + "lastPeriod": "2017", + "category": "public", + "variableNames": [ "sector", "greenhouse gas", "contents", "year" ], + "source": "Statistics Sweden", + "subjectCode": "EN", + "timeUnit": "Annual", + "paths": [ + [ + { + "id": "EN", + "label": "Environment" + }, + { + "id": "EN02", + "label": "Miscellaneous" + } + ] + ], + "links": [ + { + "rel": "self", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004?lang=en" + }, + { + "rel": "metadata", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004/metadata?lang=en" + }, + { + "rel": "data", + "hreflang": "en", + "href": "https://www.pxapi.com/api/v2/tables/TAB004/data?lang=en&outputFormat=px" + } + ], + "language": "en" } \ No newline at end of file From eb96798acab645d741ca508af355288e8864c77e Mon Sep 17 00:00:00 2001 From: likp Date: Fri, 13 Jun 2025 11:28:31 +0200 Subject: [PATCH 2/2] Regenerated the search index for the demo database --- PxWeb/wwwroot/Database/_INDEX/en/_8.cfe | Bin 284 -> 0 bytes PxWeb/wwwroot/Database/_INDEX/en/_a.cfe | Bin 0 -> 284 bytes .../Database/_INDEX/en/{_8.cfs => _a.cfs} | Bin 17726 -> 17917 bytes .../Database/_INDEX/{sv/_8.si => en/_a.si} | Bin 252 -> 252 bytes PxWeb/wwwroot/Database/_INDEX/en/segments.gen | Bin 36 -> 36 bytes PxWeb/wwwroot/Database/_INDEX/en/segments_9 | Bin 89 -> 0 bytes PxWeb/wwwroot/Database/_INDEX/en/segments_b | Bin 0 -> 89 bytes PxWeb/wwwroot/Database/_INDEX/sv/_8.cfe | Bin 284 -> 0 bytes PxWeb/wwwroot/Database/_INDEX/sv/_a.cfe | Bin 0 -> 284 bytes .../Database/_INDEX/sv/{_8.cfs => _a.cfs} | Bin 17917 -> 18095 bytes .../Database/_INDEX/{en/_8.si => sv/_a.si} | Bin 252 -> 252 bytes PxWeb/wwwroot/Database/_INDEX/sv/segments.gen | Bin 36 -> 36 bytes PxWeb/wwwroot/Database/_INDEX/sv/segments_9 | Bin 89 -> 0 bytes PxWeb/wwwroot/Database/_INDEX/sv/segments_b | Bin 0 -> 89 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 PxWeb/wwwroot/Database/_INDEX/en/_8.cfe create mode 100644 PxWeb/wwwroot/Database/_INDEX/en/_a.cfe rename PxWeb/wwwroot/Database/_INDEX/en/{_8.cfs => _a.cfs} (75%) rename PxWeb/wwwroot/Database/_INDEX/{sv/_8.si => en/_a.si} (51%) delete mode 100644 PxWeb/wwwroot/Database/_INDEX/en/segments_9 create mode 100644 PxWeb/wwwroot/Database/_INDEX/en/segments_b delete mode 100644 PxWeb/wwwroot/Database/_INDEX/sv/_8.cfe create mode 100644 PxWeb/wwwroot/Database/_INDEX/sv/_a.cfe rename PxWeb/wwwroot/Database/_INDEX/sv/{_8.cfs => _a.cfs} (79%) rename PxWeb/wwwroot/Database/_INDEX/{en/_8.si => sv/_a.si} (51%) delete mode 100644 PxWeb/wwwroot/Database/_INDEX/sv/segments_9 create mode 100644 PxWeb/wwwroot/Database/_INDEX/sv/segments_b diff --git a/PxWeb/wwwroot/Database/_INDEX/en/_8.cfe b/PxWeb/wwwroot/Database/_INDEX/en/_8.cfe deleted file mode 100644 index 6e3085b78879706d12db9b2dd9b8b1345c1fa0fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmcD&o+B>loS$2eUz(TVmYI_pUX)pqTI8BnQk0om%)r3F$jPFYmQn#^fq*=OVz37Z zmOwdi5SnQof4om=a%x_xiDA5fUP^v4RQwN=Wk diff --git a/PxWeb/wwwroot/Database/_INDEX/en/_a.cfe b/PxWeb/wwwroot/Database/_INDEX/en/_a.cfe new file mode 100644 index 0000000000000000000000000000000000000000..3bc22f180868e1ca35180240dffbb2f3221142e8 GIT binary patch literal 284 zcmcD&o+B>loS$2eUz(TVmYI_pUX)pqTI8BnQk0om%)r3F$jPFYmQn#^fq*=OVz37Z zmOwdi5SnQ@f4om=a%x_xiDA5fUP^v4M4XuwD$kB0Uyu(n9tc=@AT;|z6#0_OT!=W& zS_rLMg(hDB5w}u@&`fJs^zzD5ARL>^5Sn2!NDyk0Z5l+7Q3~k%JgA^u14NKL_khOa N7f@XcFTZU*1OUc6HRAvP literal 0 HcmV?d00001 diff --git a/PxWeb/wwwroot/Database/_INDEX/en/_8.cfs b/PxWeb/wwwroot/Database/_INDEX/en/_a.cfs similarity index 75% rename from PxWeb/wwwroot/Database/_INDEX/en/_8.cfs rename to PxWeb/wwwroot/Database/_INDEX/en/_a.cfs index 4791a1fe7b57728b690875e43904bf558ee73833..d2882f09ac3523ca4afb94d853a10a7f171d6803 100644 GIT binary patch delta 994 zcmYjQZ%kWN6u;-5_g?!Z8@1F|9#s110IOE%D=W}|fG{vPgqN_1OB}Idk5N|J+CGdf zl`T3=++Xk}k}&n#7GvU=eK7_U- z{hjl>=c|)&=M>BgIOq5!Kl`2Bw>y_cPt1<`?GEwWmHIzhS7*J<5@8BZq zhOQUAP!aY*q_s))LRVPn8L+}P$eGm$35BCsPwwsiDAY0Mo0n$dpyVRyOb_3jE1!zWEj~ef?O^}Wey5kw@ZK?;- z(X2J@BURbGq`Ug!C4Ch*v9O=Q|V;Jh#GrvL>pR!W7-C3(1yMz z!pFq^EVgJv!GDQRNA@dYdLlE3-Vg%U5>h%^Na*0}$`TO~7Gg&1sD)0%QVtL+Lk@67 z9N_e8L~wxcT(Rm&E#rIRz=6`{|2C@hb^aK4%L7wZYJHbgM#hLS2QM-=u5f^8GjCxT zaM#AOadVS<0{MHgnUC9#a9s7Z)eGi)*@)B0Z>M^Krji^IN`$}QQ-S?algACnvCq6o zIK^s}HC&-rO}_REz}xf_Gw&M*+go^71VUM=)n#_o^#i_*m(A1lLBRL%Z!_Pp8_>iV zQ}BNPxQKc4!lN4C68>XuJT?gUGp?EafoT!X(iL+#yc=;H3+%y29XMHYWO_iNc;h|b zd7g3-USiO&lcyAM{=DUbvJ)KUj?=G&Upby`+kv@NT3yA{txp+PC~Z>Dnts$QM6LiZ zmTHsf`FZwAoBIWNJcnc$?DoC)f}n5`U#%`~;pQzgWPUaU@WY%fBNGdP<#l{nF1jKA zCB|jT4evnWlFwD=)n?_w9ORQFiBj*_-=fdi+p-Vmz5C@~<>IJC=p* q4`ikePFkZimOP|O?4{12HPp5C z-ieU8?E^6i0WBvX0@E)BKWGr)kZ2$-e!!3{28{*W2Ldw15MQFa_(o*&7X8rY%X7~E z_vAUx%el7~X7<3FgZ2C6&w~60`QHLd@4Q!hK4^D2_6=N5-T0)qe;>5-Wv~KH@TZ_> z(g#aoK1g&$6(97(Sl{4xg#1lfGo!DOVu+3CX;Ulct-uTVa3(hzV%Z>ZHG{()YlbzE zuo7;DNK9?+BMsxd#N~kUBi=18P@Mf0O}9cB&nlh;Mu&aYdlTKd_cQS9C3q*=X zSTar`TX(WE#IZn*TP^Lf=tw5-1V>}U2@MG+)CW~!bAoMMc`CYUw7fDjRJoUnQ*ZsX z`kO3w$&H-hoVbThkiPwB(~F`;Zby-{ZU&RlBe!vfLuV@cW1D?Xu z;)_RAz%%%p@IUqp;3d2)@}UU_zD`TxW~?9a8s6kxi8gqU4<#mgB{yC<0D)GSQpDNA zAj?p*Tf+H8_}uorB-83zoWDw&d@}v-+l7u)_FBkx#>K-=oCA7zma~zUh1Bxs}$2?dph~H wRd<&zTIQ-GbGw#b=Tpfh@QCT;tgTAUYvzdI=3fr@8rr^Y#md-U4n=(b0&;N)=>Px# diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/_8.si b/PxWeb/wwwroot/Database/_INDEX/en/_a.si similarity index 51% rename from PxWeb/wwwroot/Database/_INDEX/sv/_8.si rename to PxWeb/wwwroot/Database/_INDEX/en/_a.si index 7e26381de3cd611319e14ddc4bd6356ab917ec21..27053264e0e390b921438261a09266302cd31136 100644 GIT binary patch delta 65 zcmeyv_=j=Ad`9z$3)D@`bPbIa3=OReEv*bJ7#J9s+2RxRlGBPIR4OZwSDbl3WAY22 L92iLD)pG*?W_b}8 delta 65 zcmeyv_=j=Ad`6Rr3)D@Gb&U)Z3@ogS4Xg|e7#J9s+2SqqlGBPIR4OZwSDbl3WAY22 L92gvZd0Z3#TTl`N diff --git a/PxWeb/wwwroot/Database/_INDEX/en/segments.gen b/PxWeb/wwwroot/Database/_INDEX/en/segments.gen index 077a451a0b9bc784efb32a5c6bb18ae328f247ac..aa62711b36159c000cc293096c97eb0b805c396a 100644 GIT binary patch literal 36 ccmezW|NmbG2;hd%2Q((XfU+54pL9n70J7i+ng9R* literal 36 ccmezW|NmbG2;hX#2Q((XfU+5u>lsS}0I;J6lK=n! diff --git a/PxWeb/wwwroot/Database/_INDEX/en/segments_9 b/PxWeb/wwwroot/Database/_INDEX/en/segments_9 deleted file mode 100644 index 77284b2d3008cdf2df93cc5eba6d6c0748cb4e2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmcD&o+HjtoSL4SnpaZHz`(!+#2_FI#GF9P$P{nE;ZvHNnwM%~_8$sB3Xs_#{sE22 NFF-U1gb7-y0RWzl8?XQX diff --git a/PxWeb/wwwroot/Database/_INDEX/en/segments_b b/PxWeb/wwwroot/Database/_INDEX/en/segments_b new file mode 100644 index 0000000000000000000000000000000000000000..adfcb5fcb47adf041b9e135f81cfc27587994366 GIT binary patch literal 89 zcmcD&o+HjtoSL4SnpaZHz`(!+#2}yu#N0s4$P}N*;ZvHNnwM%~_8$sB3Xs_#{sE22 NFF-U1C`;r#1OTa>9HIaK literal 0 HcmV?d00001 diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/_8.cfe b/PxWeb/wwwroot/Database/_INDEX/sv/_8.cfe deleted file mode 100644 index af8ef49883e7e80b1c525a555c8d3fc583e2302b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmcD&o+B>loS$2eUz(TVmYI_pUX)pqTI8BnQk0om%)r3F$jPFYmQn#^fq*=OVz37Z zmOwdi5SnQVf4om=a%x_xiDA5fUP^v4M4VX&LNmTWkuS&x84m<3{~$EGF^YUiW-dgW z#}Gp6iJ{3CK*X)wAvDu=7QMW(6bQ!#YA8b=NDyk0Z4X3}kss*%JgA`EY=|Ix&;gCf NFCc6NhLv{{3jlu%HS_=g diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/_a.cfe b/PxWeb/wwwroot/Database/_INDEX/sv/_a.cfe new file mode 100644 index 0000000000000000000000000000000000000000..dd9a0dbd610941be51591bb0a849bb17e65ef410 GIT binary patch literal 284 zcmcD&o+B>loS$2eUz(TVmYI_pUX)pqTI8BnQk0om%)r3F$jPFYmQn#^fq*=OVz37Z zmOwdi5SnQ(f4om=a%x_xiDA5fUP^v4M4VX~LNmTYkuS&x84m=koDiDb6h*!yGZ!Mx zV+W!2bkXDsAmUcp5Sr;Si(Xz?3WQ?|)xuT^HFW?0 literal 0 HcmV?d00001 diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/_8.cfs b/PxWeb/wwwroot/Database/_INDEX/sv/_a.cfs similarity index 79% rename from PxWeb/wwwroot/Database/_INDEX/sv/_8.cfs rename to PxWeb/wwwroot/Database/_INDEX/sv/_a.cfs index 945869441e2ca3371c852e7180a3b2faa12cc847..718be4872b22e90b0155d81ff99f25bb5f2f196d 100644 GIT binary patch delta 1034 zcmYjPZ%kWN6u;-5_e$HLoda54JME)Rq_b#STA)y6M9a(qtb{3|V_Bh3D1{cF$R;FEI}j01pj>VUpBW$>nrm^&xd<{=kM>{ zbI;~DTs{qFns;2{zo=lplKCJpaeE?=2*nej@Zf8aV5qlGN=T6u?eMi;1z(Dm`&v8cdo7`X{(~cSdsB6a zR`^;|^r6NLQV^pCS3RgtvAwiB{X86vOW{N`X4^@0IZl@soDPpiIcxmo&BT!GB|1CU z%}sWASnoUlN1h9fO0l@)fFid8JhfGhYuvh9e7PkM3kM>j%kM^lOWfa_6cIyWyOJ5| zm26_4LJ@EQJ&biWanMP0wF;BF7Wnc6b-Mk#{mRSs=lElODL2OaAKCOAyudP?iB;kn z({jIa{qGbu$QiB{WtaLcat~hK{8)Ar9^GLmphHng3HJ}kD&!$RdBWX;D@=Z54YTkm zJ8OOwrsRLkD!_GmQ|8M~0(YAp*T|EW8|mYSVVlp#&eEh6axjpoo+Egf6MWm679W*$d{E%fJ4 zm=O3sh5%M?7Q_XU5`vW*I4I=Yu(XH+g5m~P_yEH~&V=_@u}=^b1s85(x1iOC4Yvji z*wlVNX~+@a=*9x(db8`^M|Zx-ZE`t-5IU28^Wo+1Zn2E_SV=OO&1Ul>ce>IMcIxSS zqW*pzA;+kalGWuW&8+-f%FaJy(w6eUXiq3e+6WtNY?q4~uBaZ^79Z*EmwFOC(V(Pf f-!{Hbzz+oyeQ^U@@fnNDE#1Gue+xlqV`mxzp z1}+;7Bt%zq8D6t!LI#P;BAP&!=OU005d4QQVjvoDF^f4ghVB5N za2bW2BOWJe^7>o|bg@^-YKJuENLQB?9Fi57kR-MrK%5mU3mGNe)1OPoIV~j*xPV(H zxu7=U0!P3F$ow+mBsk3bB?tz5{^#*;m45MsU8*+FugPigpxmpb)x4@`&%tVSkCK$L z@wA$y_rca32F~UW!w$*o^B%x^e4&{160#4!h`1nBFICib=H|>tfjBp~9Z@%|w@Dpvc$Ye;SK8%V zO3n`6n99b_Gs}#U6;-j*IH@KSkC-$h-F;XJ#x})_TXmH5 zGclz!;_`>u{lSOD?f25WK;p(`y7kYGK7RdVs_^fdh$Rzn)Z`qUrGDW8J8MhI-L{8|=&Er6>k{NyW8EhgH zf1_UxUBToQd7BPJ>`+4|B84`qAxeQ|S#?d}RKi}D@_imr9sALD^d{VQ~W6`?W6U&o@^280F H4$b`om5d`n diff --git a/PxWeb/wwwroot/Database/_INDEX/en/_8.si b/PxWeb/wwwroot/Database/_INDEX/sv/_a.si similarity index 51% rename from PxWeb/wwwroot/Database/_INDEX/en/_8.si rename to PxWeb/wwwroot/Database/_INDEX/sv/_a.si index 7e26381de3cd611319e14ddc4bd6356ab917ec21..27053264e0e390b921438261a09266302cd31136 100644 GIT binary patch delta 65 zcmeyv_=j=Ad`9z$3)D@`bPbIa3=OReEv*bJ7#J9s+2RxRlGBPIR4OZwSDbl3WAY22 L92iLD)pG*?W_b}8 delta 65 zcmeyv_=j=Ad`6Rr3)D@Gb&U)Z3@ogS4Xg|e7#J9s+2SqqlGBPIR4OZwSDbl3WAY22 L92gvZd0Z3#TTl`N diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/segments.gen b/PxWeb/wwwroot/Database/_INDEX/sv/segments.gen index 077a451a0b9bc784efb32a5c6bb18ae328f247ac..aa62711b36159c000cc293096c97eb0b805c396a 100644 GIT binary patch literal 36 ccmezW|NmbG2;hd%2Q((XfU+54pL9n70J7i+ng9R* literal 36 ccmezW|NmbG2;hX#2Q((XfU+5u>lsS}0I;J6lK=n! diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/segments_9 b/PxWeb/wwwroot/Database/_INDEX/sv/segments_9 deleted file mode 100644 index 77284b2d3008cdf2df93cc5eba6d6c0748cb4e2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmcD&o+HjtoSL4SnpaZHz`(!+#2_FI#GF9P$P{nE;ZvHNnwM%~_8$sB3Xs_#{sE22 NFF-U1gb7-y0RWzl8?XQX diff --git a/PxWeb/wwwroot/Database/_INDEX/sv/segments_b b/PxWeb/wwwroot/Database/_INDEX/sv/segments_b new file mode 100644 index 0000000000000000000000000000000000000000..adfcb5fcb47adf041b9e135f81cfc27587994366 GIT binary patch literal 89 zcmcD&o+HjtoSL4SnpaZHz`(!+#2}yu#N0s4$P}N*;ZvHNnwM%~_8$sB3Xs_#{sE22 NFF-U1C`;r#1OTa>9HIaK literal 0 HcmV?d00001