Starting on persistence of multiple project languages

archive-configurations/ELAR/fields.json5

@@ -1,5 +1,7 @@
 {
   project: [
+    { key: "vernacularIso3CodeAndName", visibility: "never" },
+    { key: "analysisIso3CodeAndName", visibility: "never" },
     { key: "collectionSubjectLanguages", visibility: "always" },
     { key: "collectionWorkingLanguages", visibility: "always" },
 

archive-configurations/lameta/fields.json5

@@ -30,6 +30,7 @@
     {
       key: "collectionSubjectLanguages",
       englishLabel: "Subject Languages",
+      xmlTag: "CollectionSubjectLanguages",
       visibility: "never",
       form: "primary",
       type: "languageChoices",
@@ -40,6 +41,7 @@
     },
     {
       key: "collectionWorkingLanguages",
+      xmlTag: "CollectionWorkingLanguages",
       englishLabel: "Working Languages",
       visibility: "never",
       form: "primary",

src/components/LanguageChoicesEditor.tsx

@@ -70,7 +70,7 @@ export const LanguageChoicesEditor: React.FunctionComponent<
   };
 
   const currentValueArray = props.field.text
-    .split(";")
+    .split(";") // TODO: move this serialization logic into the Field class
     .filter((c) => c.length > 0)
     .map((c) => c.trim())
     .map((code) => {
@@ -129,13 +129,12 @@ export const LanguageChoicesEditor: React.FunctionComponent<
           )
         : []; // if you delete the last member, you get null instead of []
 
+      // TODO: move this serialization logic into the Field class
       const s: string = newChoices
         .map((o) => {
-          if (o.value.startsWith("qaa-x-") && !o.label.startsWith("qaa")) {
-            return `${o.value}|${o.label}`;
-          } else return o.value;
+          return o.value;
         })
-        .join(";");
+        .join(";"); // why semicolong instead of comma? The particpants field as used semicolon for years.
       console.log("saving: " + s);
       props.field.setValueFromString(s);
     },

src/model/Project/Session/ReadSession.spec.ts

@@ -1,3 +1,4 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { SessionMetadataFile } from "./Session";
 import * as temp from "temp";
 import fs from "fs";

src/model/Project/WriteProject.spec.ts

@@ -4,6 +4,12 @@ import fs from "fs";
 import Path from "path";
 import { EncounteredVocabularyRegistry } from "./EncounteredVocabularyRegistry";
 import { describe, expect, it, beforeEach, afterEach } from "vitest";
+import {
+  setResultXml,
+  xexpect,
+  count,
+  value
+} from "../../other/xmlUnitTestUtils";
 let projectDirectory;
 let projectName;
 
@@ -53,6 +59,24 @@ describe("Project Write", () => {
   });
 });
 
+it("should write languages", () => {
+  const f = GetProjectFileWithOneField("unused", "");
+  f.properties.setText("collectionSubjectLanguages", "ab;cd;ef");
+  f.properties.setText("collectionWorkingLanguages", "gh;ij");
+  setResultXml(f.getXml());
+  xexpect("Project/CollectionSubjectLanguages").toHaveCount(1);
+  xexpect("Project/CollectionSubjectLanguages[text()='ab;cd;ef']").toHaveCount(
+    1
+  );
+  xexpect("Project/CollectionWorkingLanguages").toHaveCount(1);
+  xexpect("Project/CollectionWorkingLanguages[text()='gh;ij']").toHaveCount(1);
+  // and these we output for backwards compatibility
+  xexpect("Project/VernacularISO3CodeAndName").toHaveCount(1);
+  xexpect("Project/VernacularISO3CodeAndName[text()='ab']").toHaveCount(1);
+  xexpect("Project/AnalysisISO3CodeAndName").toHaveCount(1);
+  xexpect("Project/AnalysisISO3CodeAndName[text()='gh']").toHaveCount(1);
+});
+
 function AttemptRoundTripOfOneField(
   key: string,
   xmlTag: string,

src/model/file/File.spec.ts

@@ -1,4 +1,3 @@
-import { beforeEach, afterEach, describe, it } from "vitest";
 import { OtherFile } from "./File";
 import * as fs from "fs-extra";
 import * as Path from "path";

src/model/file/GetSayMoreXml.ts

@@ -80,7 +80,7 @@ export default function getSayMoreXml(
     throw error;
   }
 }
-//function writeElementsWeDontUnderstand() {}
+
 function writeSimplePropertyElements(
   root: xmlbuilder.XMLElementOrXMLNode,
   properties: Field[],
@@ -103,7 +103,23 @@ function writeSimplePropertyElements(
           doOutputTypeInXmlTags,
           false,
           "AccessProtocol",
-          "lameta 3 and following prefer archiveConfigurationName, this is written for compatibility with SayMore and older versions of lameta"
+          "lameta 3 and following use <ArchiveConfigurationName> as that matches what we're actually doing with it now. We still emit <AccessProtocol> for compatibility with SayMore and older versions of lameta"
+        );
+      }
+      if (field.key === "collectionSubjectLanguages") {
+        writeLanguageFieldForBackwardsCompat(
+          root,
+          field,
+          "VernacularISO3CodeAndName",
+          "lameta 3 and following use <CollectionSubjectLanguages> to store multiple languages. We still emit the first language as <VernacularISO3CodeAndName> for compatibility with SayMore and older versions of lameta"
+        );
+      }
+      if (field.key === "collectionWorkingLanguages") {
+        writeLanguageFieldForBackwardsCompat(
+          root,
+          field,
+          "AnalysisISO3CodeAndName",
+          "lameta 3 and following use <CollectionWorkingLanguages> to store multiple languages. We still emit the first language as <AnalysisISO3CodeAndName> for compatibility with SayMore and older versions of lameta"
         );
       }
     });
@@ -180,6 +196,30 @@ function writeContributions(
   });
 }
 
+function writeLanguageFieldForBackwardsCompat(
+  root: xmlbuilder.XMLElementOrXMLNode,
+  field: Field,
+  overrideTag?: string,
+  comment?: string
+) {
+  const { type, value } = field.typeAndValueEscapedForXml();
+
+  // SayMore Windows, at least through version 3.3, has inconsistent capitalization...
+  // for now we just use those same tags when writing so that the file can be opened in that SM
+  const tag =
+    overrideTag ||
+    (field.definition && field.definition.xmlTag
+      ? field.definition.xmlTag
+      : field.key);
+
+  if (comment) {
+    root.comment(comment);
+  }
+  const attributes: any = {};
+
+  root.element(tag, attributes, value.split(";")[0] || "").up();
+}
+
 function writeField(
   root: xmlbuilder.XMLElementOrXMLNode,
   field: Field,

src/other/xmlUnitTestUtils.ts

@@ -147,7 +147,7 @@ expect.extend({
   toHaveCount(xpath, expectedValue) {
     const matchCount = select(xpath).length;
     if (matchCount !== expectedValue) {
-      //      console.log(resultXml);
+      console.log(resultXml);
       return {
         message: () =>
           `expected ${xpath} to have ${expectedValue} matches, but got ${matchCount}`,