Skip to content

Commit fbf802a

Browse files
committed
2022Q4
1 parent fa6b0e4 commit fbf802a

File tree

401 files changed

+33663
-9065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+33663
-9065
lines changed

BitCutStudios.CorpusExplorer/BitCutStudios.CorpusExplorer.csproj

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.11.42" targetFramework="net461" />
3+
<package id="HtmlAgilityPack" version="1.11.46" targetFramework="net461" />
44
</packages>

CorpusExplorer.Core/CorpusExplorer.Core.csproj

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
20+
<DebugType>portable</DebugType>
2121
<Optimize>false</Optimize>
2222
<OutputPath>bin\Debug\</OutputPath>
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -51,8 +51,8 @@
5151
<ErrorReport>prompt</ErrorReport>
5252
</PropertyGroup>
5353
<ItemGroup>
54-
<Reference Include="HtmlAgilityPack, Version=1.11.42.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
55-
<HintPath>..\packages\HtmlAgilityPack.1.11.42\lib\Net45\HtmlAgilityPack.dll</HintPath>
54+
<Reference Include="HtmlAgilityPack, Version=1.11.46.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
55+
<HintPath>..\packages\HtmlAgilityPack.1.11.46\lib\Net45\HtmlAgilityPack.dll</HintPath>
5656
</Reference>
5757
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5858
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -67,17 +67,36 @@
6767
<Reference Include="System.Core" />
6868
<Reference Include="System.Data" />
6969
<Reference Include="System.Drawing" />
70-
<Reference Include="System.IO.Compression" />
71-
<Reference Include="System.Net.Http" />
70+
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
71+
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
75+
</Reference>
7276
<Reference Include="System.Numerics" />
7377
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7478
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
7579
</Reference>
7680
<Reference Include="System.Security" />
81+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
83+
</Reference>
84+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
86+
</Reference>
87+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
89+
</Reference>
90+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
92+
</Reference>
7793
<Reference Include="System.Web" />
7894
<Reference Include="System.Xaml" />
7995
<Reference Include="System.Xml" />
8096
<Reference Include="System.Xml.Linq" />
97+
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
99+
</Reference>
81100
<Reference Include="Telerik.Windows.Documents.Core, Version=2022.2.428.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
82101
<SpecificVersion>False</SpecificVersion>
83102
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2022\Bin40\Telerik.Windows.Documents.Core.dll</HintPath>
@@ -126,7 +145,7 @@
126145
<Project>{dc1b5a58-29da-476d-89f8-e73a1db11e52}</Project>
127146
<Name>CorpusExplorer.Sdk</Name>
128147
</ProjectReference>
129-
<ProjectReference Include="W:\Kooperationsprojekte\CorpusExplorer.Terminal.Console\Action\CorpusExplorer.Sdk.Action\CorpusExplorer.Sdk.Action.csproj">
148+
<ProjectReference Include="..\..\..\..\Projekte-Kooperation\CorpusExplorer.Terminal.Console\Action\CorpusExplorer.Sdk.Action\CorpusExplorer.Sdk.Action.csproj">
130149
<Project>{693d7071-5091-481f-b404-ac4772a0df60}</Project>
131150
<Name>CorpusExplorer.Sdk.Action</Name>
132151
</ProjectReference>
@@ -138,6 +157,13 @@
138157
</ItemGroup>
139158
<ItemGroup />
140159
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
160+
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
161+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162+
<PropertyGroup>
163+
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
164+
</PropertyGroup>
165+
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
166+
</Target>
141167
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
142168
Other similar extension points exist, see Microsoft.Common.targets.
143169
<Target Name="BeforeBuild">

