Skip to content

Commit 1ec3fee

Browse files
UziTechUziTech
committed
fix form error
1 parent d0052ec commit 1ec3fee

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

‎NSF2SQL.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Global
1717
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1818
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Debug|x86.ActiveCfg = Release|x86
1919
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Debug|x86.Build.0 = Release|x86
20-
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|Any CPU.ActiveCfg = Release|x86
21-
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|Any CPU.Build.0 = Release|x86
20+
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|Any CPU.Build.0 = Release|Any CPU
2222
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|x86.ActiveCfg = Release|x86
2323
{3AD3A009-FC65-4067-BFF1-6CE1378BA75A}.Release|x86.Build.0 = Release|x86
2424
EndGlobalSection

‎NSF2SQL/.vs/NSF2SQL.csproj.dtbcache.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"RootPath":"C:\\Users\\tony\\Documents\\GitHub\\nsf2sql\\NSF2SQL","ProjectFileName":"NSF2SQL.csproj","Configuration":"Release|x86","FrameworkPath":"","Sources":[{"SourceFile":"ExportTarget.cs"},{"SourceFile":"ExportTarget.Designer.cs"},{"SourceFile":"Form1.cs"},{"SourceFile":"Form1.Designer.cs"},{"SourceFile":"InputBox.cs"},{"SourceFile":"ISqlGenerator.cs"},{"SourceFile":"MySqlGenerator.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"ProgressDialog.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Table.cs"},{"SourceFile":"TsqlGenerator.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\x86\\Release\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\tony\\.nuget\\packages\\bouncycastle\\1.8.9\\lib\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\lib\\net461\\BouncyCastle.Cryptography.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\google.protobuf\\3.27.1\\lib\\net45\\Google.Protobuf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\interop.domino.dll\\1.0.0\\lib\\Interop.Domino.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\k4os.compression.lz4\\1.3.8\\lib\\net462\\K4os.Compression.LZ4.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\k4os.compression.lz4.streams\\1.3.5\\lib\\net462\\K4os.Compression.LZ4.Streams.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\k4os.hash.xxhash\\1.0.8\\lib\\net462\\K4os.Hash.xxHash.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\5.0.0\\lib\\net461\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\windowsapicodepack-core\\1.1.2\\lib\\Microsoft.WindowsAPICodePack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\windowsapicodepack-shell\\1.1.1\\lib\\Microsoft.WindowsAPICodePack.Shell.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\mysql.data\\8.4.0\\lib\\net462\\MySql.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\ssh.net\\2024.0.0\\lib\\net462\\Renci.SshNet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.buffers\\4.5.1\\ref\\net45\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.configuration.configurationmanager\\4.4.1\\ref\\net461\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.diagnostics.diagnosticsource\\7.0.2\\lib\\net462\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.io.pipelines\\5.0.2\\lib\\net461\\System.IO.Pipelines.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.memory\\4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\ref\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\7.0.0-preview.2.22152.2\\lib\\net462\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\tony\\.nuget\\packages\\zstdsharp.port\\0.7.1\\lib\\net461\\ZstdSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Users\\tony\\Documents\\GitHub\\nsf2sql\\NSF2SQL\\bin\\x86\\Release\\NSF2SQL.exe","OutputItemRelativePath":"NSF2SQL.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

‎NSF2SQL/Form1.cs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,9 @@ private void bExportDocuments_Click(object sender, EventArgs ea)
396396
e.Cancel = true;
397397
return;
398398
}
399-
if (doc.HasItem("Form") && ((string[])doc.GetItemValue("Form"))[0] != "")
399+
string form = getForm(doc);
400+
if (form != "")
400401
{
401-
//get form
402-
string form = ((string[])doc.GetItemValue("Form"))[0];
403-
404402
if (!tables.ContainsKey(form))
405403
{
406404
tables.Add(form, new Table(form));
@@ -843,6 +841,23 @@ private void treeView1_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEve
843841
}
844842
}
845843

844+
private string getForm(NotesDocument doc)
845+
{
846+
if (!doc.HasItem("Form"))
847+
{
848+
return "";
849+
}
850+
851+
var formItems = doc.GetItemValue("Form");
852+
853+
if (!formItems.GetType().IsArray)
854+
{
855+
return "";
856+
}
857+
858+
return ((object[])formItems)[0].ToString();
859+
}
860+
846861
private string ticksToString(long ticks)
847862
{
848863
long seconds = ticks / 10000000;

‎NSF2SQL/NSF2SQL.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,19 @@
143143
<Version>1.8.9</Version>
144144
</PackageReference>
145145
<PackageReference Include="Google.Protobuf">
146-
<Version>3.25.2</Version>
146+
<Version>3.31.1</Version>
147147
</PackageReference>
148148
<PackageReference Include="interop.domino.dll">
149149
<Version>1.0.0</Version>
150150
</PackageReference>
151151
<PackageReference Include="K4os.Compression.LZ4">
152-
<Version>1.3.6</Version>
152+
<Version>1.3.8</Version>
153153
</PackageReference>
154154
<PackageReference Include="MySql.Data">
155-
<Version>8.3.0</Version>
155+
<Version>9.3.0</Version>
156156
</PackageReference>
157157
<PackageReference Include="SSH.NET">
158-
<Version>2023.0.1</Version>
158+
<Version>2025.0.0</Version>
159159
</PackageReference>
160160
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
161161
<Version>7.0.0-preview.2.22152.2</Version>

0 commit comments

Comments
 (0)