Added SubjectCode to the table output PXWEB2-737

Px.Search.Lucene/LuceneIndex.cs

@@ -3,7 +3,7 @@
 namespace Px.Search.Lucene
 {
 
     public class LuceneIndex : IIndex
     {
         private readonly string _indexDirectoryBase = "";
         private string _indexDirectoryCurrent = "";
@@ -19,7 +19,7 @@
         {
             if (string.IsNullOrWhiteSpace(indexDirectory))
             {
                 throw new ArgumentNullException("Index directory not defined for Lucene");
             }
 
             _indexDirectoryBase = indexDirectory;
@@ -74,7 +74,7 @@
         {
             if (string.IsNullOrWhiteSpace(language))
             {
                 throw new ArgumentNullException("Language not specified");
             }
 
             _indexDirectoryCurrent = Path.Combine(_indexDirectoryBase, language);
@@ -83,7 +83,7 @@
 
             if (_writer == null)
             {
                 throw new Exception("Could not create IndexWriter. Index directory may be locked by another IndexWriter");
             }
         }
 
@@ -91,7 +91,7 @@
         {
             if (string.IsNullOrWhiteSpace(language))
             {
                 throw new ArgumentNullException("Language not specified");
             }
 
             _indexDirectoryCurrent = Path.Combine(_indexDirectoryBase, language);
@@ -209,6 +209,7 @@
                 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))
                 {

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);

Px.Search.Lucene/SearchConstants.cs

@@ -1,6 +1,6 @@
 namespace Px.Search.Lucene
 {
     public class SearchConstants
     {
         // Search field constants
         public const string SEARCH_FIELD_DOCID = "docid";
@@ -27,5 +27,6 @@
         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";
     }
 }

Px.Search/Indexer.cs

@@ -143,7 +143,7 @@
                 return;
             }
 
             if (item is PxMenuItem)
             {
                 foreach (var subitem in ((PxMenuItem)item).SubItems)
                 {
@@ -155,7 +155,7 @@
                     {
                         TraverseDatabase(subitem.ID.Selection, language, index);
                     }
                     else if (subitem is TableLink)
                     {
                         AddTableToIndex(language, index, (TableLink)subitem);
                     }
@@ -275,12 +275,13 @@
             tbl.Description = tblLink.Description;
             tbl.SortCode = tblLink.SortCode;
             tbl.Updated = tblLink.LastUpdated;
             tbl.Discontinued = null; // TODO: Implement later
+            tbl.SubjectCode = meta.SubjectCode ?? string.Empty;
 
             return tbl;
         }
 
         private string GetCategory(TableLink tblLink)
         {
             switch (tblLink.Category)
             {

Px.Search/SearchResult.cs

@@ -5,11 +5,12 @@
     /// </summary>
     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; }

Px.Search/TableInformation.cs

@@ -10,7 +10,7 @@
             FirstPeriod = firstPeriod;
             LastPeriod = lastPeriod;
             VariableNames = variableNames;
             Tags = new string[] { }; // TODO: Implement later
             Paths = new List<Level[]>();
             Source = "";
             TimeUnit = "X";
@@ -30,5 +30,6 @@
         public List<Level[]> Paths { get; set; }
         public string Source { get; set; }
         public string TimeUnit { get; set; }
+        public string SubjectCode { get; set; } = string.Empty;
     }
 }

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;

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);
             }

PxWeb/PxWeb.csproj

@@ -49,7 +49,7 @@
     <PackageReference Include="PCAxis.Menu.ConfigDatamodelMenu" Version="1.0.8" />
     <PackageReference Include="PCAxis.Serializers" Version="1.9.0" />
     <PackageReference Include="PcAxis.Sql" Version="1.4.3" />
-    <PackageReference Include="PxWeb.Api2.Server" Version="2.0.0-beta.17" />
+    <PackageReference Include="PxWeb.Api2.Server" Version="2.0.0-beta.18" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="8.1.4" />