Skip to content

Commit 989d138

Browse files
authored
Merge pull request #112461 from HeidiSteen/heidist-bugfix
[Azure Cog Search] Fix for the zero TOC bug
2 parents f73c901 + 25b5130 commit 989d138

7 files changed

+18
-273
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,6 +2682,16 @@
26822682
"redirect_url": "/azure/cosmos-db/sql-api-get-started",
26832683
"redirect_document_id": false
26842684
},
2685+
{
2686+
"source_path": "articles/search/search-example-adventureworks-modeling.md",
2687+
"redirect_url": "/azure/search/search-what-is-data-import",
2688+
"redirect_document_id": true
2689+
},
2690+
{
2691+
"source_path": "articles/search/search-example-adventureworks-multilevel-faceting.md",
2692+
"redirect_url": "/azure/search/search-filters-facets",
2693+
"redirect_document_id": true
2694+
},
26852695
{
26862696
"source_path": "articles/search/preview-api-resetskills.md",
26872697
"redirect_url": "/rest/api/searchservice/2019-05-06-preview/reset-skills",

articles/search/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@
256256
href: search-query-troubleshoot-collection-filters.md
257257
- name: Understand collection filters
258258
href: search-query-understand-collection-filters.md
259-
- name: Example of multi-level facets
260-
href: search-example-adventureworks-multilevel-faceting.md
259+
- name: Filter by language
260+
href: search-filters-language.md
261261
- name: Results
262262
items:
263263
- name: Work with results

articles/search/index-sql-relational-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The solution is to capture the room detail as nested JSON, and then insert the J
102102
This rowset is now ready for import into Azure Cognitive Search.
103103

104104
> [!NOTE]
105-
> This approach assumes that embedded JSON is under the [maximum column size limits of SQL Server](https://docs.microsoft.com/sql/sql-server/maximum-capacity-specifications-for-sql-server). If your data doesn't fit, you can try a programmatic approach, as illustrated in [Example: Model the AdventureWorks Inventory database for Azure Cognitive Search](search-example-adventureworks-modeling.md).
105+
> This approach assumes that embedded JSON is under the [maximum column size limits of SQL Server](https://docs.microsoft.com/sql/sql-server/maximum-capacity-specifications-for-sql-server).
106106

107107
## Use a complex collection for the "many" side of a one-to-many relationship
108108

articles/search/search-example-adventureworks-modeling.md

Lines changed: 0 additions & 161 deletions
This file was deleted.

articles/search/search-example-adventureworks-multilevel-faceting.md

Lines changed: 0 additions & 99 deletions
This file was deleted.

articles/search/search-filters-language.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: HeidiSteen
88
ms.author: heidist
99
ms.service: cognitive-search
1010
ms.topic: conceptual
11-
ms.date: 11/04/2019
11+
ms.date: 04/22/2020
1212
---
1313

1414
# How to filter by language in Azure Cognitive Search
@@ -28,7 +28,7 @@ The success of this technique hinges on the integrity of field contents. Azure C
2828

2929
In Azure Cognitive Search, queries target a single index. Developers who want to provide language-specific strings in a single search experience typically define dedicated fields to store the values: one field for English strings, one for French, and so on.
3030

31-
In our samples, including the [real-estate sample](search-get-started-portal.md) shown below, you might have seen field definitions similar to the following screenshot. Notice how this example shows the language analyzer assignments for the fields in this index. Fields that contain strings perform better in full text search when paired with an analyzer engineered to handle the linguistic rules of the target language.
31+
The following example is from the [real-estate sample](search-get-started-portal.md) which has several string fields containing content in different languages. Notice the language analyzer assignments for the fields in this index. Fields that contain strings perform better in full text search when paired with an analyzer engineered to handle the linguistic rules of the target language.
3232

3333
![](./media/search-filters-language/lang-fields.png)
3434

@@ -54,7 +54,7 @@ parameters =
5454
};
5555
```
5656
> [!Note]
57-
> Although there is no $filter argument on the query, this use case is strongly affiliated with filter concepts, so we present it as a filtering scenario.
57+
> Although there is no $filter argument on the query, this use case is strongly affiliated with filter concepts, so it's presented as a filtering scenario.
5858
5959
## See also
6060

articles/search/search-indexer-field-mappings.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ Some situations where field mappings are useful:
2424
* You need to Base64 encode or decode your data. Field mappings support several **mapping functions**, including functions for Base64 encoding and decoding.
2525

2626
> [!NOTE]
27-
> The field mapping feature of Azure Cognitive Search indexers provides a simple way to map data fields to index fields, with a few options for data conversion. More complex data might require pre-processing to reshape it into a form that's easy to index.
28-
>
29-
> Microsoft Azure Data Factory is a powerful cloud-based solution for importing and transforming data. You can also write code to transform source data before indexing. For code examples, see [Model relational data](search-example-adventureworks-modeling.md) and [Model multilevel facets](search-example-adventureworks-multilevel-faceting.md).
30-
>
27+
> Field mappings in indexers are a simple way to map data fields to index fields, with some ability for light-weight data conversion. More complex data might require pre-processing to reshape it into a form that's conducive to indexing. One option you might consider is [Azure Data Factory](https://docs.microsoft.com/zure/data-factory/).
3128
3229
## Set up field mappings
3330

@@ -178,7 +175,7 @@ If the `useHttpServerUtilityUrlTokenEncode` or `useHttpServerUtilityUrlTokenDeco
178175
> [!WARNING]
179176
> If `base64Encode` is used to produce key values, `useHttpServerUtilityUrlTokenEncode` must be set to true. Only URL-safe base64 encoding can be used for key values. See [Naming rules (Azure Cognitive Search)](https://docs.microsoft.com/rest/api/searchservice/naming-rules) for the full set of restrictions on characters in key values.
180177
181-
The .NET libraries in Azure Cognitive Search assume the full .NET Framework, which provides built-in encoding. The `useHttpServerUtilityUrlTokenEncode` and `useHttpServerUtilityUrlTokenDecode` options leverage this built-in functionaity. If you are using .NET Core or another framework, we recommend setting those options to `false` and calling your framework's encoding and decoding functions directly.
178+
The .NET libraries in Azure Cognitive Search assume the full .NET Framework, which provides built-in encoding. The `useHttpServerUtilityUrlTokenEncode` and `useHttpServerUtilityUrlTokenDecode` options leverage this built-in functionality. If you are using .NET Core or another framework, we recommend setting those options to `false` and calling your framework's encoding and decoding functions directly.
182179

183180
The following table compares different base64 encodings of the string `00>00?00`. To determine the required additional processing (if any) for your base64 functions, apply your library encode function on the string `00>00?00` and compare the output with the expected output `MDA-MDA_MDA`.
184181

@@ -242,8 +239,6 @@ Azure SQL Database doesn't have a built-in data type that naturally maps to `Col
242239
}]
243240
```
244241

245-
For a detailed example that transforms relational data into index collection fields, see [Model relational data](search-example-adventureworks-modeling.md).
246-
247242
<a name="urlEncodeFunction"></a>
248243

249244
### urlEncode function

0 commit comments

Comments
 (0)