Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/backend/libraries/semanticsearch
1 result
Select Git revision
Loading items
Show changes
Commits on Source (4)
...@@ -70,7 +70,7 @@ namespace Coscine.SemanticSearch.Cmd ...@@ -70,7 +70,7 @@ namespace Coscine.SemanticSearch.Cmd
.WithParsed<Options>(o => RunSemanticSearch(o).Wait()); .WithParsed<Options>(o => RunSemanticSearch(o).Wait());
} }
private async static Task RunSemanticSearch(Options o) private static async Task RunSemanticSearch(Options o)
{ {
IRdfConnector connector = new VirtuosoRdfConnector(o.MetadataStore); IRdfConnector connector = new VirtuosoRdfConnector(o.MetadataStore);
ISearchClient searchClient = new ElasticsearchSearchClient(o.ElasticsearchServer, "" + o.ElasticsearchPort); ISearchClient searchClient = new ElasticsearchSearchClient(o.ElasticsearchServer, "" + o.ElasticsearchPort);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyName>Coscine.SemanticSearch.Cmd</AssemblyName> <AssemblyName>Coscine.SemanticSearch.Cmd</AssemblyName>
<RootNamespace>Coscine.SemanticSearch.Cmd</RootNamespace> <RootNamespace>Coscine.SemanticSearch.Cmd</RootNamespace>
<Version>1.6.1</Version> <Version>1.6.2</Version>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>
</PropertyGroup> </PropertyGroup>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Version>1.6.1</Version> <Version>1.6.2</Version>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Coscine.SemanticSearch</AssemblyName> <AssemblyName>Coscine.SemanticSearch</AssemblyName>
<RootNamespace>Coscine.SemanticSearch</RootNamespace> <RootNamespace>Coscine.SemanticSearch</RootNamespace>
<Version>1.6.1</Version> <Version>1.6.2</Version>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>
</PropertyGroup> </PropertyGroup>
......
...@@ -6,6 +6,7 @@ using System.Globalization; ...@@ -6,6 +6,7 @@ using System.Globalization;
namespace Coscine.SemanticSearch.Util.QueryObjects namespace Coscine.SemanticSearch.Util.QueryObjects
{ {
//Generated with JSON -> C#
public partial class ElasticQuery public partial class ElasticQuery
{ {
[JsonProperty("size", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("size", NullValueHandling = NullValueHandling.Ignore)]
...@@ -111,8 +112,8 @@ namespace Coscine.SemanticSearch.Util.QueryObjects ...@@ -111,8 +112,8 @@ namespace Coscine.SemanticSearch.Util.QueryObjects
[JsonProperty("date_created", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("date_created", NullValueHandling = NullValueHandling.Ignore)]
public DateCreated DateCreated { get; set; } public DateCreated DateCreated { get; set; }
[JsonProperty("title.keyword", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("_script", NullValueHandling = NullValueHandling.Ignore)]
public SortElement Title { get; set; } public Script Name { get; set; }
[JsonProperty("_score", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("_score", NullValueHandling = NullValueHandling.Ignore)]
public SortElement Score { get; set; } public SortElement Score { get; set; }
...@@ -124,12 +125,33 @@ namespace Coscine.SemanticSearch.Util.QueryObjects ...@@ -124,12 +125,33 @@ namespace Coscine.SemanticSearch.Util.QueryObjects
public string Order { get; set; } = "asc"; public string Order { get; set; } = "asc";
} }
public partial class Script
{
[JsonProperty("type")]
public string Type { get; set; } = "string";
[JsonProperty("script")]
public ScriptClass ScriptScript { get; set; } = new ScriptClass();
[JsonProperty("order")]
public string Order { get; set; } = "asc";
}
public partial class ScriptClass
{
[JsonProperty("lang")]
public string Lang { get; set; } = "painless";
[JsonProperty("source")]
public string Source { get; set; } = "if (doc['fileName.keyword'].size() != 0) { doc['fileName.keyword'].value.toLowerCase()} else { doc['title.keyword'].value.toLowerCase()} ";
}
public partial class DateCreated public partial class DateCreated
{ {
[JsonProperty("order")] [JsonProperty("order")]
public string Order { get; set; } = "asc"; public string Order { get; set; } = "asc";
[JsonProperty("format")] [JsonProperty("format")]
public string Format { get; set; } public string Format { get; set; } = "yyyy-MM-dd";
} }
} }
\ No newline at end of file