1- using Microsoft . Azure . Search ;
2- using Microsoft . Azure . Search . Models ;
1+ using Azure ;
2+ using Azure . Search . Documents ;
3+ using Azure . Search . Documents . Indexes ;
4+ using Azure . Search . Documents . Models ;
35using Microsoft . Spatial ;
46using System ;
57using System . Collections . Generic ;
@@ -12,10 +14,9 @@ namespace NYCJobsWeb
1214{
1315 public class JobsSearch
1416 {
15- private static SearchServiceClient _searchClient ;
16- private static SearchIndexClient _indexClient ;
17+ private static SearchClient _indexClient ;
1718 private static string IndexName = "nycjobs" ;
18- private static SearchIndexClient _indexZipClient ;
19+ private static SearchClient _indexZipClient ;
1920 private static string IndexZipCodes = "zipcodes" ;
2021
2122 public static string errorMessage ;
@@ -24,13 +25,12 @@ static JobsSearch()
2425 {
2526 try
2627 {
27- string searchServiceName = ConfigurationManager . AppSettings [ "SearchServiceName " ] ;
28+ string searchendpoint = ConfigurationManager . AppSettings [ "Searchendpoint " ] ;
2829 string apiKey = ConfigurationManager . AppSettings [ "SearchServiceApiKey" ] ;
2930
3031 // Create an HTTP reference to the catalog index
31- _searchClient = new SearchServiceClient ( searchServiceName , new SearchCredentials ( apiKey ) ) ;
32- _indexClient = new SearchIndexClient ( searchServiceName , IndexName , new SearchCredentials ( apiKey ) ) ;
33- _indexZipClient = new SearchIndexClient ( searchServiceName , IndexZipCodes , new SearchCredentials ( apiKey ) ) ;
32+ _indexClient = new SearchIndexClient ( new Uri ( searchendpoint ) , new AzureKeyCredential ( apiKey ) ) . GetSearchClient ( IndexName ) ;
33+ _indexZipClient = new SearchIndexClient ( new Uri ( searchendpoint ) , new AzureKeyCredential ( apiKey ) ) . GetSearchClient ( IndexZipCodes ) ;
3434
3535 }
3636 catch ( Exception e )
@@ -39,44 +39,44 @@ static JobsSearch()
3939 }
4040 }
4141
42- public DocumentSearchResult < Document > Search ( string searchText , string businessTitleFacet , string postingTypeFacet , string salaryRangeFacet ,
42+ public SearchResults < SearchDocument > Search ( string searchText , string businessTitleFacet , string postingTypeFacet , string salaryRangeFacet ,
4343 string sortType , double lat , double lon , int currentPage , int maxDistance , string maxDistanceLat , string maxDistanceLon )
4444 {
4545 // Execute search based on query string
4646 try
4747 {
48- SearchParameters sp = new SearchParameters ( )
48+ SearchOptions sp = new SearchOptions ( )
4949 {
5050 SearchMode = SearchMode . Any ,
51- Top = 10 ,
51+ Size = 10 ,
5252 Skip = currentPage - 1 ,
53- // Limit results
54- Select = new List < String > ( ) { "id" , "agency" , "posting_type" , "num_of_positions" , "business_title" ,
55- "salary_range_from" , "salary_range_to" , "salary_frequency" , "work_location" , "job_description" ,
56- "posting_date" , "geo_location" , "tags" } ,
5753 // Add count
58- IncludeTotalResultCount = true ,
54+ IncludeTotalCount = true ,
5955 // Add search highlights
60- HighlightFields = new List < String > ( ) { "job_description" } ,
6156 HighlightPreTag = "<b>" ,
6257 HighlightPostTag = "</b>" ,
63- // Add facets
64- Facets = new List < String > ( ) { "business_title" , "posting_type" , "level" , "salary_range_from,interval:50000" } ,
6558 } ;
59+ List < String > select = new List < String > ( ) { "id" , "agency" , "posting_type" , "num_of_positions" , "business_title" ,
60+ "salary_range_from" , "salary_range_to" , "salary_frequency" , "work_location" , "job_description" ,
61+ "posting_date" , "geo_location" , "tags" } ;
62+ List < String > facets = new List < String > ( ) { "business_title" , "posting_type" , "level" , "salary_range_from,interval:50000" } ;
63+ AddList ( sp . Select , select ) ;
64+ AddList ( sp . Facets , facets ) ;
65+ sp . HighlightFields . Add ( "job_description" ) ;
66+
6667 // Define the sort type
6768 if ( sortType == "featured" )
6869 {
6970 sp . ScoringProfile = "jobsScoringFeatured" ; // Use a scoring profile
70- sp . ScoringParameters = new List < ScoringParameter > ( ) ;
71- sp . ScoringParameters . Add ( new ScoringParameter ( "featuredParam" , new [ ] { "featured" } ) ) ;
72- sp . ScoringParameters . Add ( new ScoringParameter ( "mapCenterParam" , GeographyPoint . Create ( lon , lat ) ) ) ;
71+ sp . ScoringParameters . Add ( "featuredParam--featured" ) ;
72+ sp . ScoringParameters . Add ( "mapCenterParam--" + GeographyPoint . Create ( lon , lat ) ) ;
7373 }
7474 else if ( sortType == "salaryDesc" )
75- sp . OrderBy = new List < String > ( ) { "salary_range_from desc" } ;
75+ sp . OrderBy . Add ( "salary_range_from desc" ) ;
7676 else if ( sortType == "salaryIncr" )
77- sp . OrderBy = new List < String > ( ) { "salary_range_from" } ;
77+ sp . OrderBy . Add ( "salary_range_from" ) ;
7878 else if ( sortType == "mostRecent" )
79- sp . OrderBy = new List < String > ( ) { "posting_date desc" } ;
79+ sp . OrderBy . Add ( "posting_date desc" ) ;
8080
8181
8282 // Add filtering
@@ -106,7 +106,7 @@ public DocumentSearchResult<Document> Search(string searchText, string businessT
106106
107107 sp . Filter = filter ;
108108
109- return _indexClient . Documents . Search ( searchText , sp ) ;
109+ return _indexClient . Search < SearchDocument > ( searchText , sp ) ;
110110 }
111111 catch ( Exception ex )
112112 {
@@ -115,17 +115,17 @@ public DocumentSearchResult<Document> Search(string searchText, string businessT
115115 return null ;
116116 }
117117
118- public DocumentSearchResult < Document > SearchZip ( string zipCode )
118+ public SearchResults < SearchDocument > SearchZip ( string zipCode )
119119 {
120120 // Execute search based on query string
121121 try
122122 {
123- SearchParameters sp = new SearchParameters ( )
123+ SearchOptions sp = new SearchOptions ( )
124124 {
125125 SearchMode = SearchMode . All ,
126- Top = 1 ,
126+ Size = 1 ,
127127 } ;
128- return _indexZipClient . Documents . Search ( zipCode , sp ) ;
128+ return _indexZipClient . Search < SearchDocument > ( zipCode , sp ) ;
129129 }
130130 catch ( Exception ex )
131131 {
@@ -134,18 +134,18 @@ public DocumentSearchResult<Document> SearchZip(string zipCode)
134134 return null ;
135135 }
136136
137- public DocumentSuggestResult < Document > Suggest ( string searchText , bool fuzzy )
137+ public SuggestResults < SearchDocument > Suggest ( string searchText , bool fuzzy )
138138 {
139139 // Execute search based on query string
140140 try
141141 {
142- SuggestParameters sp = new SuggestParameters ( )
142+ SuggestOptions sp = new SuggestOptions ( )
143143 {
144144 UseFuzzyMatching = fuzzy ,
145- Top = 8
145+ Size = 8
146146 } ;
147147
148- return _indexClient . Documents . Suggest ( searchText , "sg" , sp ) ;
148+ return _indexClient . Suggest < SearchDocument > ( searchText , "sg" , sp ) ;
149149 }
150150 catch ( Exception ex )
151151 {
@@ -154,12 +154,12 @@ public DocumentSuggestResult<Document> Suggest(string searchText, bool fuzzy)
154154 return null ;
155155 }
156156
157- public Document LookUp ( string id )
157+ public SearchDocument LookUp ( string id )
158158 {
159159 // Execute geo search based on query string
160160 try
161161 {
162- return _indexClient . Documents . Get ( id ) ;
162+ return _indexClient . GetDocument < SearchDocument > ( id ) ;
163163 }
164164 catch ( Exception ex )
165165 {
@@ -168,5 +168,12 @@ public Document LookUp(string id)
168168 return null ;
169169 }
170170
171+ public void AddList ( IList < string > list1 , List < String > list2 )
172+ {
173+ foreach ( string element in list2 )
174+ {
175+ list1 . Add ( element ) ;
176+ }
177+ }
171178 }
172179}
0 commit comments