Merge pull request #138 from nfdi4plants/kevinf-patch-0.4.4

Kevinf patch 0.4.4
nfdi4plants · Mar 11, 2021 · 6cd6caa · 6cd6caa
2 parents 16c3099 + 622c816
commit 6cd6caa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.assets/assets/manifest.xml b/.assets/assets/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:ov="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="TaskPaneApp">
   <Id>5d6f5462-3401-48ec-9406-d12882e9ad83</Id>
-  <Version>0.4.3</Version>
+  <Version>0.4.4</Version>
   <ProviderName>Computational Systems Biology</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Swate"/>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+### 0.4.4+4ae3198 (Released 2021-3-11)
+* Additions:
+    * latest commit #4ae3198
+    * [[#4ae3198](https://github.com/nfdi4plants/Swate/commit/4ae31986bc4b1a24ccead037afbde4ced9ed7a44)] Update DB protocol.
+
 ### 0.4.3+9b7d7fe (Released 2021-3-9)
 * Additions:
     * latest commit #9b7d7fe

diff --git a/manifest.xml b/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:ov="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="TaskPaneApp">
   <Id>5d6f5462-3401-48ec-9406-d12882e9ad83</Id>
-  <Version>0.4.3</Version>
+  <Version>0.4.4</Version>
   <ProviderName>Computational Systems Biology</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Swate"/>

diff --git a/src/Server/ProtocolDB.fs b/src/Server/ProtocolDB.fs
@@ -89,14 +89,11 @@ let getXmlByProtocol cString (protocol:ProtocolTemplate) =
         .CommandText <- """
             SELECT * FROM ProtocolXml
             WHERE FK_Name = @name
-            AND FK_Version = @version
         """
 
     let nameParam = cmd.Parameters.Add("name",MySqlDbType.VarChar)
-    let versionParam = cmd.Parameters.Add("version",MySqlDbType.VarChar)
 
-    nameParam.Value     <- protocol.Name
-    versionParam.Value  <- protocol.Version
+    nameParam.Value <- protocol.Name
 
     use reader = cmd.ExecuteReader()
     let res = [|

diff --git a/src/Server/Version.fs b/src/Server/Version.fs
@@ -3,11 +3,11 @@ namespace System
 open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("SWATE")>]
-[<assembly: AssemblyVersionAttribute("0.4.3")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","09/03/2021")>]
+[<assembly: AssemblyVersionAttribute("0.4.4")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","11/03/2021")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SWATE"
-    let [<Literal>] AssemblyVersion = "0.4.3"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "09/03/2021"
+    let [<Literal>] AssemblyVersion = "0.4.4"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "11/03/2021"