CorpusExplorer.Core/RepositoryManifest.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public class RepositoryManifest : AbstractAddonRepository
120120
new Dictionary<string, AbstractExporter>
121121
{
122122
{ "JSON-Export (*.json)|*.json", new ExporterJson() },
123+
{ "JSON-Export + ZIP (*.zip)|*.zip", new ExporterJsonZip() },
123124
{ "XML-Export (*.xml)|*.xml", new ExporterXml() },
124125
{ "TLV-XML-Export (*.xml)|*.xml", new ExporterTlv() },
125126
{ "CorpusExplorer v6 (*.cec6)|*.cec6", new ExporterCec6() },
@@ -133,8 +134,10 @@ public class RepositoryManifest : AbstractAddonRepository
133134
{ "CSV-Export [Metadaten + Wort-Layer] (*.csv)|*.csv", new ExporterCsv() },
134135
{ "Abfragen-Export [Nur für Schnappschüsse] (*.ceusd)|*.ceusd", new ExporterQuery() },
135136
{ "CoNLL (*.conll)|*.conll", new ExporterConll() },
137+
{ "CoNLL + ZIP (*.zip)|*.zip", new ExporterConllZip() },
136138
{ "TreeTagger (*.treetagger)|*.treetagger", new ExporterTreeTagger() },
137139
{ "TreeTagger + Satzgrenze (*.treetagger)|*.treetagger", new ExporterTreeTagger { UseSentenceTag = true } },
140+
{ "TreeTagger + ZIP (*.zip)|*.zip", new ExporterTreeTaggerZip { UseSentenceTag = true } },
138141
{ "CorpusWorkBench (*.vrt)|*.vrt", new ExporterCorpusWorkBench { UseSentenceTag = false } },
139142
{ "CorpusWorkBench + Satzgrenze (*.vrt, *.vrt.xml)|*.vrt;*.vrt.xml", new ExporterCorpusWorkBench { UseSentenceTag = true } },
140143
{ "Sketch Engine VERT (*.vert)|*.vert", new ExporterSketchEngine() },
@@ -195,6 +198,8 @@ public class RepositoryManifest : AbstractAddonRepository
195198
public override IEnumerable<IAction> AddonConsoleActions =>
196199
new IAction[]
197200
{
201+
new AddTaggerAction(),
202+
198203
new BasicInformationAction(),
199204

200205
new ClusterAction(),
@@ -242,7 +247,9 @@ public class RepositoryManifest : AbstractAddonRepository
242247
new KwicAllInSentenceFilterAction(),
243248
new KwicAnyFilterAction(),
244249
new KwicExactPhraseFilterAction(),
250+
new KwicExportAction(),
245251
new KwicFirstAnyFilterAction(),
252+
new KwicMdaFilterAction(),
246253
new KwicNamedEntityAction(),
247254
new KwicSignificantFilterAction(),
248255
new KwitAction(),
@@ -254,6 +261,8 @@ public class RepositoryManifest : AbstractAddonRepository
254261
new MetaAction(),
255262
new MetaCategoriesAction(),
256263
new MetaDocumentAction(),
264+
new MetaExportAction(),
265+
new MetaImportAction(),
257266
new MetaSelectedAction(),
258267
new MetaSelectedDomainAction(),
259268
new MtldAction(),
@@ -274,6 +283,9 @@ public class RepositoryManifest : AbstractAddonRepository
274283
new QueryCountSentencesAction(),
275284
new QueryListAction(),
276285

286+
new RemoveLayerAction(),
287+
new RemoveMetaAction(),
288+
277289
new SentenceCountAction(),
278290
new SizeAction(),
279291
new StyleBurrowsDeltaAction(),
@@ -285,6 +297,7 @@ public class RepositoryManifest : AbstractAddonRepository
285297
new TokenListSelectAction(),
286298
new TypeCountAction(),
287299

300+
new ValidateAction(),
288301
new VocabularyComplexityAction(),
289302
new VocdAction(),
290303
};

CorpusExplorer.Core/app.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
<assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
4343
<bindingRedirect oldVersion="0.0.0.0-1.0.7.0" newVersion="1.0.7.0" />
4444
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
47+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
48+
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
52+
</dependentAssembly>
4553
</assemblyBinding>
4654
</runtime>
4755
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.11.42" targetFramework="net461" />
4-
<package id="Microsoft.NETCore.Platforms" version="6.0.3" targetFramework="net461" />
5-
<package id="NETStandard.Library" version="2.0.3" targetFramework="net45" />
3+
<package id="HtmlAgilityPack" version="1.11.46" targetFramework="net461" />
4+
<package id="Microsoft.NETCore.Platforms" version="6.0.5" targetFramework="net461" />
5+
<package id="NETStandard.Library" version="2.0.3" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
77
<package id="SharpSerializer" version="3.0.2" targetFramework="net461" />
8-
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
9-
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
10-
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
11-
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
12-
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
13-
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
14-
<package id="System.IO" version="4.3.0" targetFramework="net45" />
15-
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
16-
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
17-
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
18-
<package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
19-
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net452" />
20-
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
21-
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
22-
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
23-
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
24-
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
25-
<package id="System.Runtime" version="4.3.1" targetFramework="net452" />
26-
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net452" />
27-
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
28-
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
29-
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
30-
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
31-
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
32-
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net452" />
33-
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
34-
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
35-
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net45" />
36-
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
8+
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
9+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
10+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
11+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
12+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
13+
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
14+
<package id="System.IO" version="4.3.0" targetFramework="net461" />
15+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
16+
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
17+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
18+
<package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
19+
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net461" />
20+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
21+
<package id="System.Reflection" version="4.3.0" targetFramework="net461" />
22+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
23+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
24+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
25+
<package id="System.Runtime" version="4.3.1" targetFramework="net461" />
26+
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net461" />
27+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
28+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
29+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
30+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
31+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
32+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
33+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
34+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
35+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
36+
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net461" />
37+
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
38+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
39+
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
40+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
3741
</packages>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net5.0</TargetFramework>
6+
<AssemblyName>ImageBuilder_LINUX</AssemblyName>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<PlatformTarget>x64</PlatformTarget>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<Compile Include="..\CorpusExplorer.Installer.ImageBuilder\ImageBuilderViewModel.cs" Link="ImageBuilderViewModel.cs" />
15+
<Compile Include="..\CorpusExplorer.Installer.ImageBuilder\Program.cs" Link="Program.cs" />
16+
<Compile Include="..\CorpusExplorer.Sdk\Helper\Splitter.cs" Link="Splitter.cs" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="SharpZipLib" Version="1.4.0" />
21+
</ItemGroup>
22+
23+
</Project>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<_LastSelectedProfileId>C:\Projekte\CorpusExplorerV2\CorpusExplorer\CorpusExplorer.Installer.ImageBuilder.Linux\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
5+
</PropertyGroup>
6+
</Project>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project>
6+
<PropertyGroup>
7+
<Configuration>Release</Configuration>
8+
<Platform>Any CPU</Platform>
9+
<PublishDir>publish_macos\</PublishDir>
10+
<PublishProtocol>FileSystem</PublishProtocol>
11+
<_TargetId>Folder</_TargetId>
12+
<TargetFramework>net5.0</TargetFramework>
13+
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
14+
<SelfContained>true</SelfContained>
15+
<PublishSingleFile>true</PublishSingleFile>
16+
</PropertyGroup>
17+
</Project>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project>
6+
<PropertyGroup>
7+
<History>True|2022-10-13T08:45:01.2015610Z;</History>
8+
<LastFailureDetails />
9+
</PropertyGroup>
10+
</Project>

0 commit comments

Comments
 (0)