From 766669695e4ae1c1e6abe01533f9bff22f15d11a Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Thu, 25 Jan 2024 14:41:16 +0000
Subject: [PATCH 01/44] Add infrastructure for full Thoth record ONIX 3.0
 output (currently identical to OverDrive, still contains logic/comments
 specific to it)

---
 thoth-app/src/models/work/mod.rs              |   14 +
 thoth-export-server/src/data.rs               |    8 +
 thoth-export-server/src/record.rs             |   19 +-
 .../src/specification_query.rs                |    1 +
 thoth-export-server/src/xml/mod.rs            |    2 +
 thoth-export-server/src/xml/onix3_thoth.rs    | 1422 +++++++++++++++++
 6 files changed, 1465 insertions(+), 1 deletion(-)
 create mode 100644 thoth-export-server/src/xml/onix3_thoth.rs

diff --git a/thoth-app/src/models/work/mod.rs b/thoth-app/src/models/work/mod.rs
index 95bc683d..2ff0f417 100644
--- a/thoth-app/src/models/work/mod.rs
+++ b/thoth-app/src/models/work/mod.rs
@@ -116,6 +116,7 @@ pub trait DisplayWork {
     fn marc21_thoth_endpoint(&self) -> String;
     fn marc21markup_thoth_endpoint(&self) -> String;
     fn marc21xml_thoth_endpoint(&self) -> String;
+    fn onix_thoth_endpoint(&self) -> String;
     fn onix_projectmuse_endpoint(&self) -> String;
     fn onix_oapen_endpoint(&self) -> String;
     fn onix_jstor_endpoint(&self) -> String;
@@ -156,6 +157,13 @@ impl DisplayWork for WorkWithRelations {
         )
     }
 
+    fn onix_thoth_endpoint(&self) -> String {
+        format!(
+            "{}/specifications/onix_3.0::thoth/work/{}",
+            THOTH_EXPORT_API, &self.work_id
+        )
+    }
+
     fn onix_projectmuse_endpoint(&self) -> String {
         format!(
             "{}/specifications/onix_3.0::project_muse/work/{}",
@@ -424,6 +432,12 @@ impl DisplayWork for WorkWithRelations {
                                     </div>
                                     <div class="dropdown-menu" id="dropdown-menu" role="menu">
                                         <div class="dropdown-content">
+                                            <a
+                                                href={self.onix_projectmuse_endpoint()}
+                                                class="dropdown-item"
+                                            >
+                                            {"ONIX 3.0 (Thoth)"}
+                                            </a>
                                             <a
                                                 href={self.onix_projectmuse_endpoint()}
                                                 class="dropdown-item"
diff --git a/thoth-export-server/src/data.rs b/thoth-export-server/src/data.rs
index 6ad38548..5badab85 100644
--- a/thoth-export-server/src/data.rs
+++ b/thoth-export-server/src/data.rs
@@ -7,6 +7,12 @@ use crate::specification::model::Specification;
 
 lazy_static! {
     pub(crate) static ref ALL_SPECIFICATIONS: Vec<Specification<'static>> = vec![
+        Specification {
+            id: "onix_3.0::thoth",
+            name: "Thoth ONIX 3.0",
+            format: concat!(env!("THOTH_EXPORT_API"), "/formats/onix_3.0"),
+            accepted_by: vec![concat!(env!("THOTH_EXPORT_API"), "/platforms/thoth"),],
+        },
         Specification {
             id: "onix_3.0::project_muse",
             name: "Project MUSE ONIX 3.0",
@@ -132,6 +138,7 @@ lazy_static! {
                     "/specifications/marc21markup::thoth"
                 ),
                 concat!(env!("THOTH_EXPORT_API"), "/specifications/marc21xml::thoth"),
+                concat!(env!("THOTH_EXPORT_API"), "/specifications/onix_3.0::thoth"),
             ],
         },
         Platform {
@@ -272,6 +279,7 @@ lazy_static! {
             name: "ONIX",
             version: Some("3.0"),
             specifications: vec![
+                concat!(env!("THOTH_EXPORT_API"), "/specifications/onix_3.0::thoth"),
                 concat!(
                     env!("THOTH_EXPORT_API"),
                     "/specifications/onix_3.0::project_muse"
diff --git a/thoth-export-server/src/record.rs b/thoth-export-server/src/record.rs
index dc6715e7..9b7d8c37 100644
--- a/thoth-export-server/src/record.rs
+++ b/thoth-export-server/src/record.rs
@@ -14,7 +14,7 @@ use crate::json::{JsonSpecification, JsonThoth};
 use crate::marc21::{Marc21MarkupThoth, Marc21RecordThoth, Marc21Specification};
 use crate::xml::{
     DoiDepositCrossref, Marc21XmlThoth, Onix21EbscoHost, Onix21ProquestEbrary, Onix3GoogleBooks,
-    Onix3Jstor, Onix3Oapen, Onix3Overdrive, Onix3ProjectMuse, XmlSpecification,
+    Onix3Jstor, Onix3Oapen, Onix3Overdrive, Onix3ProjectMuse, Onix3Thoth, XmlSpecification,
 };
 
 pub(crate) trait AsRecord {}
@@ -27,6 +27,7 @@ pub const DOCTYPE_ONIX21_REF: &str = "<!DOCTYPE ONIXMessage SYSTEM \"http://www.
 
 #[derive(Copy, Clone)]
 pub(crate) enum MetadataSpecification {
+    Onix3Thoth(Onix3Thoth),
     Onix3ProjectMuse(Onix3ProjectMuse),
     Onix3Oapen(Onix3Oapen),
     Onix3Jstor(Onix3Jstor),
@@ -78,6 +79,7 @@ where
 
     fn content_type(&self) -> &'static str {
         match &self.specification {
+            MetadataSpecification::Onix3Thoth(_) => Self::XML_MIME_TYPE,
             MetadataSpecification::Onix3ProjectMuse(_) => Self::XML_MIME_TYPE,
             MetadataSpecification::Onix3Oapen(_) => Self::XML_MIME_TYPE,
             MetadataSpecification::Onix3Jstor(_) => Self::XML_MIME_TYPE,
@@ -98,6 +100,7 @@ where
 
     fn file_name(&self) -> String {
         match &self.specification {
+            MetadataSpecification::Onix3Thoth(_) => self.xml_file_name(),
             MetadataSpecification::Onix3ProjectMuse(_) => self.xml_file_name(),
             MetadataSpecification::Onix3Oapen(_) => self.xml_file_name(),
             MetadataSpecification::Onix3Jstor(_) => self.xml_file_name(),
@@ -161,6 +164,9 @@ where
 impl MetadataRecord<Vec<Work>> {
     fn generate(&self) -> ThothResult<String> {
         match &self.specification {
+            MetadataSpecification::Onix3Thoth(onix3_thoth) => {
+                onix3_thoth.generate(&self.data, None)
+            }
             MetadataSpecification::Onix3ProjectMuse(onix3_project_muse) => {
                 onix3_project_muse.generate(&self.data, None)
             }
@@ -244,6 +250,7 @@ impl FromStr for MetadataSpecification {
 
     fn from_str(input: &str) -> ThothResult<Self> {
         match input {
+            "onix_3.0::thoth" => Ok(MetadataSpecification::Onix3Thoth(Onix3Thoth {})),
             "onix_3.0::project_muse" => {
                 Ok(MetadataSpecification::Onix3ProjectMuse(Onix3ProjectMuse {}))
             }
@@ -281,6 +288,7 @@ impl FromStr for MetadataSpecification {
 impl ToString for MetadataSpecification {
     fn to_string(&self) -> String {
         match self {
+            MetadataSpecification::Onix3Thoth(_) => "onix_3.0::thoth".to_string(),
             MetadataSpecification::Onix3ProjectMuse(_) => "onix_3.0::project_muse".to_string(),
             MetadataSpecification::Onix3Oapen(_) => "onix_3.0::oapen".to_string(),
             MetadataSpecification::Onix3Jstor(_) => "onix_3.0::jstor".to_string(),
@@ -332,6 +340,15 @@ mod tests {
             vec![],
         );
         assert_eq!(to_test.file_name(), "json__thoth__some_id.json".to_string());
+        let to_test = MetadataRecord::new(
+            "some_id".to_string(),
+            MetadataSpecification::Onix3Thoth(Onix3Thoth {}),
+            vec![],
+        );
+        assert_eq!(
+            to_test.file_name(),
+            "onix_3.0__thoth__some_id.xml".to_string()
+        );
         let to_test = MetadataRecord::new(
             "some_id".to_string(),
             MetadataSpecification::Onix3ProjectMuse(Onix3ProjectMuse {}),
diff --git a/thoth-export-server/src/specification_query.rs b/thoth-export-server/src/specification_query.rs
index 4f1f7c7e..2ef6b919 100644
--- a/thoth-export-server/src/specification_query.rs
+++ b/thoth-export-server/src/specification_query.rs
@@ -105,6 +105,7 @@ impl TryFrom<QueryConfiguration> for QueryParameters {
 
     fn try_from(q: QueryConfiguration) -> ThothResult<Self> {
         match q.specification {
+            MetadataSpecification::Onix3Thoth(_) => Ok(QueryParameters::new().with_all()),
             MetadataSpecification::Onix3ProjectMuse(_) => Ok(QueryParameters::new()
                 .with_all()
                 .without_relations()
diff --git a/thoth-export-server/src/xml/mod.rs b/thoth-export-server/src/xml/mod.rs
index 5c9ab5df..963cfadd 100644
--- a/thoth-export-server/src/xml/mod.rs
+++ b/thoth-export-server/src/xml/mod.rs
@@ -76,6 +76,8 @@ pub(crate) trait XmlElementBlock<T: XmlSpecification> {
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()>;
 }
 
+mod onix3_thoth;
+pub(crate) use onix3_thoth::Onix3Thoth;
 mod onix3_project_muse;
 pub(crate) use onix3_project_muse::Onix3ProjectMuse;
 mod onix3_oapen;
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
new file mode 100644
index 00000000..0319869c
--- /dev/null
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -0,0 +1,1422 @@
+use chrono::Utc;
+use std::collections::HashMap;
+use std::io::Write;
+use thoth_client::{
+    ContributionType, CurrencyCode, LanguageRelation, PublicationType, SubjectType, Work,
+    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkPublications, WorkStatus,
+    WorkType,
+};
+use xml::writer::{EventWriter, XmlEvent};
+
+use super::{write_element_block, XmlElement, XmlSpecification};
+use crate::xml::{write_full_element_block, XmlElementBlock, ONIX3_NS};
+use thoth_errors::{ThothError, ThothResult};
+
+#[derive(Copy, Clone)]
+pub struct Onix3Thoth {}
+
+const ONIX_ERROR: &str = "onix_3.0::thoth";
+
+impl XmlSpecification for Onix3Thoth {
+    fn handle_event<W: Write>(w: &mut EventWriter<W>, works: &[Work]) -> ThothResult<()> {
+        write_full_element_block("ONIXMessage", Some(ONIX3_NS.to_vec()), w, |w| {
+            write_element_block("Header", w, |w| {
+                write_element_block("Sender", w, |w| {
+                    write_element_block("SenderName", w, |w| {
+                        w.write(XmlEvent::Characters("Thoth")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("EmailAddress", w, |w| {
+                        w.write(XmlEvent::Characters("distribution@thoth.pub"))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+                write_element_block("SentDateTime", w, |w| {
+                    w.write(XmlEvent::Characters(
+                        &Utc::now().format("%Y%m%dT%H%M%S").to_string(),
+                    ))
+                    .map_err(|e| e.into())
+                })
+            })?;
+
+            match works {
+                [] => Err(ThothError::IncompleteMetadataRecord(
+                    ONIX_ERROR.to_string(),
+                    "Not enough data".to_string(),
+                )),
+                [work] => XmlElementBlock::<Onix3Thoth>::xml_element(work, w),
+                _ => {
+                    for work in works.iter() {
+                        // Do not include Chapters in full publisher metadata record
+                        // (assumes that a publisher will always have more than one work)
+                        if work.work_type != WorkType::BOOK_CHAPTER {
+                            XmlElementBlock::<Onix3Thoth>::xml_element(work, w).ok();
+                        }
+                    }
+                    Ok(())
+                }
+            }
+        })
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for Work {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        // Don't output works with no publication date (mandatory in OverDrive)
+        if self.publication_date.is_none() {
+            Err(ThothError::IncompleteMetadataRecord(
+                ONIX_ERROR.to_string(),
+                "Missing Publication Date".to_string(),
+            ))
+        // Don't output works with no long abstract (Description element mandatory in OverDrive)
+        } else if self.long_abstract.is_none() {
+            Err(ThothError::IncompleteMetadataRecord(
+                ONIX_ERROR.to_string(),
+                "Missing Long Abstract".to_string(),
+            ))
+        // Don't output works with no language codes (mandatory in OverDrive)
+        } else if self.languages.is_empty() {
+            Err(ThothError::IncompleteMetadataRecord(
+                ONIX_ERROR.to_string(),
+                "Missing Language Code(s)".to_string(),
+            ))
+        // We can only generate the document if there's an EPUB or PDF
+        // with a non-zero price (OverDrive only accepts priced items)
+        } else if let Some(main_publication) = self
+            .publications
+            .iter()
+            // For preference, distribute the EPUB only
+            .find(|p| {
+                p.publication_type.eq(&PublicationType::EPUB)
+                    && p.locations
+                        .iter()
+                        .any(|l| l.canonical && l.full_text_url.is_some())
+                    // Thoth database only accepts non-zero prices
+                    && !p.prices.is_empty()
+            })
+            // If no EPUB is found, distribute the PDF only
+            .or_else(|| {
+                self.publications.iter().find(|p| {
+                    p.publication_type.eq(&PublicationType::PDF)
+                        && p.locations
+                            .iter()
+                            .any(|l| l.canonical && l.full_text_url.is_some())
+                        // Thoth database only accepts non-zero prices
+                        && !p.prices.is_empty()
+                })
+            })
+        {
+            let work_id = format!("urn:uuid:{}", self.work_id);
+            let (main_isbn, isbns) = get_publications_data(&self.publications, main_publication);
+            write_element_block("Product", w, |w| {
+                write_element_block("RecordReference", w, |w| {
+                    w.write(XmlEvent::Characters(&work_id))
+                        .map_err(|e| e.into())
+                })?;
+                // 03 Notification confirmed on publication
+                write_element_block("NotificationType", w, |w| {
+                    w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                })?;
+                // 01 Publisher
+                write_element_block("RecordSourceType", w, |w| {
+                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                })?;
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 01 Proprietary
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&work_id))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 15 ISBN-13
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("15")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&main_isbn))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+                if let Some(doi) = &self.doi {
+                    write_element_block("ProductIdentifier", w, |w| {
+                        write_element_block("ProductIDType", w, |w| {
+                            w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDValue", w, |w| {
+                            w.write(XmlEvent::Characters(&doi.to_string()))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                }
+                write_element_block("DescriptiveDetail", w, |w| {
+                    // 00 Single-component retail product
+                    write_element_block("ProductComposition", w, |w| {
+                        w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                    })?;
+                    // EB Digital download and online
+                    write_element_block("ProductForm", w, |w| {
+                        w.write(XmlEvent::Characters("EB")).map_err(|e| e.into())
+                    })?;
+                    let digital_type = match main_publication.publication_type {
+                        PublicationType::EPUB => "E101",
+                        PublicationType::PDF => "E107",
+                        _ => unreachable!(),
+                    };
+                    write_element_block("ProductFormDetail", w, |w| {
+                        w.write(XmlEvent::Characters(digital_type))
+                            .map_err(|e| e.into())
+                    })?;
+                    // 10 Text (eye-readable)
+                    write_element_block("PrimaryContentType", w, |w| {
+                        w.write(XmlEvent::Characters("10")).map_err(|e| e.into())
+                    })?;
+                    if let Some(license) = &self.license {
+                        write_element_block("EpubLicense", w, |w| {
+                            write_element_block("EpubLicenseName", w, |w| {
+                                w.write(XmlEvent::Characters("Creative Commons License"))
+                                    .map_err(|e| e.into())
+                            })?;
+                            write_element_block("EpubLicenseExpression", w, |w| {
+                                write_element_block("EpubLicenseExpressionType", w, |w| {
+                                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("EpubLicenseExpressionLink", w, |w| {
+                                    w.write(XmlEvent::Characters(license)).map_err(|e| e.into())
+                                })
+                            })
+                        })?;
+                    }
+                    for issue in &self.issues {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(issue, w).ok();
+                    }
+                    write_element_block("TitleDetail", w, |w| {
+                        // 01 Distinctive title (book)
+                        write_element_block("TitleType", w, |w| {
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("TitleElement", w, |w| {
+                            // 01 Product
+                            write_element_block("TitleElementLevel", w, |w| {
+                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("TitleText", w, |w| {
+                                w.write(XmlEvent::Characters(&self.title))
+                                    .map_err(|e| e.into())
+                            })?;
+                            if let Some(subtitle) = &self.subtitle {
+                                write_element_block("Subtitle", w, |w| {
+                                    w.write(XmlEvent::Characters(subtitle))
+                                        .map_err(|e| e.into())
+                                })?;
+                            }
+                            Ok(())
+                        })
+                    })?;
+                    for contribution in &self.contributions {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(contribution, w).ok();
+                    }
+                    for language in &self.languages {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(language, w).ok();
+                    }
+                    if let Some(page_count) = self.page_count {
+                        write_element_block("Extent", w, |w| {
+                            // 00 Main content
+                            write_element_block("ExtentType", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("ExtentValue", w, |w| {
+                                w.write(XmlEvent::Characters(&page_count.to_string()))
+                                    .map_err(|e| e.into())
+                            })?;
+                            // 03 Pages
+                            write_element_block("ExtentUnit", w, |w| {
+                                w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    for subject in &self.subjects {
+                        write_element_block("Subject", w, |w| {
+                            XmlElement::<Onix3Thoth>::xml_element(&subject.subject_type, w)?;
+                            write_element_block("SubjectCode", w, |w| {
+                                w.write(XmlEvent::Characters(&subject.subject_code))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    write_element_block("Audience", w, |w| {
+                        // 01 ONIX audience codes
+                        write_element_block("AudienceCodeType", w, |w| {
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                        })?;
+                        // 06 Professional and scholarly
+                        write_element_block("AudienceCodeValue", w, |w| {
+                            w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                        })
+                    })
+                })?;
+                write_element_block("CollateralDetail", w, |w| {
+                    write_element_block("TextContent", w, |w| {
+                        // 03 Description ("30 Abstract" not implemented in OverDrive)
+                        write_element_block("TextType", w, |w| {
+                            w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                        })?;
+                        // 00 Unrestricted
+                        write_element_block("ContentAudience", w, |w| {
+                            w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                        })?;
+                        write_full_element_block("Text", Some(vec![("language", "eng")]), w, |w| {
+                            w.write(XmlEvent::Characters(self.long_abstract.as_ref().unwrap()))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                    if let Some(toc) = &self.toc {
+                        write_element_block("TextContent", w, |w| {
+                            // 04 Table of contents
+                            write_element_block("TextType", w, |w| {
+                                w.write(XmlEvent::Characters("04")).map_err(|e| e.into())
+                            })?;
+                            // 00 Unrestricted
+                            write_element_block("ContentAudience", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            write_full_element_block(
+                                "Text",
+                                Some(vec![("language", "eng")]),
+                                w,
+                                |w| w.write(XmlEvent::Characters(toc)).map_err(|e| e.into()),
+                            )
+                        })?;
+                    }
+                    if let Some(cover_url) = &self.cover_url {
+                        write_element_block("SupportingResource", w, |w| {
+                            // 01 Front cover
+                            write_element_block("ResourceContentType", w, |w| {
+                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                            })?;
+                            // 00 Unrestricted
+                            write_element_block("ContentAudience", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            // 03 Image
+                            write_element_block("ResourceMode", w, |w| {
+                                w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("ResourceVersion", w, |w| {
+                                // 02 Downloadable file
+                                write_element_block("ResourceForm", w, |w| {
+                                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("ResourceLink", w, |w| {
+                                    w.write(XmlEvent::Characters(cover_url))
+                                        .map_err(|e| e.into())
+                                })
+                            })
+                        })?;
+                    }
+                    Ok(())
+                })?;
+                write_element_block("PublishingDetail", w, |w| {
+                    write_element_block("Imprint", w, |w| {
+                        write_element_block("ImprintName", w, |w| {
+                            w.write(XmlEvent::Characters(&self.imprint.imprint_name))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                    write_element_block("Publisher", w, |w| {
+                        // 01 Publisher
+                        write_element_block("PublishingRole", w, |w| {
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("PublisherName", w, |w| {
+                            w.write(XmlEvent::Characters(&self.imprint.publisher.publisher_name))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                    for funding in &self.fundings {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(funding, w).ok();
+                    }
+                    if let Some(place) = &self.place {
+                        write_element_block("CityOfPublication", w, |w| {
+                            w.write(XmlEvent::Characters(place)).map_err(|e| e.into())
+                        })?;
+                    }
+                    XmlElement::<Onix3Thoth>::xml_element(&self.work_status, w)?;
+                    write_element_block("PublishingDate", w, |w| {
+                        write_element_block("PublishingDateRole", w, |w| {
+                            // 01 Publication date
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                        })?;
+                        // dateformat="00" YYYYMMDD
+                        write_full_element_block("Date", Some(vec![("dateformat", "00")]), w, |w| {
+                            w.write(XmlEvent::Characters(
+                                &self.publication_date.unwrap().format("%Y%m%d").to_string(),
+                            ))
+                            .map_err(|e| e.into())
+                        })
+                    })?;
+                    write_element_block("SalesRights", w, |w| {
+                        // 02 For sale with non-exclusive rights in the specified countries or territories
+                        write_element_block("SalesRightsType", w, |w| {
+                            w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("Territory", w, |w| {
+                            write_element_block("RegionsIncluded", w, |w| {
+                                w.write(XmlEvent::Characters("WORLD")).map_err(|e| e.into())
+                            })
+                        })
+                    })
+                })?;
+                if !isbns.is_empty() {
+                    write_element_block("RelatedMaterial", w, |w| {
+                        for isbn in &isbns {
+                            write_element_block("RelatedProduct", w, |w| {
+                                // 06 Alternative format
+                                write_element_block("ProductRelationCode", w, |w| {
+                                    w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("ProductIdentifier", w, |w| {
+                                    // 15 ISBN-13
+                                    write_element_block("ProductIDType", w, |w| {
+                                        w.write(XmlEvent::Characters("15")).map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("IDValue", w, |w| {
+                                        w.write(XmlEvent::Characters(isbn)).map_err(|e| e.into())
+                                    })
+                                })
+                            })?;
+                        }
+                        Ok(())
+                    })?;
+                }
+                write_element_block("ProductSupply", w, |w| {
+                    write_element_block("Market", w, |w| {
+                        write_element_block("Territory", w, |w| {
+                            write_element_block("RegionsIncluded", w, |w| {
+                                w.write(XmlEvent::Characters("WORLD")).map_err(|e| e.into())
+                            })
+                        })
+                    })?;
+                    let mut supplies: HashMap<String, (String, String)> = HashMap::new();
+                    supplies.insert(
+                        // Main publication's canonical location is guaranteed to have a full text URL
+                        main_publication
+                            .locations
+                            .iter()
+                            .find(|l| l.canonical)
+                            .and_then(|l| l.full_text_url.clone())
+                            .unwrap(),
+                        (
+                            "29".to_string(),
+                            "Publisher's website: download the title".to_string(),
+                        ),
+                    );
+                    if let Some(landing_page) = &self.landing_page {
+                        supplies.insert(
+                            landing_page.to_string(),
+                            (
+                                "01".to_string(),
+                                "Publisher's website: web shop".to_string(),
+                            ),
+                        );
+                    }
+                    for (url, description) in supplies.iter() {
+                        write_element_block("SupplyDetail", w, |w| {
+                            write_element_block("Supplier", w, |w| {
+                                // 09 Publisher to end-customers
+                                write_element_block("SupplierRole", w, |w| {
+                                    w.write(XmlEvent::Characters("09")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("SupplierName", w, |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &self.imprint.publisher.publisher_name,
+                                    ))
+                                    .map_err(|e| e.into())
+                                })?;
+                                write_element_block("Website", w, |w| {
+                                    // 01 Publisher’s corporate website
+                                    write_element_block("WebsiteRole", w, |w| {
+                                        w.write(XmlEvent::Characters(&description.0))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("WebsiteDescription", w, |w| {
+                                        w.write(XmlEvent::Characters(&description.1))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("WebsiteLink", w, |w| {
+                                        w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                    })
+                                })
+                            })?;
+                            // 20 Available from us (form of availability unspecified)
+                            // (99 Contact supplier is not supported by OverDrive)
+                            write_element_block("ProductAvailability", w, |w| {
+                                w.write(XmlEvent::Characters("20")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("SupplyDate", w, |w| {
+                                write_element_block("SupplyDateRole", w, |w| {
+                                    // 02 Embargo Date
+                                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                })?;
+                                // dateformat="00" YYYYMMDD
+                                write_full_element_block(
+                                    "Date",
+                                    Some(vec![("dateformat", "00")]),
+                                    w,
+                                    |w| {
+                                        w.write(XmlEvent::Characters(
+                                            &self
+                                                .publication_date
+                                                .unwrap()
+                                                .format("%Y%m%d")
+                                                .to_string(),
+                                        ))
+                                        .map_err(|e| e.into())
+                                    },
+                                )
+                            })?;
+                            // Price element is required for OverDrive. Assume the USD price is canonical.
+                            if let Some(price) = main_publication
+                                .prices
+                                .iter()
+                                .find(|pr| {
+                                    // Thoth database only accepts non-zero prices
+                                    pr.currency_code.eq(&CurrencyCode::USD)
+                                })
+                                .map(|pr| pr.unit_price)
+                            {
+                                let formatted_price = format!("{price:.2}");
+                                write_element_block("Price", w, |w| {
+                                    // 02 RRP including tax
+                                    write_element_block("PriceType", w, |w| {
+                                        w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("PriceAmount", w, |w| {
+                                        w.write(XmlEvent::Characters(&formatted_price))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("CurrencyCode", w, |w| {
+                                        w.write(XmlEvent::Characters("USD")).map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("Territory", w, |w| {
+                                        write_element_block("RegionsIncluded", w, |w| {
+                                            w.write(XmlEvent::Characters("WORLD"))
+                                                .map_err(|e| e.into())
+                                        })
+                                    })
+                                })
+                            } else {
+                                Err(ThothError::IncompleteMetadataRecord(
+                                    ONIX_ERROR.to_string(),
+                                    "No USD price found".to_string(),
+                                ))
+                            }
+                        })?;
+                    }
+                    Ok(())
+                })
+            })
+        } else {
+            Err(ThothError::IncompleteMetadataRecord(
+                ONIX_ERROR.to_string(),
+                "No priced EPUB or PDF URL".to_string(),
+            ))
+        }
+    }
+}
+
+fn get_publications_data(
+    publications: &[WorkPublications],
+    main_publication: &WorkPublications,
+) -> (String, Vec<String>) {
+    let mut main_isbn = "".to_string();
+    let mut isbns: Vec<String> = Vec::new();
+
+    for publication in publications {
+        if let Some(isbn) = &publication.isbn.as_ref() {
+            isbns.push(isbn.to_hyphenless_string());
+            // The default product ISBN is the main publication's (EPUB or PDF)
+            if publication
+                .publication_id
+                .eq(&main_publication.publication_id)
+            {
+                main_isbn = isbn.to_hyphenless_string();
+            }
+            // If the main publication has no ISBN, use either the PDF's or the paperback's
+            // (no guarantee as to which will be chosen)
+            if (publication.publication_type.eq(&PublicationType::PDF)
+                || publication.publication_type.eq(&PublicationType::PAPERBACK))
+                && main_isbn.is_empty()
+            {
+                main_isbn = isbn.to_hyphenless_string();
+            }
+        }
+    }
+
+    (main_isbn, isbns)
+}
+
+impl XmlElement<Onix3Thoth> for WorkStatus {
+    const ELEMENT: &'static str = "PublishingStatus";
+
+    fn value(&self) -> &'static str {
+        match self {
+            WorkStatus::UNSPECIFIED => "00",
+            WorkStatus::CANCELLED => "01",
+            WorkStatus::FORTHCOMING => "02",
+            WorkStatus::POSTPONED_INDEFINITELY => "03",
+            WorkStatus::ACTIVE => "04",
+            WorkStatus::NO_LONGER_OUR_PRODUCT => "05",
+            WorkStatus::OUT_OF_STOCK_INDEFINITELY => "06",
+            WorkStatus::OUT_OF_PRINT => "07",
+            WorkStatus::INACTIVE => "08",
+            WorkStatus::UNKNOWN => "09",
+            WorkStatus::REMAINDERED => "10",
+            WorkStatus::WITHDRAWN_FROM_SALE => "11",
+            WorkStatus::RECALLED => "15",
+            WorkStatus::Other(_) => unreachable!(),
+        }
+    }
+}
+
+impl XmlElement<Onix3Thoth> for SubjectType {
+    const ELEMENT: &'static str = "SubjectSchemeIdentifier";
+
+    fn value(&self) -> &'static str {
+        match self {
+            SubjectType::BIC => "12",
+            SubjectType::BISAC => "10",
+            SubjectType::KEYWORD => "20",
+            SubjectType::LCC => "04",
+            SubjectType::THEMA => "93",
+            SubjectType::CUSTOM => "B2",
+            SubjectType::Other(_) => unreachable!(),
+        }
+    }
+}
+
+impl XmlElement<Onix3Thoth> for LanguageRelation {
+    const ELEMENT: &'static str = "LanguageRole";
+
+    fn value(&self) -> &'static str {
+        match self {
+            LanguageRelation::ORIGINAL => "01",
+            LanguageRelation::TRANSLATED_FROM => "02",
+            LanguageRelation::TRANSLATED_INTO => "01",
+            LanguageRelation::Other(_) => unreachable!(),
+        }
+    }
+}
+
+impl XmlElement<Onix3Thoth> for ContributionType {
+    const ELEMENT: &'static str = "ContributorRole";
+
+    fn value(&self) -> &'static str {
+        match self {
+            ContributionType::AUTHOR => "A01",
+            ContributionType::EDITOR => "B01",
+            ContributionType::TRANSLATOR => "B06",
+            ContributionType::PHOTOGRAPHER => "A13",
+            ContributionType::ILLUSTRATOR => "A12",
+            ContributionType::MUSIC_EDITOR => "B25",
+            ContributionType::FOREWORD_BY => "A23",
+            ContributionType::INTRODUCTION_BY => "A24",
+            ContributionType::AFTERWORD_BY => "A19",
+            ContributionType::PREFACE_BY => "A15",
+            ContributionType::SOFTWARE_BY => "A30",
+            ContributionType::RESEARCH_BY => "A51",
+            ContributionType::CONTRIBUTIONS_BY => "A32",
+            ContributionType::INDEXER => "A34",
+            ContributionType::Other(_) => unreachable!(),
+        }
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for WorkContributions {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("Contributor", w, |w| {
+            write_element_block("SequenceNumber", w, |w| {
+                w.write(XmlEvent::Characters(&self.contribution_ordinal.to_string()))
+                    .map_err(|e| e.into())
+            })?;
+            XmlElement::<Onix3Thoth>::xml_element(&self.contribution_type, w)?;
+
+            if let Some(orcid) = &self.contributor.orcid {
+                write_element_block("NameIdentifier", w, |w| {
+                    write_element_block("NameIDType", w, |w| {
+                        w.write(XmlEvent::Characters("21")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&orcid.to_string()))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+            }
+            if let Some(first_name) = &self.first_name {
+                write_element_block("NamesBeforeKey", w, |w| {
+                    w.write(XmlEvent::Characters(first_name))
+                        .map_err(|e| e.into())
+                })?;
+                write_element_block("KeyNames", w, |w| {
+                    w.write(XmlEvent::Characters(&self.last_name))
+                        .map_err(|e| e.into())
+                })?;
+            } else {
+                write_element_block("PersonName", w, |w| {
+                    w.write(XmlEvent::Characters(&self.full_name))
+                        .map_err(|e| e.into())
+                })?;
+            }
+            Ok(())
+        })
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for WorkLanguages {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("Language", w, |w| {
+            XmlElement::<Onix3Thoth>::xml_element(&self.language_relation, w).ok();
+            // not worth implementing XmlElement for LanguageCode as all cases would
+            // need to be exhaustively matched and the codes are equivalent anyway
+            write_element_block("LanguageCode", w, |w| {
+                w.write(XmlEvent::Characters(
+                    &self.language_code.to_string().to_lowercase(),
+                ))
+                .map_err(|e| e.into())
+            })
+        })
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for WorkIssues {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("Collection", w, |w| {
+            // 10 Publisher collection (e.g. series)
+            write_element_block("CollectionType", w, |w| {
+                w.write(XmlEvent::Characters("10")).map_err(|e| e.into())
+            })?;
+            write_element_block("CollectionIdentifier", w, |w| {
+                // 02 ISSN
+                write_element_block("CollectionIDType", w, |w| {
+                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                })?;
+                write_element_block("IDValue", w, |w| {
+                    w.write(XmlEvent::Characters(
+                        &self.series.issn_digital.replace('-', ""),
+                    ))
+                    .map_err(|e| e.into())
+                })
+            })?;
+            write_element_block("TitleDetail", w, |w| {
+                // 01 Cover title (serial)
+                write_element_block("TitleType", w, |w| {
+                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                })?;
+                write_element_block("TitleElement", w, |w| {
+                    // 02 Collection level
+                    write_element_block("TitleElementLevel", w, |w| {
+                        w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("PartNumber", w, |w| {
+                        w.write(XmlEvent::Characters(&self.issue_ordinal.to_string()))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("TitleText", w, |w| {
+                        w.write(XmlEvent::Characters(&self.series.series_name))
+                            .map_err(|e| e.into())
+                    })
+                })
+            })
+        })
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for WorkFundings {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("Publisher", w, |w| {
+            // 16 Funding body
+            write_element_block("PublishingRole", w, |w| {
+                w.write(XmlEvent::Characters("16")).map_err(|e| e.into())
+            })?;
+            write_element_block("PublisherName", w, |w| {
+                w.write(XmlEvent::Characters(&self.institution.institution_name))
+                    .map_err(|e| e.into())
+            })?;
+            let mut identifiers: HashMap<String, String> = HashMap::new();
+            if let Some(program) = &self.program {
+                identifiers.insert("programname".to_string(), program.to_string());
+            }
+            if let Some(project_name) = &self.project_name {
+                identifiers.insert("projectname".to_string(), project_name.to_string());
+            }
+            if let Some(grant_number) = &self.grant_number {
+                identifiers.insert("grantnumber".to_string(), grant_number.to_string());
+            }
+            if !identifiers.is_empty() {
+                write_element_block("Funding", w, |w| {
+                    for (typename, value) in &identifiers {
+                        write_element_block("FundingIdentifier", w, |w| {
+                            // 01 Proprietary
+                            write_element_block("FundingIDType", w, |w| {
+                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("IDTypeName", w, |w| {
+                                w.write(XmlEvent::Characters(typename))
+                                    .map_err(|e| e.into())
+                            })?;
+                            write_element_block("IDValue", w, |w| {
+                                w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    Ok(())
+                })?;
+            }
+            Ok(())
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    // Testing note: XML nodes cannot be guaranteed to be output in the same order every time
+    // We therefore rely on `assert!(contains)` rather than `assert_eq!`
+    use super::*;
+    use std::str::FromStr;
+    use thoth_api::model::Doi;
+    use thoth_api::model::Isbn;
+    use thoth_api::model::Orcid;
+    use thoth_client::{
+        ContributionType, LanguageCode, LanguageRelation, LocationPlatform, PublicationType,
+        WorkContributionsContributor, WorkImprint, WorkImprintPublisher, WorkIssuesSeries,
+        WorkPublicationsLocations, WorkPublicationsPrices, WorkStatus, WorkSubjects, WorkType,
+    };
+    use uuid::Uuid;
+
+    fn generate_test_output(expect_ok: bool, input: &impl XmlElementBlock<Onix3Thoth>) -> String {
+        // Helper function based on `XmlSpecification::generate`
+        let mut buffer = Vec::new();
+        let mut writer = xml::writer::EmitterConfig::new()
+            .perform_indent(true)
+            .create_writer(&mut buffer);
+        let wrapped_output = XmlElementBlock::<Onix3Thoth>::xml_element(input, &mut writer)
+            .map(|_| buffer)
+            .and_then(|xml| {
+                String::from_utf8(xml)
+                    .map_err(|_| ThothError::InternalError("Could not parse XML".to_string()))
+            });
+        if expect_ok {
+            assert!(wrapped_output.is_ok());
+            wrapped_output.unwrap()
+        } else {
+            assert!(wrapped_output.is_err());
+            wrapped_output.unwrap_err().to_string()
+        }
+    }
+
+    #[test]
+    fn test_onix3_thoth_contributions() {
+        let mut test_contribution = WorkContributions {
+            contribution_type: ContributionType::AUTHOR,
+            first_name: Some("Author".to_string()),
+            last_name: "1".to_string(),
+            full_name: "Author 1".to_string(),
+            main_contribution: true,
+            biography: None,
+            contribution_ordinal: 1,
+            contributor: WorkContributionsContributor {
+                orcid: Some(Orcid::from_str("https://orcid.org/0000-0002-0000-0001").unwrap()),
+                website: None,
+            },
+            affiliations: vec![],
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <SequenceNumber>1</SequenceNumber>"#));
+        assert!(output.contains(r#"  <ContributorRole>A01</ContributorRole>"#));
+        assert!(output.contains(r#"  <NameIdentifier>"#));
+        assert!(output.contains(r#"    <NameIDType>21</NameIDType>"#));
+        assert!(output.contains(r#"    <IDValue>0000-0002-0000-0001</IDValue>"#));
+        assert!(output.contains(r#"  </NameIdentifier>"#));
+        // Given name is output as NamesBeforeKey and family name as KeyNames
+        assert!(output.contains(r#"  <NamesBeforeKey>Author</NamesBeforeKey>"#));
+        assert!(output.contains(r#"  <KeyNames>1</KeyNames>"#));
+        // PersonName is not output when given name is supplied
+        assert!(!output.contains(r#"  <PersonName>Author 1</PersonName>"#));
+
+        // Change all possible values to test that output is updated
+        test_contribution.contribution_type = ContributionType::EDITOR;
+        test_contribution.contribution_ordinal = 2;
+        test_contribution.contributor.orcid = None;
+        test_contribution.first_name = None;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <SequenceNumber>2</SequenceNumber>"#));
+        assert!(output.contains(r#"  <ContributorRole>B01</ContributorRole>"#));
+        // No ORCID supplied
+        assert!(!output.contains(r#"  <NameIdentifier>"#));
+        assert!(!output.contains(r#"    <NameIDType>21</NameIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>0000-0002-0000-0001</IDValue>"#));
+        assert!(!output.contains(r#"  </NameIdentifier>"#));
+        // No given name supplied, so PersonName is output instead of KeyNames and NamesBeforeKey
+        assert!(!output.contains(r#"  <NamesBeforeKey>Author</NamesBeforeKey>"#));
+        assert!(!output.contains(r#"  <KeyNames>1</KeyNames>"#));
+        assert!(output.contains(r#"  <PersonName>Author 1</PersonName>"#));
+
+        // Test all remaining contributor roles
+        test_contribution.contribution_type = ContributionType::TRANSLATOR;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>B06</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::PHOTOGRAPHER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A13</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::ILLUSTRATOR;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A12</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::MUSIC_EDITOR;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>B25</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::FOREWORD_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A23</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INTRODUCTION_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A24</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::AFTERWORD_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A19</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::PREFACE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+    }
+
+    #[test]
+    fn test_onix3_thoth_languages() {
+        let mut test_language = WorkLanguages {
+            language_code: LanguageCode::SPA,
+            language_relation: LanguageRelation::TRANSLATED_FROM,
+            main_language: true,
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_language);
+        assert!(output.contains(r#"<Language>"#));
+        assert!(output.contains(r#"  <LanguageRole>02</LanguageRole>"#));
+        assert!(output.contains(r#"  <LanguageCode>spa</LanguageCode>"#));
+
+        // Change all possible values to test that output is updated
+        test_language.language_code = LanguageCode::WEL;
+        for language_relation in [
+            LanguageRelation::ORIGINAL,
+            LanguageRelation::TRANSLATED_INTO,
+        ] {
+            test_language.language_relation = language_relation;
+            let output = generate_test_output(true, &test_language);
+            assert!(output.contains(r#"<Language>"#));
+            assert!(output.contains(r#"  <LanguageRole>01</LanguageRole>"#));
+            assert!(output.contains(r#"  <LanguageCode>wel</LanguageCode>"#));
+        }
+    }
+
+    #[test]
+    fn test_onix3_thoth_issues() {
+        let mut test_issue = WorkIssues {
+            issue_ordinal: 1,
+            series: WorkIssuesSeries {
+                series_type: thoth_client::SeriesType::JOURNAL,
+                series_name: "Name of series".to_string(),
+                issn_print: "1234-5678".to_string(),
+                issn_digital: "8765-4321".to_string(),
+                series_url: None,
+                series_description: None,
+                series_cfp_url: None,
+            },
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_issue);
+        assert!(output.contains(r#"<Collection>"#));
+        assert!(output.contains(r#"  <CollectionType>10</CollectionType>"#));
+        assert!(output.contains(r#"  <CollectionIdentifier>"#));
+        assert!(output.contains(r#"    <CollectionIDType>02</CollectionIDType>"#));
+        assert!(output.contains(r#"    <IDValue>87654321</IDValue>"#));
+        assert!(output.contains(r#"  <TitleDetail>"#));
+        assert!(output.contains(r#"    <TitleType>01</TitleType>"#));
+        assert!(output.contains(r#"    <TitleElement>"#));
+        assert!(output.contains(r#"      <TitleElementLevel>02</TitleElementLevel>"#));
+        assert!(output.contains(r#"      <PartNumber>1</PartNumber>"#));
+        assert!(output.contains(r#"      <TitleText>Name of series</TitleText>"#));
+
+        // Change all possible values to test that output is updated
+        test_issue.issue_ordinal = 2;
+        test_issue.series.series_name = "Different series".to_string();
+        test_issue.series.issn_digital = "1111-2222".to_string();
+        let output = generate_test_output(true, &test_issue);
+        assert!(output.contains(r#"<Collection>"#));
+        assert!(output.contains(r#"  <CollectionType>10</CollectionType>"#));
+        assert!(output.contains(r#"  <CollectionIdentifier>"#));
+        assert!(output.contains(r#"    <CollectionIDType>02</CollectionIDType>"#));
+        assert!(output.contains(r#"    <IDValue>11112222</IDValue>"#));
+        assert!(output.contains(r#"  <TitleDetail>"#));
+        assert!(output.contains(r#"    <TitleType>01</TitleType>"#));
+        assert!(output.contains(r#"    <TitleElement>"#));
+        assert!(output.contains(r#"      <TitleElementLevel>02</TitleElementLevel>"#));
+        assert!(output.contains(r#"      <PartNumber>2</PartNumber>"#));
+        assert!(output.contains(r#"      <TitleText>Different series</TitleText>"#));
+    }
+
+    #[test]
+    fn test_onix3_thoth_fundings() {
+        let mut test_funding = WorkFundings {
+            program: Some("Name of program".to_string()),
+            project_name: Some("Name of project".to_string()),
+            project_shortname: None,
+            grant_number: Some("Number of grant".to_string()),
+            jurisdiction: None,
+            institution: thoth_client::FundingInstitution {
+                institution_name: "Name of institution".to_string(),
+                institution_doi: None,
+                ror: None,
+                country_code: None,
+            },
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherName>Name of institution</PublisherName>"#));
+        assert!(output.contains(r#"  <Funding>"#));
+        assert!(output.contains(r#"    <FundingIdentifier>"#));
+        assert!(output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        assert!(output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+
+        // Change all possible values to test that output is updated
+
+        test_funding.institution.institution_name = "Different institution".to_string();
+        test_funding.program = None;
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
+        assert!(output.contains(r#"  <Funding>"#));
+        assert!(output.contains(r#"    <FundingIdentifier>"#));
+        assert!(output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        // No program supplied
+        assert!(!output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+
+        test_funding.project_name = None;
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
+        assert!(output.contains(r#"  <Funding>"#));
+        assert!(output.contains(r#"    <FundingIdentifier>"#));
+        assert!(output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        // No program supplied
+        assert!(!output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        // No project supplied
+        assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+
+        test_funding.grant_number = None;
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
+        // No program, project or grant supplied, so Funding block is omitted completely
+        assert!(!output.contains(r#"  <Funding>"#));
+        assert!(!output.contains(r#"    <FundingIdentifier>"#));
+        assert!(!output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        assert!(!output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(!output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+    }
+
+    #[test]
+    fn test_onix3_thoth_works() {
+        let mut test_work = Work {
+            work_id: Uuid::from_str("00000000-0000-0000-AAAA-000000000001").unwrap(),
+            work_status: WorkStatus::ACTIVE,
+            full_title: "Book Title: Book Subtitle".to_string(),
+            title: "Book Title".to_string(),
+            subtitle: Some("Book Subtitle".to_string()),
+            work_type: WorkType::MONOGRAPH,
+            reference: None,
+            edition: Some(1),
+            doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
+            publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
+            copyright_holder: Some("Author 1; Author 2".to_string()),
+            short_abstract: None,
+            long_abstract: Some("Lorem ipsum dolor sit amet".to_string()),
+            general_note: None,
+            bibliography_note: None,
+            place: Some("León, Spain".to_string()),
+            page_count: Some(334),
+            page_breakdown: None,
+            first_page: None,
+            last_page: None,
+            page_interval: None,
+            image_count: None,
+            table_count: None,
+            audio_count: None,
+            video_count: None,
+            landing_page: Some("https://www.book.com".to_string()),
+            toc: Some("1. Chapter 1".to_string()),
+            lccn: None,
+            oclc: None,
+            cover_url: Some("https://www.book.com/cover".to_string()),
+            cover_caption: None,
+            imprint: WorkImprint {
+                imprint_name: "OA Editions Imprint".to_string(),
+                imprint_url: None,
+                publisher: WorkImprintPublisher {
+                    publisher_name: "OA Editions".to_string(),
+                    publisher_shortname: Some("OAE".to_string()),
+                    publisher_url: None,
+                },
+            },
+            issues: vec![],
+            contributions: vec![],
+            languages: vec![WorkLanguages {
+                language_code: LanguageCode::SPA,
+                language_relation: LanguageRelation::TRANSLATED_FROM,
+                main_language: true,
+            }],
+            publications: vec![WorkPublications {
+                publication_id: Uuid::from_str("00000000-0000-0000-DDDD-000000000004").unwrap(),
+                publication_type: PublicationType::PDF,
+                isbn: Some(Isbn::from_str("978-3-16-148410-0").unwrap()),
+                width_mm: None,
+                width_cm: None,
+                width_in: None,
+                height_mm: None,
+                height_cm: None,
+                height_in: None,
+                depth_mm: None,
+                depth_cm: None,
+                depth_in: None,
+                weight_g: None,
+                weight_oz: None,
+                prices: vec![
+                    WorkPublicationsPrices {
+                        currency_code: CurrencyCode::EUR,
+                        unit_price: 5.95,
+                    },
+                    WorkPublicationsPrices {
+                        currency_code: CurrencyCode::GBP,
+                        unit_price: 4.95,
+                    },
+                    WorkPublicationsPrices {
+                        currency_code: CurrencyCode::USD,
+                        unit_price: 8.0,
+                    },
+                ],
+                locations: vec![WorkPublicationsLocations {
+                    landing_page: Some("https://www.book.com/ebook_landing".to_string()),
+                    full_text_url: Some("https://www.book.com/ebook_fulltext".to_string()),
+                    location_platform: LocationPlatform::OTHER,
+                    canonical: true,
+                }],
+            }],
+            subjects: vec![
+                WorkSubjects {
+                    subject_code: "AAB".to_string(),
+                    subject_type: SubjectType::BIC,
+                    subject_ordinal: 1,
+                },
+                WorkSubjects {
+                    subject_code: "AAA000000".to_string(),
+                    subject_type: SubjectType::BISAC,
+                    subject_ordinal: 2,
+                },
+                WorkSubjects {
+                    subject_code: "JA85".to_string(),
+                    subject_type: SubjectType::LCC,
+                    subject_ordinal: 3,
+                },
+                WorkSubjects {
+                    subject_code: "JWA".to_string(),
+                    subject_type: SubjectType::THEMA,
+                    subject_ordinal: 4,
+                },
+                WorkSubjects {
+                    subject_code: "keyword1".to_string(),
+                    subject_type: SubjectType::KEYWORD,
+                    subject_ordinal: 5,
+                },
+                WorkSubjects {
+                    subject_code: "custom1".to_string(),
+                    subject_type: SubjectType::CUSTOM,
+                    subject_ordinal: 6,
+                },
+            ],
+            fundings: vec![],
+            relations: vec![],
+            references: vec![],
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(r#"<Product>"#));
+        assert!(output.contains(
+            r#"  <RecordReference>urn:uuid:00000000-0000-0000-aaaa-000000000001</RecordReference>"#
+        ));
+        assert!(output.contains(r#"  <NotificationType>03</NotificationType>"#));
+        assert!(output.contains(r#"  <RecordSourceType>01</RecordSourceType>"#));
+        assert!(output.contains(r#"  <ProductIdentifier>"#));
+        assert!(output.contains(r#"    <ProductIDType>01</ProductIDType>"#));
+        assert!(output
+            .contains(r#"    <IDValue>urn:uuid:00000000-0000-0000-aaaa-000000000001</IDValue>"#));
+        assert!(output.contains(r#"    <ProductIDType>15</ProductIDType>"#));
+        assert!(output.contains(r#"    <IDValue>9783161484100</IDValue>"#));
+        assert!(output.contains(r#"    <ProductIDType>06</ProductIDType>"#));
+        assert!(output.contains(r#"    <IDValue>10.00001/BOOK.0001</IDValue>"#));
+        assert!(output.contains(r#"  <DescriptiveDetail>"#));
+        assert!(output.contains(r#"    <ProductComposition>00</ProductComposition>"#));
+        assert!(output.contains(r#"    <ProductForm>EB</ProductForm>"#));
+        assert!(output.contains(r#"    <ProductFormDetail>E107</ProductFormDetail>"#));
+        assert!(output.contains(r#"    <PrimaryContentType>10</PrimaryContentType>"#));
+        assert!(output.contains(r#"    <EpubLicense>"#));
+        assert!(
+            output.contains(r#"      <EpubLicenseName>Creative Commons License</EpubLicenseName>"#)
+        );
+        assert!(output.contains(r#"      <EpubLicenseExpression>"#));
+        assert!(
+            output.contains(r#"        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>"#)
+        );
+        assert!(output.contains(r#"        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>"#));
+        assert!(output.contains(r#"    <TitleDetail>"#));
+        assert!(output.contains(r#"      <TitleType>01</TitleType>"#));
+        assert!(output.contains(r#"      <TitleElement>"#));
+        assert!(output.contains(r#"        <TitleElementLevel>01</TitleElementLevel>"#));
+        assert!(output.contains(r#"        <TitleText>Book Title</TitleText>"#));
+        assert!(output.contains(r#"        <Subtitle>Book Subtitle</Subtitle>"#));
+        assert!(output.contains(r#"    <Language>"#));
+        assert!(output.contains(r#"      <LanguageRole>02</LanguageRole>"#));
+        assert!(output.contains(r#"      <LanguageCode>spa</LanguageCode>"#));
+        assert!(output.contains(r#"    <Extent>"#));
+        assert!(output.contains(r#"      <ExtentType>00</ExtentType>"#));
+        assert!(output.contains(r#"      <ExtentValue>334</ExtentValue>"#));
+        assert!(output.contains(r#"      <ExtentUnit>03</ExtentUnit>"#));
+        assert!(output.contains(r#"    <Subject>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>12</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>AAB</SubjectCode>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>10</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>AAA000000</SubjectCode>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>04</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>JA85</SubjectCode>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>JWA</SubjectCode>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>20</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>keyword1</SubjectCode>"#));
+        assert!(output.contains(r#"      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>"#));
+        assert!(output.contains(r#"      <SubjectCode>custom1</SubjectCode>"#));
+        assert!(output.contains(r#"    <Audience>"#));
+        assert!(output.contains(r#"      <AudienceCodeType>01</AudienceCodeType>"#));
+        assert!(output.contains(r#"      <AudienceCodeValue>06</AudienceCodeValue>"#));
+        assert!(output.contains(r#"  <CollateralDetail>"#));
+        assert!(output.contains(r#"    <TextContent>"#));
+        assert!(output.contains(r#"      <TextType>03</TextType>"#));
+        assert!(output.contains(r#"      <ContentAudience>00</ContentAudience>"#));
+        assert!(output.contains(r#"      <Text language="eng">Lorem ipsum dolor sit amet</Text>"#));
+        assert!(output.contains(r#"      <TextType>04</TextType>"#));
+        assert!(output.contains(r#"      <Text language="eng">1. Chapter 1</Text>"#));
+        assert!(output.contains(r#"    <SupportingResource>"#));
+        assert!(output.contains(r#"      <ResourceContentType>01</ResourceContentType>"#));
+        assert!(output.contains(r#"      <ResourceMode>03</ResourceMode>"#));
+        assert!(output.contains(r#"      <ResourceVersion>"#));
+        assert!(output.contains(r#"        <ResourceForm>02</ResourceForm>"#));
+        assert!(
+            output.contains(r#"        <ResourceLink>https://www.book.com/cover</ResourceLink>"#)
+        );
+        assert!(output.contains(r#"  <PublishingDetail>"#));
+        assert!(output.contains(r#"    <Imprint>"#));
+        assert!(output.contains(r#"      <ImprintName>OA Editions Imprint</ImprintName>"#));
+        assert!(output.contains(r#"    <Publisher>"#));
+        assert!(output.contains(r#"      <PublishingRole>01</PublishingRole>"#));
+        assert!(output.contains(r#"      <PublisherName>OA Editions</PublisherName>"#));
+        assert!(output.contains(r#"    <CityOfPublication>León, Spain</CityOfPublication>"#));
+        assert!(output.contains(r#"    <PublishingStatus>04</PublishingStatus>"#));
+        assert!(output.contains(r#"    <PublishingDate>"#));
+        assert!(output.contains(r#"      <PublishingDateRole>01</PublishingDateRole>"#));
+        assert!(output.contains(r#"      <Date dateformat="00">19991231</Date>"#));
+        assert!(output.contains(r#"    <SalesRights>"#));
+        assert!(output.contains(r#"      <SalesRightsType>02</SalesRightsType>"#));
+        assert!(output.contains(r#"      <Territory>"#));
+        assert!(output.contains(r#"         <RegionsIncluded>WORLD</RegionsIncluded>"#));
+        assert!(output.contains(r#"    <RelatedProduct>"#));
+        assert!(output.contains(r#"      <ProductRelationCode>06</ProductRelationCode>"#));
+        assert!(output.contains(r#"      <ProductIdentifier>"#));
+        assert!(output.contains(r#"        <ProductIDType>15</ProductIDType>"#));
+        assert!(output.contains(r#"        <IDValue>9783161484100</IDValue>"#));
+        assert!(output.contains(r#"  <ProductSupply>"#));
+        assert!(output.contains(r#"    <Market>"#));
+        assert!(output.contains(r#"      <Territory>"#));
+        assert!(output.contains(r#"         <RegionsIncluded>WORLD</RegionsIncluded>"#));
+        assert!(output.contains(r#"    <SupplyDetail>"#));
+        assert!(output.contains(r#"      <Supplier>"#));
+        assert!(output.contains(r#"        <SupplierRole>09</SupplierRole>"#));
+        assert!(output.contains(r#"        <SupplierName>OA Editions</SupplierName>"#));
+        assert!(output.contains(r#"        <Website>"#));
+        assert!(output.contains(r#"          <WebsiteRole>01</WebsiteRole>"#));
+        assert!(output.contains(
+            r#"          <WebsiteDescription>Publisher's website: web shop</WebsiteDescription>"#
+        ));
+        assert!(output.contains(r#"          <WebsiteLink>https://www.book.com</WebsiteLink>"#));
+        assert!(output.contains(r#"      <ProductAvailability>20</ProductAvailability>"#));
+        assert!(output.contains(r#"      <SupplyDate>"#));
+        assert!(output.contains(r#"        <SupplyDateRole>02</SupplyDateRole>"#));
+        assert!(output.contains(r#"        <Date dateformat="00">19991231</Date>"#));
+        assert!(output.contains(r#"      <Price>"#));
+        assert!(output.contains(r#"        <PriceType>02</PriceType>"#));
+        assert!(output.contains(r#"        <PriceAmount>8.00</PriceAmount>"#));
+        assert!(output.contains(r#"        <CurrencyCode>USD</CurrencyCode>"#));
+        assert!(output.contains(r#"        <Territory>"#));
+        assert!(output.contains(r#"          <RegionsIncluded>WORLD</RegionsIncluded>"#));
+        assert!(output.contains(r#"          <WebsiteRole>29</WebsiteRole>"#));
+        assert!(output.contains(r#"          <WebsiteDescription>Publisher's website: download the title</WebsiteDescription>"#));
+        assert!(output.contains(
+            r#"          <WebsiteLink>https://www.book.com/ebook_fulltext</WebsiteLink>"#
+        ));
+
+        // Remove/change some values to test (non-)output of optional blocks
+        test_work.doi = None;
+        test_work.license = None;
+        test_work.subtitle = None;
+        test_work.page_count = None;
+        test_work.toc = None;
+        test_work.cover_url = None;
+        test_work.place = None;
+        test_work.landing_page = None;
+        test_work.publications[0].publication_type = PublicationType::EPUB;
+        test_work.subjects.clear();
+        let output = generate_test_output(true, &test_work);
+        // Ebook type changed
+        assert!(!output.contains(r#"    <ProductFormDetail>E107</ProductFormDetail>"#));
+        assert!(output.contains(r#"    <ProductFormDetail>E101</ProductFormDetail>"#));
+        // No DOI supplied
+        assert!(!output.contains(r#"    <ProductIDType>06</ProductIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/BOOK.0001</IDValue>"#));
+        // No licence supplied
+        assert!(!output.contains(r#"    <EpubLicense>"#));
+        assert!(!output
+            .contains(r#"      <EpubLicenseName>Creative Commons License</EpubLicenseName>"#));
+        assert!(!output.contains(r#"      <EpubLicenseExpression>"#));
+        assert!(!output
+            .contains(r#"        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>"#));
+        assert!(!output.contains(r#"        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>"#));
+        // No subtitle supplied (within Thoth UI this would automatically update full_title)
+        assert!(!output.contains(r#"        <Subtitle>Book Subtitle</Subtitle>"#));
+        // No page count supplied
+        assert!(!output.contains(r#"    <Extent>"#));
+        assert!(!output.contains(r#"      <ExtentType>00</ExtentType>"#));
+        assert!(!output.contains(r#"      <ExtentValue>334</ExtentValue>"#));
+        assert!(!output.contains(r#"      <ExtentUnit>03</ExtentUnit>"#));
+        // No table of contents or cover URL supplied: CollateralDetail block only contains long abstract
+        assert!(output.contains(r#"  <CollateralDetail>"#));
+        assert!(output.contains(r#"    <TextContent>"#));
+        assert!(output.contains(r#"      <TextType>03</TextType>"#));
+        assert!(output.contains(r#"      <ContentAudience>00</ContentAudience>"#));
+        assert!(output.contains(r#"      <Text language="eng">Lorem ipsum dolor sit amet</Text>"#));
+        assert!(!output.contains(r#"      <TextType>04</TextType>"#));
+        assert!(!output.contains(r#"      <Text language="eng">1. Chapter 1</Text>"#));
+        assert!(!output.contains(r#"    <SupportingResource>"#));
+        assert!(!output.contains(r#"      <ResourceContentType>01</ResourceContentType>"#));
+        assert!(!output.contains(r#"      <ResourceMode>03</ResourceMode>"#));
+        assert!(!output.contains(r#"      <ResourceVersion>"#));
+        assert!(!output.contains(r#"        <ResourceForm>02</ResourceForm>"#));
+        assert!(!output
+            .contains(r#"        <ResourceLink>"https://www.book.com/cover"</ResourceLink>"#));
+        // No place supplied
+        assert!(!output.contains(r#"    <CityOfPublication>León, Spain</CityOfPublication>"#));
+        // No landing page supplied: only one SupplyDetail block, linking to ebook download
+        assert!(!output.contains(r#"          <WebsiteRole>01</WebsiteRole>"#));
+        assert!(!output.contains(
+            r#"          <WebsiteDescription>Publisher's website: web shop</WebsiteDescription>"#
+        ));
+        assert!(!output.contains(r#"          <WebsiteLink>https://www.book.com</WebsiteLink>"#));
+        // No subjects supplied
+        assert!(!output.contains(r#"    <Subject>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>12</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>AAB</SubjectCode>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>10</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>AAA000000</SubjectCode>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>04</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>JA85</SubjectCode>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>JWA</SubjectCode>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>20</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>keyword1</SubjectCode>"#));
+        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>"#));
+        assert!(!output.contains(r#"      <SubjectCode>custom1</SubjectCode>"#));
+
+        // Remove the only language: result is error
+        test_work.languages.clear();
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: Missing Language Code(s)".to_string()
+        );
+
+        // Replace language but remove long abstract: result is error
+        test_work.languages = vec![WorkLanguages {
+            language_code: LanguageCode::SPA,
+            language_relation: LanguageRelation::TRANSLATED_FROM,
+            main_language: true,
+        }];
+        test_work.long_abstract = None;
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: Missing Long Abstract".to_string()
+        );
+
+        // Replace long abstract but remove publication date: result is error
+        test_work.long_abstract = Some("Lorem ipsum dolor sit amet".to_string());
+        test_work.publication_date = None;
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: Missing Publication Date".to_string()
+        );
+
+        // Replace publication date but remove USD price: result is error
+        test_work.publication_date = chrono::NaiveDate::from_ymd_opt(1999, 12, 31);
+        test_work.publications[0].prices.pop();
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: No USD price found".to_string()
+        );
+
+        // Replace USD price but remove the only (PDF) publication's only location
+        // Result: error (can't generate OverDrive ONIX without EPUB or PDF URL)
+        test_work.publications[0].prices[0].currency_code = CurrencyCode::USD;
+        test_work.publications[0].locations.clear();
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: No priced EPUB or PDF URL".to_string()
+        );
+    }
+}

From 553459f84c9dddd7a3de89b66fa798b896f080a7 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Thu, 25 Jan 2024 14:55:42 +0000
Subject: [PATCH 02/44] Add BDS Live to list of supported platforms for JSTOR
 ONIX output (fixes #401)

---
 CHANGELOG.md                    |  2 ++
 thoth-export-server/src/data.rs | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1b064a..00359fb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+  - [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output
 
 ## [[0.11.15]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.15) - 2024-01-18
 ### Changed
diff --git a/thoth-export-server/src/data.rs b/thoth-export-server/src/data.rs
index 5badab85..da2f232c 100644
--- a/thoth-export-server/src/data.rs
+++ b/thoth-export-server/src/data.rs
@@ -35,7 +35,10 @@ lazy_static! {
             id: "onix_3.0::jstor",
             name: "JSTOR ONIX 3.0",
             format: concat!(env!("THOTH_EXPORT_API"), "/formats/onix_3.0"),
-            accepted_by: vec![concat!(env!("THOTH_EXPORT_API"), "/platforms/jstor"),],
+            accepted_by: vec![
+                concat!(env!("THOTH_EXPORT_API"), "/platforms/jstor"),
+                concat!(env!("THOTH_EXPORT_API"), "/platforms/bds_live"),
+            ],
         },
         Specification {
             id: "onix_3.0::google_books",
@@ -192,6 +195,14 @@ lazy_static! {
                 "/specifications/onix_3.0::overdrive"
             ),],
         },
+        Platform {
+            id: "bds_live",
+            name: "BDS Live",
+            accepts: vec![concat!(
+                env!("THOTH_EXPORT_API"),
+                "/specifications/onix_3.0::jstor"
+            ),],
+        },
         Platform {
             id: "ebsco_host",
             name: "EBSCO Host",

From cdc1b7d24094453bc4da2c15e9e915c403680d60 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:42:32 +0000
Subject: [PATCH 03/44] Move from one Product tag per Work to one per
 Publication [tests not yet fixed]

---
 CHANGELOG.md                               |   1 +
 thoth-client/src/queries.rs                |   6 +
 thoth-export-server/src/xml/onix3_thoth.rs | 276 +++++++++------------
 3 files changed, 119 insertions(+), 164 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00359fb8..8431bfa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+  - [441](https://github.com/thoth-pub/thoth/issues/441) - Implement ONIX 3.0 "Thoth" specification (i.e. complete record reflecting full data model)
   - [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output
 
 ## [[0.11.15]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.15) - 2024-01-18
diff --git a/thoth-client/src/queries.rs b/thoth-client/src/queries.rs
index 6e19a68b..955b1c42 100644
--- a/thoth-client/src/queries.rs
+++ b/thoth-client/src/queries.rs
@@ -26,6 +26,12 @@ impl fmt::Display for work_query::LanguageCode {
     }
 }
 
+impl fmt::Display for work_query::CurrencyCode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{self:?}")
+    }
+}
+
 impl fmt::Display for work_query::SubjectType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{self:?}")
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 0319869c..bd1ea8bf 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -2,9 +2,8 @@ use chrono::Utc;
 use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
-    ContributionType, CurrencyCode, LanguageRelation, PublicationType, SubjectType, Work,
-    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkPublications, WorkStatus,
-    WorkType,
+    ContributionType, LanguageRelation, PublicationType, SubjectType, Work, WorkContributions,
+    WorkFundings, WorkIssues, WorkLanguages, WorkStatus, WorkType,
 };
 use xml::writer::{EventWriter, XmlEvent};
 
@@ -61,52 +60,16 @@ impl XmlSpecification for Onix3Thoth {
 
 impl XmlElementBlock<Onix3Thoth> for Work {
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
-        // Don't output works with no publication date (mandatory in OverDrive)
-        if self.publication_date.is_none() {
-            Err(ThothError::IncompleteMetadataRecord(
-                ONIX_ERROR.to_string(),
-                "Missing Publication Date".to_string(),
-            ))
-        // Don't output works with no long abstract (Description element mandatory in OverDrive)
-        } else if self.long_abstract.is_none() {
-            Err(ThothError::IncompleteMetadataRecord(
-                ONIX_ERROR.to_string(),
-                "Missing Long Abstract".to_string(),
-            ))
-        // Don't output works with no language codes (mandatory in OverDrive)
-        } else if self.languages.is_empty() {
-            Err(ThothError::IncompleteMetadataRecord(
-                ONIX_ERROR.to_string(),
-                "Missing Language Code(s)".to_string(),
-            ))
-        // We can only generate the document if there's an EPUB or PDF
-        // with a non-zero price (OverDrive only accepts priced items)
-        } else if let Some(main_publication) = self
-            .publications
-            .iter()
-            // For preference, distribute the EPUB only
-            .find(|p| {
-                p.publication_type.eq(&PublicationType::EPUB)
-                    && p.locations
-                        .iter()
-                        .any(|l| l.canonical && l.full_text_url.is_some())
-                    // Thoth database only accepts non-zero prices
-                    && !p.prices.is_empty()
-            })
-            // If no EPUB is found, distribute the PDF only
-            .or_else(|| {
-                self.publications.iter().find(|p| {
-                    p.publication_type.eq(&PublicationType::PDF)
-                        && p.locations
-                            .iter()
-                            .any(|l| l.canonical && l.full_text_url.is_some())
-                        // Thoth database only accepts non-zero prices
-                        && !p.prices.is_empty()
-                })
-            })
-        {
-            let work_id = format!("urn:uuid:{}", self.work_id);
-            let (main_isbn, isbns) = get_publications_data(&self.publications, main_publication);
+        // TODO is there any field that's optional in Thoth but mandatory in ONIX?
+        let work_id = format!("urn:uuid:{}", self.work_id);
+        let mut isbns: Vec<String> = Vec::new();
+        for publication in &self.publications {
+            if let Some(isbn) = &publication.isbn.as_ref() {
+                isbns.push(isbn.to_hyphenless_string());
+            }
+        }
+        for publication in &self.publications {
+            let current_isbn = &publication.isbn.as_ref().map(|p| p.to_hyphenless_string());
             write_element_block("Product", w, |w| {
                 write_element_block("RecordReference", w, |w| {
                     w.write(XmlEvent::Characters(&work_id))
@@ -130,16 +93,17 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             .map_err(|e| e.into())
                     })
                 })?;
-                write_element_block("ProductIdentifier", w, |w| {
-                    // 15 ISBN-13
-                    write_element_block("ProductIDType", w, |w| {
-                        w.write(XmlEvent::Characters("15")).map_err(|e| e.into())
+                if let Some(isbn) = current_isbn {
+                    write_element_block("ProductIdentifier", w, |w| {
+                        // 15 ISBN-13
+                        write_element_block("ProductIDType", w, |w| {
+                            w.write(XmlEvent::Characters("15")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDValue", w, |w| {
+                            w.write(XmlEvent::Characters(isbn)).map_err(|e| e.into())
+                        })
                     })?;
-                    write_element_block("IDValue", w, |w| {
-                        w.write(XmlEvent::Characters(&main_isbn))
-                            .map_err(|e| e.into())
-                    })
-                })?;
+                }
                 if let Some(doi) = &self.doi {
                     write_element_block("ProductIdentifier", w, |w| {
                         write_element_block("ProductIDType", w, |w| {
@@ -156,19 +120,15 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     write_element_block("ProductComposition", w, |w| {
                         w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                     })?;
-                    // EB Digital download and online
+                    let (form, form_detail) = get_product_form_codes(&publication.publication_type);
                     write_element_block("ProductForm", w, |w| {
-                        w.write(XmlEvent::Characters("EB")).map_err(|e| e.into())
-                    })?;
-                    let digital_type = match main_publication.publication_type {
-                        PublicationType::EPUB => "E101",
-                        PublicationType::PDF => "E107",
-                        _ => unreachable!(),
-                    };
-                    write_element_block("ProductFormDetail", w, |w| {
-                        w.write(XmlEvent::Characters(digital_type))
-                            .map_err(|e| e.into())
+                        w.write(XmlEvent::Characters(form)).map_err(|e| e.into())
                     })?;
+                    if let Some(code) = form_detail {
+                        write_element_block("ProductFormDetail", w, |w| {
+                            w.write(XmlEvent::Characters(code)).map_err(|e| e.into())
+                        })?;
+                    }
                     // 10 Text (eye-readable)
                     write_element_block("PrimaryContentType", w, |w| {
                         w.write(XmlEvent::Characters("10")).map_err(|e| e.into())
@@ -372,21 +332,25 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                 if !isbns.is_empty() {
                     write_element_block("RelatedMaterial", w, |w| {
                         for isbn in &isbns {
-                            write_element_block("RelatedProduct", w, |w| {
-                                // 06 Alternative format
-                                write_element_block("ProductRelationCode", w, |w| {
-                                    w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
-                                })?;
-                                write_element_block("ProductIdentifier", w, |w| {
-                                    // 15 ISBN-13
-                                    write_element_block("ProductIDType", w, |w| {
-                                        w.write(XmlEvent::Characters("15")).map_err(|e| e.into())
+                            if !current_isbn.eq(&Some(isbn.clone())) {
+                                write_element_block("RelatedProduct", w, |w| {
+                                    // 06 Alternative format
+                                    write_element_block("ProductRelationCode", w, |w| {
+                                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
                                     })?;
-                                    write_element_block("IDValue", w, |w| {
-                                        w.write(XmlEvent::Characters(isbn)).map_err(|e| e.into())
+                                    write_element_block("ProductIdentifier", w, |w| {
+                                        // 15 ISBN-13
+                                        write_element_block("ProductIDType", w, |w| {
+                                            w.write(XmlEvent::Characters("15"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDValue", w, |w| {
+                                            w.write(XmlEvent::Characters(isbn))
+                                                .map_err(|e| e.into())
+                                        })
                                     })
-                                })
-                            })?;
+                                })?;
+                            }
                         }
                         Ok(())
                     })?;
@@ -400,19 +364,20 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         })
                     })?;
                     let mut supplies: HashMap<String, (String, String)> = HashMap::new();
-                    supplies.insert(
-                        // Main publication's canonical location is guaranteed to have a full text URL
-                        main_publication
-                            .locations
-                            .iter()
-                            .find(|l| l.canonical)
-                            .and_then(|l| l.full_text_url.clone())
-                            .unwrap(),
-                        (
-                            "29".to_string(),
-                            "Publisher's website: download the title".to_string(),
-                        ),
-                    );
+                    if let Some(full_text_url) = publication
+                        .locations
+                        .iter()
+                        .find(|l| l.canonical)
+                        .and_then(|l| l.full_text_url.clone())
+                    {
+                        supplies.insert(
+                            full_text_url.to_string(),
+                            (
+                                "29".to_string(),
+                                "Publisher's website: download the title".to_string(),
+                            ),
+                        );
+                    }
                     if let Some(landing_page) = &self.landing_page {
                         supplies.insert(
                             landing_page.to_string(),
@@ -477,85 +442,67 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     },
                                 )
                             })?;
-                            // Price element is required for OverDrive. Assume the USD price is canonical.
-                            if let Some(price) = main_publication
-                                .prices
-                                .iter()
-                                .find(|pr| {
-                                    // Thoth database only accepts non-zero prices
-                                    pr.currency_code.eq(&CurrencyCode::USD)
+                            if publication.prices.is_empty() {
+                                // 04 Contact supplier
+                                write_element_block("UnpricedItemType", w, |w| {
+                                    w.write(XmlEvent::Characters("04")).map_err(|e| e.into())
                                 })
-                                .map(|pr| pr.unit_price)
-                            {
-                                let formatted_price = format!("{price:.2}");
-                                write_element_block("Price", w, |w| {
-                                    // 02 RRP including tax
-                                    write_element_block("PriceType", w, |w| {
-                                        w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
-                                    })?;
-                                    write_element_block("PriceAmount", w, |w| {
-                                        w.write(XmlEvent::Characters(&formatted_price))
-                                            .map_err(|e| e.into())
-                                    })?;
-                                    write_element_block("CurrencyCode", w, |w| {
-                                        w.write(XmlEvent::Characters("USD")).map_err(|e| e.into())
-                                    })?;
-                                    write_element_block("Territory", w, |w| {
-                                        write_element_block("RegionsIncluded", w, |w| {
-                                            w.write(XmlEvent::Characters("WORLD"))
+                            } else {
+                                for price in &publication.prices {
+                                    let unit_price = price.unit_price;
+                                    let formatted_price = format!("{unit_price:.2}");
+                                    write_element_block("Price", w, |w| {
+                                        // 02 RRP including tax
+                                        write_element_block("PriceType", w, |w| {
+                                            w.write(XmlEvent::Characters("02"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("PriceAmount", w, |w| {
+                                            w.write(XmlEvent::Characters(&formatted_price))
                                                 .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("CurrencyCode", w, |w| {
+                                            w.write(XmlEvent::Characters(
+                                                &price.currency_code.to_string(),
+                                            ))
+                                            .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("Territory", w, |w| {
+                                            write_element_block("RegionsIncluded", w, |w| {
+                                                w.write(XmlEvent::Characters("WORLD"))
+                                                    .map_err(|e| e.into())
+                                            })
                                         })
-                                    })
-                                })
-                            } else {
-                                Err(ThothError::IncompleteMetadataRecord(
-                                    ONIX_ERROR.to_string(),
-                                    "No USD price found".to_string(),
-                                ))
+                                    })?;
+                                }
+                                Ok(())
                             }
                         })?;
                     }
                     Ok(())
                 })
-            })
-        } else {
-            Err(ThothError::IncompleteMetadataRecord(
-                ONIX_ERROR.to_string(),
-                "No priced EPUB or PDF URL".to_string(),
-            ))
+            })?;
         }
+        Ok(())
     }
 }
 
-fn get_publications_data(
-    publications: &[WorkPublications],
-    main_publication: &WorkPublications,
-) -> (String, Vec<String>) {
-    let mut main_isbn = "".to_string();
-    let mut isbns: Vec<String> = Vec::new();
-
-    for publication in publications {
-        if let Some(isbn) = &publication.isbn.as_ref() {
-            isbns.push(isbn.to_hyphenless_string());
-            // The default product ISBN is the main publication's (EPUB or PDF)
-            if publication
-                .publication_id
-                .eq(&main_publication.publication_id)
-            {
-                main_isbn = isbn.to_hyphenless_string();
-            }
-            // If the main publication has no ISBN, use either the PDF's or the paperback's
-            // (no guarantee as to which will be chosen)
-            if (publication.publication_type.eq(&PublicationType::PDF)
-                || publication.publication_type.eq(&PublicationType::PAPERBACK))
-                && main_isbn.is_empty()
-            {
-                main_isbn = isbn.to_hyphenless_string();
-            }
-        }
+fn get_product_form_codes(publication_type: &PublicationType) -> (&str, Option<&str>) {
+    match publication_type {
+        PublicationType::PAPERBACK => ("BC", None),
+        PublicationType::HARDBACK => ("BB", None),
+        // EB Digital download and online
+        PublicationType::PDF => ("EB", Some("E107")),
+        PublicationType::HTML => ("EB", Some("E105")),
+        PublicationType::XML => ("EB", Some("E113")),
+        PublicationType::EPUB => ("EB", Some("E101")),
+        PublicationType::MOBI => ("EB", Some("E127")),
+        PublicationType::AZW3 => ("EB", Some("E116")),
+        PublicationType::DOCX => ("EB", Some("E104")),
+        // E100 "not yet allocated" - no codelist entry for .fb2, .fb3, .fbz
+        PublicationType::FICTION_BOOK => ("EB", Some("E100")),
+        PublicationType::Other(_) => unreachable!(),
     }
-
-    (main_isbn, isbns)
 }
 
 impl XmlElement<Onix3Thoth> for WorkStatus {
@@ -789,9 +736,10 @@ mod tests {
     use thoth_api::model::Isbn;
     use thoth_api::model::Orcid;
     use thoth_client::{
-        ContributionType, LanguageCode, LanguageRelation, LocationPlatform, PublicationType,
-        WorkContributionsContributor, WorkImprint, WorkImprintPublisher, WorkIssuesSeries,
-        WorkPublicationsLocations, WorkPublicationsPrices, WorkStatus, WorkSubjects, WorkType,
+        ContributionType, CurrencyCode, LanguageCode, LanguageRelation, LocationPlatform,
+        PublicationType, WorkContributionsContributor, WorkImprint, WorkImprintPublisher,
+        WorkIssuesSeries, WorkPublications, WorkPublicationsLocations, WorkPublicationsPrices,
+        WorkStatus, WorkSubjects, WorkType,
     };
     use uuid::Uuid;
 

From 45f9668c0113420d80c7a990d40e79a5f9748d80 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:47:49 +0000
Subject: [PATCH 04/44] Remove out-of-date comment

---
 thoth-export-server/src/xml/onix21_ebsco_host.rs      | 1 -
 thoth-export-server/src/xml/onix21_proquest_ebrary.rs | 1 -
 thoth-export-server/src/xml/onix3_jstor.rs            | 1 -
 thoth-export-server/src/xml/onix3_oapen.rs            | 1 -
 thoth-export-server/src/xml/onix3_overdrive.rs        | 1 -
 thoth-export-server/src/xml/onix3_project_muse.rs     | 1 -
 thoth-export-server/src/xml/onix3_thoth.rs            | 1 -
 7 files changed, 7 deletions(-)

diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs
index 2cc71d96..07499d86 100644
--- a/thoth-export-server/src/xml/onix21_ebsco_host.rs
+++ b/thoth-export-server/src/xml/onix21_ebsco_host.rs
@@ -208,7 +208,6 @@ impl XmlElementBlock<Onix21EbscoHost> for Work {
                 }
                 for (url, description) in websites.iter() {
                     write_element_block("Website", w, |w| {
-                        // 01 Publisher’s corporate website
                         write_element_block("WebsiteRole", w, |w| {
                             w.write(XmlEvent::Characters(&description.0))
                                 .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
index 66220072..56f7343c 100644
--- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
+++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
@@ -210,7 +210,6 @@ impl XmlElementBlock<Onix21ProquestEbrary> for Work {
                 }
                 for (url, description) in websites.iter() {
                     write_element_block("Website", w, |w| {
-                        // 01 Publisher’s corporate website
                         write_element_block("WebsiteRole", w, |w| {
                             w.write(XmlEvent::Characters(&description.0))
                                 .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix3_jstor.rs b/thoth-export-server/src/xml/onix3_jstor.rs
index 33338f8f..d9b803f1 100644
--- a/thoth-export-server/src/xml/onix3_jstor.rs
+++ b/thoth-export-server/src/xml/onix3_jstor.rs
@@ -353,7 +353,6 @@ impl XmlElementBlock<Onix3Jstor> for Work {
                                     .map_err(|e| e.into())
                                 })?;
                                 write_element_block("Website", w, |w| {
-                                    // 01 Publisher’s corporate website
                                     write_element_block("WebsiteRole", w, |w| {
                                         w.write(XmlEvent::Characters(&description.0))
                                             .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix3_oapen.rs b/thoth-export-server/src/xml/onix3_oapen.rs
index 1fec30c6..780ff883 100644
--- a/thoth-export-server/src/xml/onix3_oapen.rs
+++ b/thoth-export-server/src/xml/onix3_oapen.rs
@@ -361,7 +361,6 @@ impl XmlElementBlock<Onix3Oapen> for Work {
                                     .map_err(|e| e.into())
                                 })?;
                                 write_element_block("Website", w, |w| {
-                                    // 01 Publisher’s corporate website
                                     write_element_block("WebsiteRole", w, |w| {
                                         w.write(XmlEvent::Characters(&description.0))
                                             .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs
index 2c9ab39e..9bc04cff 100644
--- a/thoth-export-server/src/xml/onix3_overdrive.rs
+++ b/thoth-export-server/src/xml/onix3_overdrive.rs
@@ -436,7 +436,6 @@ impl XmlElementBlock<Onix3Overdrive> for Work {
                                     .map_err(|e| e.into())
                                 })?;
                                 write_element_block("Website", w, |w| {
-                                    // 01 Publisher’s corporate website
                                     write_element_block("WebsiteRole", w, |w| {
                                         w.write(XmlEvent::Characters(&description.0))
                                             .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix3_project_muse.rs b/thoth-export-server/src/xml/onix3_project_muse.rs
index a1458cba..50d810f8 100644
--- a/thoth-export-server/src/xml/onix3_project_muse.rs
+++ b/thoth-export-server/src/xml/onix3_project_muse.rs
@@ -371,7 +371,6 @@ impl XmlElementBlock<Onix3ProjectMuse> for Work {
                                     .map_err(|e| e.into())
                                 })?;
                                 write_element_block("Website", w, |w| {
-                                    // 01 Publisher’s corporate website
                                     write_element_block("WebsiteRole", w, |w| {
                                         w.write(XmlEvent::Characters(&description.0))
                                             .map_err(|e| e.into())
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index bd1ea8bf..7c5914c8 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -401,7 +401,6 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     .map_err(|e| e.into())
                                 })?;
                                 write_element_block("Website", w, |w| {
-                                    // 01 Publisher’s corporate website
                                     write_element_block("WebsiteRole", w, |w| {
                                         w.write(XmlEvent::Characters(&description.0))
                                             .map_err(|e| e.into())

From 0a2433a68421fe2c37bcf6eaeabdfecb9bfc864f Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 5 Feb 2024 14:29:16 +0000
Subject: [PATCH 05/44] Incorporate improvements from other ONIX flavours and
 add many more fields [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 360 ++++++++++++++++++++-
 1 file changed, 343 insertions(+), 17 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 7c5914c8..c8613236 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -88,6 +88,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     write_element_block("ProductIDType", w, |w| {
                         w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
                     })?;
+                    write_element_block("IDTypeName", w, |w| {
+                        w.write(XmlEvent::Characters("thoth-work-id"))
+                            .map_err(|e| e.into())
+                    })?;
                     write_element_block("IDValue", w, |w| {
                         w.write(XmlEvent::Characters(&work_id))
                             .map_err(|e| e.into())
@@ -115,6 +119,43 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         })
                     })?;
                 }
+                if let Some(lccn) = &self.lccn {
+                    write_element_block("ProductIdentifier", w, |w| {
+                        write_element_block("ProductIDType", w, |w| {
+                            w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDValue", w, |w| {
+                            w.write(XmlEvent::Characters(&lccn.to_string()))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                }
+                if let Some(oclc) = &self.oclc {
+                    write_element_block("ProductIdentifier", w, |w| {
+                        write_element_block("ProductIDType", w, |w| {
+                            w.write(XmlEvent::Characters("23")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDValue", w, |w| {
+                            w.write(XmlEvent::Characters(&oclc.to_string()))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                }
+                if let Some(reference) = &self.reference {
+                    write_element_block("ProductIdentifier", w, |w| {
+                        write_element_block("ProductIDType", w, |w| {
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDTypeName", w, |w| {
+                            w.write(XmlEvent::Characters("internal-reference"))
+                                .map_err(|e| e.into())
+                        })?;
+                        write_element_block("IDValue", w, |w| {
+                            w.write(XmlEvent::Characters(&reference.to_string()))
+                                .map_err(|e| e.into())
+                        })
+                    })?;
+                }
                 write_element_block("DescriptiveDetail", w, |w| {
                     // 00 Single-component retail product
                     write_element_block("ProductComposition", w, |w| {
@@ -133,6 +174,47 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     write_element_block("PrimaryContentType", w, |w| {
                         w.write(XmlEvent::Characters("10")).map_err(|e| e.into())
                     })?;
+                    if let Some(height_mm) = &publication.height_mm {
+                        // 01 height
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_mm, "mm"), w)
+                            .ok();
+                    }
+                    if let Some(height_cm) = &publication.height_cm {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_cm, "cm"), w)
+                            .ok();
+                    }
+                    if let Some(height_in) = &publication.height_in {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_in, "in"), w)
+                            .ok();
+                    }
+                    if let Some(width_mm) = &publication.width_mm {
+                        // 02 width
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_mm, "mm"), w).ok();
+                    }
+                    if let Some(width_cm) = &publication.width_cm {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_cm, "cm"), w).ok();
+                    }
+                    if let Some(width_in) = &publication.width_in {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_in, "in"), w).ok();
+                    }
+                    if let Some(depth_mm) = &publication.depth_mm {
+                        // 03 thickness
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_mm, "mm"), w).ok();
+                    }
+                    if let Some(depth_cm) = &publication.depth_cm {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_cm, "cm"), w).ok();
+                    }
+                    if let Some(depth_in) = &publication.depth_in {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_in, "in"), w).ok();
+                    }
+                    if let Some(weight_g) = &publication.weight_g {
+                        // 08 unit weight
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("08", weight_g, "gr"), w).ok();
+                    }
+                    if let Some(weight_oz) = &publication.weight_oz {
+                        XmlElementBlock::<Onix3Thoth>::xml_element(&("08", weight_oz, "oz"), w)
+                            .ok();
+                    }
                     if let Some(license) = &self.license {
                         write_element_block("EpubLicense", w, |w| {
                             write_element_block("EpubLicenseName", w, |w| {
@@ -178,6 +260,17 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     for contribution in &self.contributions {
                         XmlElementBlock::<Onix3Thoth>::xml_element(contribution, w).ok();
                     }
+                    if let Some(edition) = &self.edition {
+                        // "Normally sent only for the second and subsequent editions"
+                        if edition > &1 {
+                            write_element_block("Edition", w, |w| {
+                                write_element_block("EditionNumber", w, |w| {
+                                    w.write(XmlEvent::Characters(&edition.to_string()))
+                                        .map_err(|e| e.into())
+                                })
+                            })?;
+                        }
+                    }
                     for language in &self.languages {
                         XmlElementBlock::<Onix3Thoth>::xml_element(language, w).ok();
                     }
@@ -197,6 +290,70 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             })
                         })?;
                     }
+                    if let Some(bibliography_note) = &self.bibliography_note {
+                        // "This data element carries text stating the number and type of
+                        // illustrations. The text may also include other content items,
+                        // eg maps, bibliography, tables, index etc."
+                        write_element_block("IllustrationsNote", w, |w| {
+                            w.write(XmlEvent::Characters(&bibliography_note.to_string()))
+                                .map_err(|e| e.into())
+                        })?;
+                    }
+                    if let Some(image_count) = self.image_count {
+                        write_element_block("AncillaryContent", w, |w| {
+                            // 09 Illustrations, unspecified
+                            // (note that there are separate codes for e.g. "halftones" - we don't distinguish)
+                            write_element_block("AncillaryContentType", w, |w| {
+                                w.write(XmlEvent::Characters("09")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("Number", w, |w| {
+                                w.write(XmlEvent::Characters(&image_count.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    if let Some(table_count) = self.table_count {
+                        write_element_block("AncillaryContent", w, |w| {
+                            // 11 Tables, unspecified
+                            write_element_block("AncillaryContentType", w, |w| {
+                                w.write(XmlEvent::Characters("11")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("Number", w, |w| {
+                                w.write(XmlEvent::Characters(&table_count.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    if let Some(audio_count) = self.audio_count {
+                        write_element_block("AncillaryContent", w, |w| {
+                            // 19 Recorded music items
+                            // (closest equivalent - audio might not always be music)
+                            write_element_block("AncillaryContentType", w, |w| {
+                                w.write(XmlEvent::Characters("19")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("Number", w, |w| {
+                                w.write(XmlEvent::Characters(&audio_count.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    if let Some(video_count) = self.video_count {
+                        write_element_block("AncillaryContent", w, |w| {
+                            // 00 Unspecified, see description
+                            // (there is no code for "videos")
+                            write_element_block("AncillaryContentType", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("AncillaryContentDescription", w, |w| {
+                                w.write(XmlEvent::Characters("Videos"))
+                                    .map_err(|e| e.into())
+                            })?;
+                            write_element_block("Number", w, |w| {
+                                w.write(XmlEvent::Characters(&video_count.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
                     for subject in &self.subjects {
                         write_element_block("Subject", w, |w| {
                             XmlElement::<Onix3Thoth>::xml_element(&subject.subject_type, w)?;
@@ -218,25 +375,92 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     })
                 })?;
                 write_element_block("CollateralDetail", w, |w| {
+                    if let Some(mut short_abstract) = self.short_abstract.clone() {
+                        // Short description field may not exceed 350 characters
+                        short_abstract.truncate(350);
+                        write_element_block("TextContent", w, |w| {
+                            // 02 Short description
+                            write_element_block("TextType", w, |w| {
+                                w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                            })?;
+                            // 00 Unrestricted
+                            write_element_block("ContentAudience", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            write_full_element_block(
+                                "Text",
+                                Some(vec![("language", "eng")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(&short_abstract))
+                                        .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
+                    if let Some(long_abstract) = &self.long_abstract {
+                        // 03 Description, 30 Abstract
+                        for text_type in ["03", "30"] {
+                            write_element_block("TextContent", w, |w| {
+                                write_element_block("TextType", w, |w| {
+                                    w.write(XmlEvent::Characters(text_type))
+                                        .map_err(|e| e.into())
+                                })?;
+                                // 00 Unrestricted
+                                write_element_block("ContentAudience", w, |w| {
+                                    w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                                })?;
+                                write_full_element_block(
+                                    "Text",
+                                    Some(vec![("language", "eng")]),
+                                    w,
+                                    |w| {
+                                        w.write(XmlEvent::Characters(long_abstract))
+                                            .map_err(|e| e.into())
+                                    },
+                                )
+                            })?;
+                        }
+                    }
+                    if let Some(toc) = &self.toc {
+                        write_element_block("TextContent", w, |w| {
+                            // 04 Table of contents
+                            write_element_block("TextType", w, |w| {
+                                w.write(XmlEvent::Characters("04")).map_err(|e| e.into())
+                            })?;
+                            // 00 Unrestricted
+                            write_element_block("ContentAudience", w, |w| {
+                                w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
+                            })?;
+                            write_full_element_block(
+                                "Text",
+                                Some(vec![("language", "eng")]),
+                                w,
+                                |w| w.write(XmlEvent::Characters(toc)).map_err(|e| e.into()),
+                            )
+                        })?;
+                    }
                     write_element_block("TextContent", w, |w| {
-                        // 03 Description ("30 Abstract" not implemented in OverDrive)
+                        // 20 Open access statement
                         write_element_block("TextType", w, |w| {
-                            w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                            w.write(XmlEvent::Characters("20")).map_err(|e| e.into())
                         })?;
                         // 00 Unrestricted
                         write_element_block("ContentAudience", w, |w| {
                             w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                         })?;
                         write_full_element_block("Text", Some(vec![("language", "eng")]), w, |w| {
-                            w.write(XmlEvent::Characters(self.long_abstract.as_ref().unwrap()))
+                            w.write(XmlEvent::Characters("Open Access"))
                                 .map_err(|e| e.into())
                         })
                     })?;
-                    if let Some(toc) = &self.toc {
+                    if let Some(general_note) = &self.general_note {
                         write_element_block("TextContent", w, |w| {
-                            // 04 Table of contents
+                            // 13 Publisher's notice
+                            // "A statement included by a publisher in fulfillment of contractual obligations"
+                            // Used in many different ways - closest approximation
                             write_element_block("TextType", w, |w| {
-                                w.write(XmlEvent::Characters("04")).map_err(|e| e.into())
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
                             })?;
                             // 00 Unrestricted
                             write_element_block("ContentAudience", w, |w| {
@@ -246,7 +470,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 "Text",
                                 Some(vec![("language", "eng")]),
                                 w,
-                                |w| w.write(XmlEvent::Characters(toc)).map_err(|e| e.into()),
+                                |w| {
+                                    w.write(XmlEvent::Characters(general_note))
+                                        .map_err(|e| e.into())
+                                },
                             )
                         })?;
                     }
@@ -264,6 +491,18 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             write_element_block("ResourceMode", w, |w| {
                                 w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
                             })?;
+                            if let Some(cover_caption) = &self.cover_caption {
+                                write_element_block("ResourceFeature", w, |w| {
+                                    // 02 Caption
+                                    write_element_block("ResourceFeatureType", w, |w| {
+                                        w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("ResourceFeatureNote", w, |w| {
+                                        w.write(XmlEvent::Characters(cover_caption))
+                                            .map_err(|e| e.into())
+                                    })
+                                })?;
+                            }
                             write_element_block("ResourceVersion", w, |w| {
                                 // 02 Downloadable file
                                 write_element_block("ResourceForm", w, |w| {
@@ -293,7 +532,23 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         write_element_block("PublisherName", w, |w| {
                             w.write(XmlEvent::Characters(&self.imprint.publisher.publisher_name))
                                 .map_err(|e| e.into())
-                        })
+                        })?;
+                        if let Some(url) = &self.imprint.publisher.publisher_url {
+                            write_element_block("Website", w, |w| {
+                                // 01 Publisher’s corporate website
+                                write_element_block("WebsiteRole", w, |w| {
+                                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("WebsiteDescription", w, |w| {
+                                    w.write(XmlEvent::Characters("Publisher's website: home page"))
+                                        .map_err(|e| e.into())
+                                })?;
+                                write_element_block("WebsiteLink", w, |w| {
+                                    w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                })
+                            })?;
+                        }
+                        Ok(())
                     })?;
                     for funding in &self.fundings {
                         XmlElementBlock::<Onix3Thoth>::xml_element(funding, w).ok();
@@ -317,6 +572,17 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             .map_err(|e| e.into())
                         })
                     })?;
+                    if let Some(copyright_holder) = &self.copyright_holder {
+                        write_element_block("CopyrightStatement", w, |w| {
+                            write_element_block("CopyrightOwner", w, |w| {
+                                // This might be a CorporateName rather than PersonName, but we can't tell
+                                write_element_block("PersonName", w, |w| {
+                                    w.write(XmlEvent::Characters(copyright_holder))
+                                        .map_err(|e| e.into())
+                                })
+                            })
+                        })?;
+                    }
                     write_element_block("SalesRights", w, |w| {
                         // 02 For sale with non-exclusive rights in the specified countries or territories
                         write_element_block("SalesRightsType", w, |w| {
@@ -414,10 +680,9 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     })
                                 })
                             })?;
-                            // 20 Available from us (form of availability unspecified)
-                            // (99 Contact supplier is not supported by OverDrive)
+                            // 99 Contact supplier
                             write_element_block("ProductAvailability", w, |w| {
-                                w.write(XmlEvent::Characters("20")).map_err(|e| e.into())
+                                w.write(XmlEvent::Characters("99")).map_err(|e| e.into())
                             })?;
                             write_element_block("SupplyDate", w, |w| {
                                 write_element_block("SupplyDateRole", w, |w| {
@@ -605,14 +870,33 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                     w.write(XmlEvent::Characters(first_name))
                         .map_err(|e| e.into())
                 })?;
-                write_element_block("KeyNames", w, |w| {
-                    w.write(XmlEvent::Characters(&self.last_name))
+            }
+            write_element_block("KeyNames", w, |w| {
+                w.write(XmlEvent::Characters(&self.last_name))
+                    .map_err(|e| e.into())
+            })?;
+            write_element_block("PersonName", w, |w| {
+                w.write(XmlEvent::Characters(&self.full_name))
+                    .map_err(|e| e.into())
+            })?;
+            if let Some(biography) = &self.biography {
+                write_element_block("BiographicalNote", w, |w| {
+                    w.write(XmlEvent::Characters(biography))
                         .map_err(|e| e.into())
                 })?;
-            } else {
-                write_element_block("PersonName", w, |w| {
-                    w.write(XmlEvent::Characters(&self.full_name))
-                        .map_err(|e| e.into())
+            }
+            if let Some(website) = &self.contributor.website {
+                write_element_block("Website", w, |w| {
+                    write_element_block("WebsiteRole", w, |w| {
+                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("WebsiteDescription", w, |w| {
+                        w.write(XmlEvent::Characters("Own website"))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("WebsiteLink", w, |w| {
+                        w.write(XmlEvent::Characters(website)).map_err(|e| e.into())
+                    })
                 })?;
             }
             Ok(())
@@ -690,6 +974,30 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
                 w.write(XmlEvent::Characters(&self.institution.institution_name))
                     .map_err(|e| e.into())
             })?;
+            if let Some(ror) = &self.institution.ror {
+                write_element_block("PublisherIdentifier", w, |w| {
+                    // 40 ROR
+                    write_element_block("PublisherIDType", w, |w| {
+                        w.write(XmlEvent::Characters("40")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&ror.to_string()))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+            }
+            if let Some(doi) = &self.institution.institution_doi {
+                write_element_block("PublisherIdentifier", w, |w| {
+                    // 32 FundRef DOI
+                    write_element_block("PublisherIDType", w, |w| {
+                        w.write(XmlEvent::Characters("32")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&doi.to_string()))
+                            .map_err(|e| e.into())
+                    })
+                })?;
+            }
             let mut identifiers: HashMap<String, String> = HashMap::new();
             if let Some(program) = &self.program {
                 identifiers.insert("programname".to_string(), program.to_string());
@@ -725,6 +1033,24 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
     }
 }
 
+impl XmlElementBlock<Onix3Thoth> for (&str, &f64, &str) {
+    // (MeasureType, Measurement, MeasureUnitCode)
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("Measure", w, |w| {
+            write_element_block("MeasureType", w, |w| {
+                w.write(XmlEvent::Characters(self.0)).map_err(|e| e.into())
+            })?;
+            write_element_block("Measurement", w, |w| {
+                w.write(XmlEvent::Characters(&self.1.to_string()))
+                    .map_err(|e| e.into())
+            })?;
+            write_element_block("MeasureUnitCode", w, |w| {
+                w.write(XmlEvent::Characters(self.2)).map_err(|e| e.into())
+            })
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     // Testing note: XML nodes cannot be guaranteed to be output in the same order every time

From 3a9939f61461e5fdac0e0225555418b7adb84358 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 13 Feb 2024 15:54:22 +0000
Subject: [PATCH 06/44] Use correct ONIX codelist value for landing page

---
 thoth-export-server/src/xml/onix3_thoth.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index c8613236..ce8defc8 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -648,7 +648,8 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         supplies.insert(
                             landing_page.to_string(),
                             (
-                                "01".to_string(),
+                                // 02 Publisher's website for a specified work
+                                "02".to_string(),
                                 "Publisher's website: web shop".to_string(),
                             ),
                         );

From a0302db1bb46be1e19eb641d69fae48d994fe676 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 19 Feb 2024 13:19:21 +0000
Subject: [PATCH 07/44] Add more fields inc references, relations,
 affiliations, URLs as proprietary IDs [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 245 ++++++++++++++++++++-
 1 file changed, 237 insertions(+), 8 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index ce8defc8..92f55ae7 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -2,8 +2,9 @@ use chrono::Utc;
 use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
-    ContributionType, LanguageRelation, PublicationType, SubjectType, Work, WorkContributions,
-    WorkFundings, WorkIssues, WorkLanguages, WorkStatus, WorkType,
+    ContributionType, LanguageRelation, PublicationType, RelationType, SubjectType, Work,
+    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkRelations, WorkStatus,
+    WorkType,
 };
 use xml::writer::{EventWriter, XmlEvent};
 
@@ -357,10 +358,18 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     for subject in &self.subjects {
                         write_element_block("Subject", w, |w| {
                             XmlElement::<Onix3Thoth>::xml_element(&subject.subject_type, w)?;
-                            write_element_block("SubjectCode", w, |w| {
-                                w.write(XmlEvent::Characters(&subject.subject_code))
-                                    .map_err(|e| e.into())
-                            })
+                            match subject.subject_type {
+                                SubjectType::KEYWORD | SubjectType::CUSTOM => {
+                                    write_element_block("SubjectHeadingText", w, |w| {
+                                        w.write(XmlEvent::Characters(&subject.subject_code))
+                                            .map_err(|e| e.into())
+                                    })
+                                }
+                                _ => write_element_block("SubjectCode", w, |w| {
+                                    w.write(XmlEvent::Characters(&subject.subject_code))
+                                        .map_err(|e| e.into())
+                                }),
+                            }
                         })?;
                     }
                     write_element_block("Audience", w, |w| {
@@ -522,7 +531,22 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         write_element_block("ImprintName", w, |w| {
                             w.write(XmlEvent::Characters(&self.imprint.imprint_name))
                                 .map_err(|e| e.into())
-                        })
+                        })?;
+                        if let Some(url) = &self.imprint.imprint_url {
+                            write_element_block("ImprintIdentifier", w, |w| {
+                                // 01 Proprietary
+                                write_element_block("ImprintIDType", w, |w| {
+                                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDTypeName", w, |w| {
+                                    w.write(XmlEvent::Characters("URL")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDValue", w, |w| {
+                                    w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                })
+                            })?;
+                        }
+                        Ok(())
                     })?;
                     write_element_block("Publisher", w, |w| {
                         // 01 Publisher
@@ -595,7 +619,20 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         })
                     })
                 })?;
-                if !isbns.is_empty() {
+                let non_child_relations: Vec<WorkRelations> = self
+                    .relations
+                    .clone()
+                    .into_iter()
+                    .filter(|r| {
+                        r.relation_type != RelationType::HAS_CHILD
+                            && r.relation_type != RelationType::IS_CHILD_OF
+                            && r.related_work.doi.is_some()
+                    })
+                    .collect();
+                if !isbns.is_empty()
+                    || !non_child_relations.is_empty()
+                    || !self.references.is_empty()
+                {
                     write_element_block("RelatedMaterial", w, |w| {
                         for isbn in &isbns {
                             if !current_isbn.eq(&Some(isbn.clone())) {
@@ -618,6 +655,119 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 })?;
                             }
                         }
+                        for relation in &non_child_relations {
+                            if relation.relation_type == RelationType::HAS_TRANSLATION
+                                || relation.relation_type == RelationType::IS_TRANSLATION_OF
+                            {
+                                write_element_block("RelatedWork", w, |w| {
+                                    let work_relation_code = match &relation.relation_type {
+                                        // 49 Related work is derived from this via translation
+                                        RelationType::HAS_TRANSLATION => "49",
+                                        // 29 Derived from via translation
+                                        RelationType::IS_TRANSLATION_OF => "29",
+                                        _ => unreachable!(),
+                                    };
+                                    write_element_block("WorkRelationCode", w, |w| {
+                                        w.write(XmlEvent::Characters(work_relation_code))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("WorkIdentifier", w, |w| {
+                                        // 06 DOI
+                                        write_element_block("WorkIDType", w, |w| {
+                                            w.write(XmlEvent::Characters("06"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDValue", w, |w| {
+                                            w.write(XmlEvent::Characters(
+                                                &relation
+                                                    .related_work
+                                                    .doi
+                                                    .as_ref()
+                                                    .unwrap()
+                                                    .to_string(),
+                                            ))
+                                            .map_err(|e| e.into())
+                                        })
+                                    })
+                                })?;
+                            } else {
+                                write_element_block("RelatedProduct", w, |w| {
+                                    let product_relation_code = match &relation.relation_type {
+                                        // 01 Includes
+                                        RelationType::HAS_PART => "01",
+                                        // 02 Is part of
+                                        RelationType::IS_PART_OF => "02",
+                                        // 03 Replaces
+                                        RelationType::REPLACES => "03",
+                                        // 05 Replaced by
+                                        RelationType::IS_REPLACED_BY => "05",
+                                        _ => unreachable!(),
+                                    };
+                                    write_element_block("ProductRelationCode", w, |w| {
+                                        w.write(XmlEvent::Characters(product_relation_code))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("ProductIdentifier", w, |w| {
+                                        // 06 DOI
+                                        write_element_block("ProductIDType", w, |w| {
+                                            w.write(XmlEvent::Characters("06"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDValue", w, |w| {
+                                            w.write(XmlEvent::Characters(
+                                                &relation
+                                                    .related_work
+                                                    .doi
+                                                    .as_ref()
+                                                    .unwrap()
+                                                    .to_string(),
+                                            ))
+                                            .map_err(|e| e.into())
+                                        })
+                                    })
+                                })?;
+                            }
+                        }
+                        for reference in &self.references {
+                            write_element_block("RelatedProduct", w, |w| {
+                                // 34 Cites
+                                write_element_block("ProductRelationCode", w, |w| {
+                                    w.write(XmlEvent::Characters("34")).map_err(|e| e.into())
+                                })?;
+                                if let Some(doi) = &reference.doi {
+                                    write_element_block("ProductIdentifier", w, |w| {
+                                        // 06 DOI
+                                        write_element_block("ProductIDType", w, |w| {
+                                            w.write(XmlEvent::Characters("06"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDValue", w, |w| {
+                                            w.write(XmlEvent::Characters(&doi.to_string()))
+                                                .map_err(|e| e.into())
+                                        })
+                                    })
+                                } else {
+                                    // Unstructured citation is mandatory in Thoth if DOI is missing
+                                    write_element_block("ProductIdentifier", w, |w| {
+                                        // 01 Proprietary
+                                        write_element_block("ProductIDType", w, |w| {
+                                            w.write(XmlEvent::Characters("01"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDTypeName", w, |w| {
+                                            w.write(XmlEvent::Characters("Unstructured citation"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("IDValue", w, |w| {
+                                            w.write(XmlEvent::Characters(
+                                                reference.unstructured_citation.as_ref().unwrap(),
+                                            ))
+                                            .map_err(|e| e.into())
+                                        })
+                                    })
+                                }
+                            })?;
+                        }
                         Ok(())
                     })?;
                 }
@@ -900,6 +1050,46 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                     })
                 })?;
             }
+            for affiliation in &self.affiliations {
+                write_element_block("ProfessionalAffiliation", w, |w| {
+                    if let Some(position) = &affiliation.position {
+                        write_element_block("ProfessionalPosition", w, |w| {
+                            w.write(XmlEvent::Characters(position))
+                                .map_err(|e| e.into())
+                        })?;
+                    }
+                    if let Some(ror) = &affiliation.institution.ror {
+                        write_element_block("AffiliationIdentifier", w, |w| {
+                            // 40 ROR
+                            write_element_block("AffiliationIDType", w, |w| {
+                                w.write(XmlEvent::Characters("40")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("IDValue", w, |w| {
+                                w.write(XmlEvent::Characters(&ror.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    if let Some(doi) = &affiliation.institution.institution_doi {
+                        write_element_block("AffiliationIdentifier", w, |w| {
+                            // 32 FundRef DOI
+                            write_element_block("AffiliationIDType", w, |w| {
+                                w.write(XmlEvent::Characters("32")).map_err(|e| e.into())
+                            })?;
+                            write_element_block("IDValue", w, |w| {
+                                w.write(XmlEvent::Characters(&doi.to_string()))
+                                    .map_err(|e| e.into())
+                            })
+                        })?;
+                    }
+                    write_element_block("Affiliation", w, |w| {
+                        w.write(XmlEvent::Characters(
+                            &affiliation.institution.institution_name,
+                        ))
+                        .map_err(|e| e.into())
+                    })
+                })?;
+            }
             Ok(())
         })
     }
@@ -940,6 +1130,36 @@ impl XmlElementBlock<Onix3Thoth> for WorkIssues {
                     .map_err(|e| e.into())
                 })
             })?;
+            if let Some(url) = &self.series.series_url {
+                write_element_block("CollectionIdentifier", w, |w| {
+                    // 01 Proprietary
+                    write_element_block("CollectionIDType", w, |w| {
+                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDTypeName", w, |w| {
+                        w.write(XmlEvent::Characters("Series URL"))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                    })
+                })?;
+            }
+            if let Some(url) = &self.series.series_cfp_url {
+                write_element_block("CollectionIdentifier", w, |w| {
+                    // 01 Proprietary
+                    write_element_block("CollectionIDType", w, |w| {
+                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDTypeName", w, |w| {
+                        w.write(XmlEvent::Characters("Series Call for Proposals URL"))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                    })
+                })?;
+            }
             write_element_block("TitleDetail", w, |w| {
                 // 01 Cover title (serial)
                 write_element_block("TitleType", w, |w| {
@@ -1006,9 +1226,18 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
             if let Some(project_name) = &self.project_name {
                 identifiers.insert("projectname".to_string(), project_name.to_string());
             }
+            if let Some(project_shortname) = &self.project_name {
+                identifiers.insert(
+                    "projectshortname".to_string(),
+                    project_shortname.to_string(),
+                );
+            }
             if let Some(grant_number) = &self.grant_number {
                 identifiers.insert("grantnumber".to_string(), grant_number.to_string());
             }
+            if let Some(jurisdiction) = &self.jurisdiction {
+                identifiers.insert("jurisdiction".to_string(), jurisdiction.to_string());
+            }
             if !identifiers.is_empty() {
                 write_element_block("Funding", w, |w| {
                     for (typename, value) in &identifiers {

From fb2175d4ee866ed30aa1aa4fd1522f24f4afbd5e Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 19 Feb 2024 13:40:15 +0000
Subject: [PATCH 08/44] Abstract out references/relations [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 224 +++++++++++----------
 1 file changed, 113 insertions(+), 111 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 92f55ae7..84e4e142 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
     ContributionType, LanguageRelation, PublicationType, RelationType, SubjectType, Work,
-    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkRelations, WorkStatus,
-    WorkType,
+    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkReferences, WorkRelations,
+    WorkStatus, WorkType,
 };
 use xml::writer::{EventWriter, XmlEvent};
 
@@ -656,117 +656,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             }
                         }
                         for relation in &non_child_relations {
-                            if relation.relation_type == RelationType::HAS_TRANSLATION
-                                || relation.relation_type == RelationType::IS_TRANSLATION_OF
-                            {
-                                write_element_block("RelatedWork", w, |w| {
-                                    let work_relation_code = match &relation.relation_type {
-                                        // 49 Related work is derived from this via translation
-                                        RelationType::HAS_TRANSLATION => "49",
-                                        // 29 Derived from via translation
-                                        RelationType::IS_TRANSLATION_OF => "29",
-                                        _ => unreachable!(),
-                                    };
-                                    write_element_block("WorkRelationCode", w, |w| {
-                                        w.write(XmlEvent::Characters(work_relation_code))
-                                            .map_err(|e| e.into())
-                                    })?;
-                                    write_element_block("WorkIdentifier", w, |w| {
-                                        // 06 DOI
-                                        write_element_block("WorkIDType", w, |w| {
-                                            w.write(XmlEvent::Characters("06"))
-                                                .map_err(|e| e.into())
-                                        })?;
-                                        write_element_block("IDValue", w, |w| {
-                                            w.write(XmlEvent::Characters(
-                                                &relation
-                                                    .related_work
-                                                    .doi
-                                                    .as_ref()
-                                                    .unwrap()
-                                                    .to_string(),
-                                            ))
-                                            .map_err(|e| e.into())
-                                        })
-                                    })
-                                })?;
-                            } else {
-                                write_element_block("RelatedProduct", w, |w| {
-                                    let product_relation_code = match &relation.relation_type {
-                                        // 01 Includes
-                                        RelationType::HAS_PART => "01",
-                                        // 02 Is part of
-                                        RelationType::IS_PART_OF => "02",
-                                        // 03 Replaces
-                                        RelationType::REPLACES => "03",
-                                        // 05 Replaced by
-                                        RelationType::IS_REPLACED_BY => "05",
-                                        _ => unreachable!(),
-                                    };
-                                    write_element_block("ProductRelationCode", w, |w| {
-                                        w.write(XmlEvent::Characters(product_relation_code))
-                                            .map_err(|e| e.into())
-                                    })?;
-                                    write_element_block("ProductIdentifier", w, |w| {
-                                        // 06 DOI
-                                        write_element_block("ProductIDType", w, |w| {
-                                            w.write(XmlEvent::Characters("06"))
-                                                .map_err(|e| e.into())
-                                        })?;
-                                        write_element_block("IDValue", w, |w| {
-                                            w.write(XmlEvent::Characters(
-                                                &relation
-                                                    .related_work
-                                                    .doi
-                                                    .as_ref()
-                                                    .unwrap()
-                                                    .to_string(),
-                                            ))
-                                            .map_err(|e| e.into())
-                                        })
-                                    })
-                                })?;
-                            }
+                            XmlElementBlock::<Onix3Thoth>::xml_element(relation, w).ok();
                         }
                         for reference in &self.references {
-                            write_element_block("RelatedProduct", w, |w| {
-                                // 34 Cites
-                                write_element_block("ProductRelationCode", w, |w| {
-                                    w.write(XmlEvent::Characters("34")).map_err(|e| e.into())
-                                })?;
-                                if let Some(doi) = &reference.doi {
-                                    write_element_block("ProductIdentifier", w, |w| {
-                                        // 06 DOI
-                                        write_element_block("ProductIDType", w, |w| {
-                                            w.write(XmlEvent::Characters("06"))
-                                                .map_err(|e| e.into())
-                                        })?;
-                                        write_element_block("IDValue", w, |w| {
-                                            w.write(XmlEvent::Characters(&doi.to_string()))
-                                                .map_err(|e| e.into())
-                                        })
-                                    })
-                                } else {
-                                    // Unstructured citation is mandatory in Thoth if DOI is missing
-                                    write_element_block("ProductIdentifier", w, |w| {
-                                        // 01 Proprietary
-                                        write_element_block("ProductIDType", w, |w| {
-                                            w.write(XmlEvent::Characters("01"))
-                                                .map_err(|e| e.into())
-                                        })?;
-                                        write_element_block("IDTypeName", w, |w| {
-                                            w.write(XmlEvent::Characters("Unstructured citation"))
-                                                .map_err(|e| e.into())
-                                        })?;
-                                        write_element_block("IDValue", w, |w| {
-                                            w.write(XmlEvent::Characters(
-                                                reference.unstructured_citation.as_ref().unwrap(),
-                                            ))
-                                            .map_err(|e| e.into())
-                                        })
-                                    })
-                                }
-                            })?;
+                            XmlElementBlock::<Onix3Thoth>::xml_element(reference, w).ok();
                         }
                         Ok(())
                     })?;
@@ -1263,6 +1156,115 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
     }
 }
 
+impl XmlElementBlock<Onix3Thoth> for WorkReferences {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        write_element_block("RelatedProduct", w, |w| {
+            // 34 Cites
+            write_element_block("ProductRelationCode", w, |w| {
+                w.write(XmlEvent::Characters("34")).map_err(|e| e.into())
+            })?;
+            if let Some(doi) = &self.doi {
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 06 DOI
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&doi.to_string()))
+                            .map_err(|e| e.into())
+                    })
+                })
+            } else {
+                // Unstructured citation is mandatory in Thoth if DOI is missing
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 01 Proprietary
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDTypeName", w, |w| {
+                        w.write(XmlEvent::Characters("Unstructured citation"))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(
+                            self.unstructured_citation.as_ref().unwrap(),
+                        ))
+                        .map_err(|e| e.into())
+                    })
+                })
+            }
+        })
+    }
+}
+
+impl XmlElementBlock<Onix3Thoth> for WorkRelations {
+    fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        if self.relation_type == RelationType::HAS_TRANSLATION
+            || self.relation_type == RelationType::IS_TRANSLATION_OF
+        {
+            write_element_block("RelatedWork", w, |w| {
+                let work_relation_code = match &self.relation_type {
+                    // 49 Related work is derived from this via translation
+                    RelationType::HAS_TRANSLATION => "49",
+                    // 29 Derived from via translation
+                    RelationType::IS_TRANSLATION_OF => "29",
+                    _ => unreachable!(),
+                };
+                write_element_block("WorkRelationCode", w, |w| {
+                    w.write(XmlEvent::Characters(work_relation_code))
+                        .map_err(|e| e.into())
+                })?;
+                write_element_block("WorkIdentifier", w, |w| {
+                    // 06 DOI
+                    write_element_block("WorkIDType", w, |w| {
+                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(
+                            // Caller must guarantee that DOI is present
+                            &self.related_work.doi.as_ref().unwrap().to_string(),
+                        ))
+                        .map_err(|e| e.into())
+                    })
+                })
+            })
+        } else {
+            write_element_block("RelatedProduct", w, |w| {
+                let product_relation_code = match &self.relation_type {
+                    // 01 Includes
+                    RelationType::HAS_PART => "01",
+                    // 02 Is part of
+                    RelationType::IS_PART_OF => "02",
+                    // 03 Replaces
+                    RelationType::REPLACES => "03",
+                    // 05 Replaced by
+                    RelationType::IS_REPLACED_BY => "05",
+                    // This implementation is only valid for translation/part/replacement
+                    // relationships, not parent/child relationships
+                    _ => unreachable!(),
+                };
+                write_element_block("ProductRelationCode", w, |w| {
+                    w.write(XmlEvent::Characters(product_relation_code))
+                        .map_err(|e| e.into())
+                })?;
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 06 DOI
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(
+                            // Caller must guarantee that DOI is present
+                            &self.related_work.doi.as_ref().unwrap().to_string(),
+                        ))
+                        .map_err(|e| e.into())
+                    })
+                })
+            })
+        }
+    }
+}
+
 impl XmlElementBlock<Onix3Thoth> for (&str, &f64, &str) {
     // (MeasureType, Measurement, MeasureUnitCode)
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {

From 29d920ccc04e21d45a0d7a0cdfa1f69b4c9c3cd1 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:52:54 +0000
Subject: [PATCH 09/44] Output full location data [tests not yet fixed]

---
 thoth-client/src/queries.rs                |   6 +
 thoth-export-server/src/xml/onix3_thoth.rs | 122 +++++++++++++--------
 2 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/thoth-client/src/queries.rs b/thoth-client/src/queries.rs
index 2d0e3d31..b99c25b6 100644
--- a/thoth-client/src/queries.rs
+++ b/thoth-client/src/queries.rs
@@ -44,6 +44,12 @@ impl fmt::Display for work_query::PublicationType {
     }
 }
 
+impl fmt::Display for work_query::LocationPlatform {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{self:?}")
+    }
+}
+
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "assets/schema.graphql",
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 84e4e142..ff7c9ffb 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -2,9 +2,9 @@ use chrono::Utc;
 use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
-    ContributionType, LanguageRelation, PublicationType, RelationType, SubjectType, Work,
-    WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkReferences, WorkRelations,
-    WorkStatus, WorkType,
+    ContributionType, LanguageRelation, LocationPlatform, PublicationType, RelationType,
+    SubjectType, Work, WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkReferences,
+    WorkRelations, WorkStatus, WorkType,
 };
 use xml::writer::{EventWriter, XmlEvent};
 
@@ -572,6 +572,23 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 })
                             })?;
                         }
+                        if let Some(url) = &self.landing_page {
+                            write_element_block("Website", w, |w| {
+                                // 02 Publisher's website for a specified work
+                                write_element_block("WebsiteRole", w, |w| {
+                                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("WebsiteDescription", w, |w| {
+                                    w.write(XmlEvent::Characters(
+                                        "Publisher's website: webpage for this title",
+                                    ))
+                                    .map_err(|e| e.into())
+                                })?;
+                                write_element_block("WebsiteLink", w, |w| {
+                                    w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                })
+                            })?;
+                        }
                         Ok(())
                     })?;
                     for funding in &self.fundings {
@@ -672,57 +689,74 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             })
                         })
                     })?;
-                    let mut supplies: HashMap<String, (String, String)> = HashMap::new();
-                    if let Some(full_text_url) = publication
-                        .locations
-                        .iter()
-                        .find(|l| l.canonical)
-                        .and_then(|l| l.full_text_url.clone())
-                    {
-                        supplies.insert(
-                            full_text_url.to_string(),
-                            (
-                                "29".to_string(),
-                                "Publisher's website: download the title".to_string(),
-                            ),
-                        );
-                    }
-                    if let Some(landing_page) = &self.landing_page {
-                        supplies.insert(
-                            landing_page.to_string(),
-                            (
-                                // 02 Publisher's website for a specified work
-                                "02".to_string(),
-                                "Publisher's website: web shop".to_string(),
-                            ),
-                        );
-                    }
-                    for (url, description) in supplies.iter() {
+                    for location in &publication.locations {
+                        let mut supplier_name = location.location_platform.to_string();
+                        let mut description_string = location.location_platform.to_string();
+                        // 11 Non-exclusive distributor to end-customers
+                        let mut supplier_role = "11";
+                        // 36 Supplier’s website for a specified work
+                        let mut landing_page_role = "36";
+
+                        if location.location_platform == LocationPlatform::PUBLISHER_WEBSITE {
+                            supplier_name = self.imprint.publisher.publisher_name.clone();
+                            description_string = "Publisher's website".to_string();
+                            // 09 Publisher to end-customers
+                            supplier_role = "09";
+                            // 02 Publisher's website for a specified work
+                            landing_page_role = "02";
+                        } else if location.location_platform == LocationPlatform::OTHER {
+                            supplier_name = "Unknown".to_string();
+                            description_string = "Unspecified hosting platform".to_string();
+                        }
+
                         write_element_block("SupplyDetail", w, |w| {
                             write_element_block("Supplier", w, |w| {
-                                // 09 Publisher to end-customers
                                 write_element_block("SupplierRole", w, |w| {
-                                    w.write(XmlEvent::Characters("09")).map_err(|e| e.into())
+                                    w.write(XmlEvent::Characters(supplier_role))
+                                        .map_err(|e| e.into())
                                 })?;
                                 write_element_block("SupplierName", w, |w| {
-                                    w.write(XmlEvent::Characters(
-                                        &self.imprint.publisher.publisher_name,
-                                    ))
-                                    .map_err(|e| e.into())
+                                    w.write(XmlEvent::Characters(&supplier_name))
+                                        .map_err(|e| e.into())
                                 })?;
-                                write_element_block("Website", w, |w| {
-                                    write_element_block("WebsiteRole", w, |w| {
-                                        w.write(XmlEvent::Characters(&description.0))
+                                if let Some(url) = &location.landing_page {
+                                    write_element_block("Website", w, |w| {
+                                        write_element_block("WebsiteRole", w, |w| {
+                                            w.write(XmlEvent::Characters(landing_page_role))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("WebsiteDescription", w, |w| {
+                                            w.write(XmlEvent::Characters(&format!(
+                                                "{}: webpage for this product",
+                                                description_string
+                                            )))
                                             .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("WebsiteLink", w, |w| {
+                                            w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                        })
                                     })?;
-                                    write_element_block("WebsiteDescription", w, |w| {
-                                        w.write(XmlEvent::Characters(&description.1))
+                                }
+                                if let Some(url) = &location.full_text_url {
+                                    write_element_block("Website", w, |w| {
+                                        write_element_block("WebsiteRole", w, |w| {
+                                            // 29 Web page for full content
+                                            w.write(XmlEvent::Characters("29"))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("WebsiteDescription", w, |w| {
+                                            w.write(XmlEvent::Characters(&format!(
+                                                "{}: download the title",
+                                                description_string
+                                            )))
                                             .map_err(|e| e.into())
+                                        })?;
+                                        write_element_block("WebsiteLink", w, |w| {
+                                            w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
+                                        })
                                     })?;
-                                    write_element_block("WebsiteLink", w, |w| {
-                                        w.write(XmlEvent::Characters(url)).map_err(|e| e.into())
-                                    })
-                                })
+                                }
+                                Ok(())
                             })?;
                             // 99 Contact supplier
                             write_element_block("ProductAvailability", w, |w| {

From 78a4d906e21b1d41ad2d2f999ed4694d8fc61347 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:54:24 +0000
Subject: [PATCH 10/44] Ensure Supplier elements e.g. Price are still output
 when no locations are present [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index ff7c9ffb..a6e41ea3 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
     ContributionType, LanguageRelation, LocationPlatform, PublicationType, RelationType,
-    SubjectType, Work, WorkContributions, WorkFundings, WorkIssues, WorkLanguages, WorkReferences,
-    WorkRelations, WorkStatus, WorkType,
+    SubjectType, Work, WorkContributions, WorkFundings, WorkIssues, WorkLanguages,
+    WorkPublicationsLocations, WorkReferences, WorkRelations, WorkStatus, WorkType,
 };
 use xml::writer::{EventWriter, XmlEvent};
 
@@ -689,7 +689,20 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             })
                         })
                     })?;
-                    for location in &publication.locations {
+                    let mut locations: Vec<WorkPublicationsLocations> =
+                        publication.locations.clone();
+                    if locations.is_empty() {
+                        // Create single Supplier based on Work Landing Page
+                        // to ensure child elements such as Price are not omitted
+                        // (if Landing Page is None, Supplier will be complete apart from Website)
+                        locations = vec![WorkPublicationsLocations {
+                            landing_page: self.landing_page.clone(),
+                            full_text_url: None,
+                            location_platform: LocationPlatform::PUBLISHER_WEBSITE,
+                            canonical: true,
+                        }];
+                    }
+                    for location in locations {
                         let mut supplier_name = location.location_platform.to_string();
                         let mut description_string = location.location_platform.to_string();
                         // 11 Non-exclusive distributor to end-customers

From 17101de32e8fec51ac9376e49b2d78a6f80767d4 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Thu, 22 Feb 2024 13:53:45 +0000
Subject: [PATCH 11/44] Add CollectionSequence, improve
 license/subject/RelatedMaterial [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 39 ++++++++++++++++++----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index a6e41ea3..a4c116cf 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1,3 +1,4 @@
+use cc_license::License;
 use chrono::Utc;
 use std::collections::HashMap;
 use std::io::Write;
@@ -216,10 +217,14 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         XmlElementBlock::<Onix3Thoth>::xml_element(&("08", weight_oz, "oz"), w)
                             .ok();
                     }
-                    if let Some(license) = &self.license {
+                    if let Some(license_url) = &self.license {
+                        let license_text = match License::from_url(license_url) {
+                            Ok(license) => license.to_string(),
+                            Err(_) => "Unspecified".to_string(),
+                        };
                         write_element_block("EpubLicense", w, |w| {
                             write_element_block("EpubLicenseName", w, |w| {
-                                w.write(XmlEvent::Characters("Creative Commons License"))
+                                w.write(XmlEvent::Characters(&license_text))
                                     .map_err(|e| e.into())
                             })?;
                             write_element_block("EpubLicenseExpression", w, |w| {
@@ -227,7 +232,8 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
                                 })?;
                                 write_element_block("EpubLicenseExpressionLink", w, |w| {
-                                    w.write(XmlEvent::Characters(license)).map_err(|e| e.into())
+                                    w.write(XmlEvent::Characters(license_url))
+                                        .map_err(|e| e.into())
                                 })
                             })
                         })?;
@@ -355,8 +361,17 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             })
                         })?;
                     }
+                    let mut main_subject_found = vec![];
                     for subject in &self.subjects {
+                        // One subject within every subject type can/should be marked as Main
+                        // Use first one found with ordinal 1 (there may be multiple)
+                        let is_main_subject = subject.subject_ordinal == 1
+                            && !main_subject_found.contains(&subject.subject_type);
                         write_element_block("Subject", w, |w| {
+                            if is_main_subject {
+                                // MainSubject is an empty element
+                                write_element_block("MainSubject", w, |_w| Ok(()))?;
+                            }
                             XmlElement::<Onix3Thoth>::xml_element(&subject.subject_type, w)?;
                             match subject.subject_type {
                                 SubjectType::KEYWORD | SubjectType::CUSTOM => {
@@ -371,6 +386,9 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 }),
                             }
                         })?;
+                        if is_main_subject {
+                            main_subject_found.push(subject.subject_type.clone());
+                        }
                     }
                     write_element_block("Audience", w, |w| {
                         // 01 ONIX audience codes
@@ -646,9 +664,8 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             && r.related_work.doi.is_some()
                     })
                     .collect();
-                if !isbns.is_empty()
-                    || !non_child_relations.is_empty()
-                    || !self.references.is_empty()
+                // If only one ISBN is present, it'll be for the current product, not a related product
+                if isbns.len() > 1 || !non_child_relations.is_empty() || !self.references.is_empty()
                 {
                     write_element_block("RelatedMaterial", w, |w| {
                         for isbn in &isbns {
@@ -1100,6 +1117,16 @@ impl XmlElementBlock<Onix3Thoth> for WorkIssues {
                     })
                 })?;
             }
+            write_element_block("CollectionSequence", w, |w| {
+                // 03 Publication order
+                write_element_block("CollectionSequenceType", w, |w| {
+                    w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                })?;
+                write_element_block("CollectionSequenceNumber", w, |w| {
+                    w.write(XmlEvent::Characters(&self.issue_ordinal.to_string()))
+                        .map_err(|e| e.into())
+                })
+            })?;
             write_element_block("TitleDetail", w, |w| {
                 // 01 Cover title (serial)
                 write_element_block("TitleType", w, |w| {

From 254e3abbe43935dec1afdd64a381ad14e6be037c Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Thu, 22 Feb 2024 13:57:57 +0000
Subject: [PATCH 12/44] Use Publication ID rather than Work ID for
 RecordReference [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index a4c116cf..ca46d462 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -71,10 +71,13 @@ impl XmlElementBlock<Onix3Thoth> for Work {
             }
         }
         for publication in &self.publications {
+            let publication_id = format!("urn:uuid:{}", publication.publication_id);
             let current_isbn = &publication.isbn.as_ref().map(|p| p.to_hyphenless_string());
             write_element_block("Product", w, |w| {
                 write_element_block("RecordReference", w, |w| {
-                    w.write(XmlEvent::Characters(&work_id))
+                    // Note that most existing Thoth ONIX outputs use the Work ID, not Publication ID,
+                    // as they output one record per Work rather than one record per Publication
+                    w.write(XmlEvent::Characters(&publication_id))
                         .map_err(|e| e.into())
                 })?;
                 // 03 Notification confirmed on publication
@@ -99,6 +102,20 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             .map_err(|e| e.into())
                     })
                 })?;
+                write_element_block("ProductIdentifier", w, |w| {
+                    // 01 Proprietary
+                    write_element_block("ProductIDType", w, |w| {
+                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDTypeName", w, |w| {
+                        w.write(XmlEvent::Characters("thoth-publication-id"))
+                            .map_err(|e| e.into())
+                    })?;
+                    write_element_block("IDValue", w, |w| {
+                        w.write(XmlEvent::Characters(&publication_id))
+                            .map_err(|e| e.into())
+                    })
+                })?;
                 if let Some(isbn) = current_isbn {
                     write_element_block("ProductIdentifier", w, |w| {
                         // 15 ISBN-13

From f35db25ae0fa74a3dbb50b19d29215f5adebdb38 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Thu, 22 Feb 2024 15:20:50 +0000
Subject: [PATCH 13/44] Add minimal representation of chapters as ContentItems
 [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index ca46d462..a07a795c 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -561,6 +561,63 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     }
                     Ok(())
                 })?;
+                let chapter_relations: Vec<WorkRelations> = self
+                    .relations
+                    .clone()
+                    .into_iter()
+                    .filter(|r| {
+                        r.relation_type == RelationType::HAS_CHILD && r.related_work.doi.is_some()
+                    })
+                    .collect();
+                if !chapter_relations.is_empty() {
+                    write_element_block("ContentDetail", w, |w| {
+                        for relation in &chapter_relations {
+                            let chapter = &relation.related_work;
+                            write_element_block("ContentItem", w, |w| {
+                                write_element_block("LevelSequenceNumber", w, |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &relation.relation_ordinal.to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                })
+                            })?;
+                            write_element_block("TextItem", w, |w| {
+                                // 03 Body matter
+                                write_element_block("TextItemType", w, |w| {
+                                    w.write(XmlEvent::Characters("03")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("TextItemIdentifier", w, |w| {
+                                    // 06 DOI
+                                    write_element_block("TextItemIDType", w, |w| {
+                                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
+                                    })?;
+                                    write_element_block("IDValue", w, |w| {
+                                        w.write(XmlEvent::Characters(
+                                            &chapter.doi.as_ref().unwrap().to_string(),
+                                        ))
+                                        .map_err(|e| e.into())
+                                    })
+                                })
+                            })?;
+                            if let Some(first_page) = &chapter.first_page {
+                                write_element_block("PageRun", w, |w| {
+                                    write_element_block("FirstPageNumber", w, |w| {
+                                        w.write(XmlEvent::Characters(first_page))
+                                            .map_err(|e| e.into())
+                                    })?;
+                                    if let Some(last_page) = &chapter.last_page {
+                                        write_element_block("LastPageNumber", w, |w| {
+                                            w.write(XmlEvent::Characters(last_page))
+                                                .map_err(|e| e.into())
+                                        })?;
+                                    }
+                                    Ok(())
+                                })?;
+                            }
+                        }
+                        Ok(())
+                    })?;
+                }
                 write_element_block("PublishingDetail", w, |w| {
                     write_element_block("Imprint", w, |w| {
                         write_element_block("ImprintName", w, |w| {

From be0ffc52ac7c75d2158b430cf70fcdfbdb0d1a38 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Mon, 19 Feb 2024 15:21:36 +0100
Subject: [PATCH 14/44] Added change to Changelog, added up and down migrations
 to default main_contribution to true

---
 CHANGELOG.md                           | 1 +
 thoth-api/migrations/v0.11.17/down.sql | 2 ++
 thoth-api/migrations/v0.11.17/up.sql   | 2 ++
 3 files changed, 5 insertions(+)
 create mode 100644 thoth-api/migrations/v0.11.17/down.sql
 create mode 100644 thoth-api/migrations/v0.11.17/up.sql

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e34615d..5f052cb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [[0.11.16]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.16) - 2024-02-19
 ### Changed
+  - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
   - [561](https://github.com/thoth-pub/thoth/issues/561) - Add "Publisher Website" as a location platform
   - [553](https://github.com/thoth-pub/thoth/pull/553) - Upgrade rust to `1.76.0` in production and development `Dockerfile`
   - [305](https://github.com/thoth-pub/thoth/issues/305) - Update rust edition to 2021
diff --git a/thoth-api/migrations/v0.11.17/down.sql b/thoth-api/migrations/v0.11.17/down.sql
new file mode 100644
index 00000000..055b53a9
--- /dev/null
+++ b/thoth-api/migrations/v0.11.17/down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE contribution
+    ALTER COLUMN main_contribution SET DEFAULT False;
diff --git a/thoth-api/migrations/v0.11.17/up.sql b/thoth-api/migrations/v0.11.17/up.sql
new file mode 100644
index 00000000..87fe07b7
--- /dev/null
+++ b/thoth-api/migrations/v0.11.17/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE contribution
+    ALTER COLUMN main_contribution SET DEFAULT True;

From 38ece75e8c1700b596819e4d8b0d4cf1713e76a7 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Mon, 19 Feb 2024 16:08:15 +0100
Subject: [PATCH 15/44] Changed main_contribution: true

---
 thoth-api/src/model/contribution/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thoth-api/src/model/contribution/mod.rs b/thoth-api/src/model/contribution/mod.rs
index ae6c87be..aa670d6d 100644
--- a/thoth-api/src/model/contribution/mod.rs
+++ b/thoth-api/src/model/contribution/mod.rs
@@ -212,7 +212,7 @@ impl Default for Contribution {
             work_id: Default::default(),
             contributor_id: Default::default(),
             contribution_type: Default::default(),
-            main_contribution: Default::default(),
+            main_contribution: true,
             biography: Default::default(),
             created_at: Default::default(),
             updated_at: Default::default(),

From 193b93aeea6f6ecd04e2381bf980b0677d81a212 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:16:08 +0000
Subject: [PATCH 16/44] Remove AffiliationIdentifier elements accidentally
 added from Release 3.1

---
 thoth-export-server/src/xml/onix3_thoth.rs | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index a07a795c..cfbd728c 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1089,30 +1089,6 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                                 .map_err(|e| e.into())
                         })?;
                     }
-                    if let Some(ror) = &affiliation.institution.ror {
-                        write_element_block("AffiliationIdentifier", w, |w| {
-                            // 40 ROR
-                            write_element_block("AffiliationIDType", w, |w| {
-                                w.write(XmlEvent::Characters("40")).map_err(|e| e.into())
-                            })?;
-                            write_element_block("IDValue", w, |w| {
-                                w.write(XmlEvent::Characters(&ror.to_string()))
-                                    .map_err(|e| e.into())
-                            })
-                        })?;
-                    }
-                    if let Some(doi) = &affiliation.institution.institution_doi {
-                        write_element_block("AffiliationIdentifier", w, |w| {
-                            // 32 FundRef DOI
-                            write_element_block("AffiliationIDType", w, |w| {
-                                w.write(XmlEvent::Characters("32")).map_err(|e| e.into())
-                            })?;
-                            write_element_block("IDValue", w, |w| {
-                                w.write(XmlEvent::Characters(&doi.to_string()))
-                                    .map_err(|e| e.into())
-                            })
-                        })?;
-                    }
                     write_element_block("Affiliation", w, |w| {
                         w.write(XmlEvent::Characters(
                             &affiliation.institution.institution_name,

From 32caa7fbfd12caf4595816b540f3a5f4ce3c7732 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:33:40 +0000
Subject: [PATCH 17/44] Add chapter page count inc. extending client [tests not
 yet fixed]

---
 thoth-client/assets/queries.graphql                  | 1 +
 thoth-export-server/src/bibtex/bibtex_thoth.rs       | 2 ++
 thoth-export-server/src/csv/csv_thoth.rs             | 2 ++
 thoth-export-server/src/json/json_thoth.rs           | 2 ++
 thoth-export-server/src/marc21/marc21record_thoth.rs | 1 +
 thoth-export-server/src/xml/doideposit_crossref.rs   | 2 ++
 thoth-export-server/src/xml/onix3_thoth.rs           | 6 ++++++
 7 files changed, 16 insertions(+)

diff --git a/thoth-client/assets/queries.graphql b/thoth-client/assets/queries.graphql
index d52dde00..b25301c8 100644
--- a/thoth-client/assets/queries.graphql
+++ b/thoth-client/assets/queries.graphql
@@ -167,6 +167,7 @@ fragment Work on Work {
             place
             firstPage
             lastPage
+            pageCount
             pageInterval
             landingPage
             imprint {
diff --git a/thoth-export-server/src/bibtex/bibtex_thoth.rs b/thoth-export-server/src/bibtex/bibtex_thoth.rs
index 461235e2..562eb4d7 100644
--- a/thoth-export-server/src/bibtex/bibtex_thoth.rs
+++ b/thoth-export-server/src/bibtex/bibtex_thoth.rs
@@ -467,6 +467,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
@@ -496,6 +497,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
diff --git a/thoth-export-server/src/csv/csv_thoth.rs b/thoth-export-server/src/csv/csv_thoth.rs
index 7661cece..dd8a05f0 100644
--- a/thoth-export-server/src/csv/csv_thoth.rs
+++ b/thoth-export-server/src/csv/csv_thoth.rs
@@ -831,6 +831,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
@@ -1155,6 +1156,7 @@ mod tests {
                 place: None,
                 first_page: None,
                 last_page: None,
+                page_count: None,
                 page_interval: None,
                 landing_page: None,
                 imprint: WorkRelationsRelatedWorkImprint {
diff --git a/thoth-export-server/src/json/json_thoth.rs b/thoth-export-server/src/json/json_thoth.rs
index e1c9d13e..1c9eefbe 100644
--- a/thoth-export-server/src/json/json_thoth.rs
+++ b/thoth-export-server/src/json/json_thoth.rs
@@ -394,6 +394,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
@@ -760,6 +761,7 @@ mod tests {
         "place": null,
         "firstPage": null,
         "lastPage": null,
+        "pageCount": null,
         "pageInterval": null,
         "landingPage": null,
         "imprint": {
diff --git a/thoth-export-server/src/marc21/marc21record_thoth.rs b/thoth-export-server/src/marc21/marc21record_thoth.rs
index 2c2e687a..7b119eec 100644
--- a/thoth-export-server/src/marc21/marc21record_thoth.rs
+++ b/thoth-export-server/src/marc21/marc21record_thoth.rs
@@ -1062,6 +1062,7 @@ pub(crate) mod tests {
                 place: None,
                 first_page: None,
                 last_page: None,
+                page_count: None,
                 page_interval: None,
                 landing_page: None,
                 imprint: WorkRelationsRelatedWorkImprint {
diff --git a/thoth-export-server/src/xml/doideposit_crossref.rs b/thoth-export-server/src/xml/doideposit_crossref.rs
index b8c77db9..76b69557 100644
--- a/thoth-export-server/src/xml/doideposit_crossref.rs
+++ b/thoth-export-server/src/xml/doideposit_crossref.rs
@@ -820,6 +820,7 @@ mod tests {
                 place: Some("Other Place".to_string()),
                 first_page: Some("10".to_string()),
                 last_page: Some("20".to_string()),
+                page_count: Some(11),
                 page_interval: Some("10–20".to_string()),
                 landing_page: Some("https://www.book.com/chapter_one".to_string()),
                 imprint: WorkRelationsRelatedWorkImprint {
@@ -1268,6 +1269,7 @@ mod tests {
                     place: Some("Other Place".to_string()),
                     first_page: Some("10".to_string()),
                     last_page: Some("20".to_string()),
+                    page_count: Some(11),
                     page_interval: Some("10–20".to_string()),
                     landing_page: Some("https://www.book.com/part_one".to_string()),
                     imprint: WorkRelationsRelatedWorkImprint {
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index cfbd728c..82c2c816 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -614,6 +614,12 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     Ok(())
                                 })?;
                             }
+                            if let Some(page_count) = &chapter.page_count {
+                                write_element_block("NumberOfPages", w, |w| {
+                                    w.write(XmlEvent::Characters(&page_count.to_string()))
+                                        .map_err(|e| e.into())
+                                })?;
+                            }
                         }
                         Ok(())
                     })?;

From 5ba6e7444776984ad515db921384589d1427c35a Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 12:06:31 +0000
Subject: [PATCH 18/44] Ensure correct ordering of RelatedWorks and
 RelatedProducts [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 82c2c816..161b9208 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -748,6 +748,21 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                 if isbns.len() > 1 || !non_child_relations.is_empty() || !self.references.is_empty()
                 {
                     write_element_block("RelatedMaterial", w, |w| {
+                        // RelatedWorks should be listed before RelatedProducts
+                        for relation in &non_child_relations {
+                            if relation.relation_type == RelationType::HAS_TRANSLATION
+                                || relation.relation_type == RelationType::IS_TRANSLATION_OF
+                            {
+                                XmlElementBlock::<Onix3Thoth>::xml_element(relation, w).ok();
+                            }
+                        }
+                        for relation in &non_child_relations {
+                            if relation.relation_type != RelationType::HAS_TRANSLATION
+                                && relation.relation_type != RelationType::IS_TRANSLATION_OF
+                            {
+                                XmlElementBlock::<Onix3Thoth>::xml_element(relation, w).ok();
+                            }
+                        }
                         for isbn in &isbns {
                             if !current_isbn.eq(&Some(isbn.clone())) {
                                 write_element_block("RelatedProduct", w, |w| {
@@ -769,9 +784,6 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 })?;
                             }
                         }
-                        for relation in &non_child_relations {
-                            XmlElementBlock::<Onix3Thoth>::xml_element(relation, w).ok();
-                        }
                         for reference in &self.references {
                             XmlElementBlock::<Onix3Thoth>::xml_element(reference, w).ok();
                         }

From cc891273b77de4a192dde7c348e3525657a11547 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 12:13:48 +0000
Subject: [PATCH 19/44] Amend Overdrive-specific date requirement [tests not
 yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 161b9208..e8efab38 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -886,8 +886,8 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             })?;
                             write_element_block("SupplyDate", w, |w| {
                                 write_element_block("SupplyDateRole", w, |w| {
-                                    // 02 Embargo Date
-                                    w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                                    // 02 Expected availability date
+                                    w.write(XmlEvent::Characters("08")).map_err(|e| e.into())
                                 })?;
                                 // dateformat="00" YYYYMMDD
                                 write_full_element_block(

From ab470b8620c3f8aaacb263589c9bb08180a41d3a Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 12:27:50 +0000
Subject: [PATCH 20/44] Corrections to ordering etc [tests not yet fixed]

---
 thoth-export-server/src/xml/onix3_thoth.rs | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index e8efab38..95f60e9a 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -18,6 +18,9 @@ pub struct Onix3Thoth {}
 
 const ONIX_ERROR: &str = "onix_3.0::thoth";
 
+// Based on ONIX for Books Release 3.0.8 Specification
+// Download link: https://www.editeur.org/files/ONIX%203/ONIX_for_Books_Release_3-0_pdf_docs+codes_Issue_64.zip
+// Retrieved from: https://www.editeur.org/93/Release-3.0-Downloads/#Specifications
 impl XmlSpecification for Onix3Thoth {
     fn handle_event<W: Write>(w: &mut EventWriter<W>, works: &[Work]) -> ThothResult<()> {
         write_full_element_block("ONIXMessage", Some(ONIX3_NS.to_vec()), w, |w| {
@@ -62,7 +65,6 @@ impl XmlSpecification for Onix3Thoth {
 
 impl XmlElementBlock<Onix3Thoth> for Work {
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
-        // TODO is there any field that's optional in Thoth but mandatory in ONIX?
         let work_id = format!("urn:uuid:{}", self.work_id);
         let mut isbns: Vec<String> = Vec::new();
         for publication in &self.publications {
@@ -541,7 +543,7 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                     write_element_block("ResourceFeatureType", w, |w| {
                                         w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
                                     })?;
-                                    write_element_block("ResourceFeatureNote", w, |w| {
+                                    write_element_block("FeatureNote", w, |w| {
                                         w.write(XmlEvent::Characters(cover_caption))
                                             .map_err(|e| e.into())
                                     })
@@ -1065,6 +1067,10 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                     })
                 })?;
             }
+            write_element_block("PersonName", w, |w| {
+                w.write(XmlEvent::Characters(&self.full_name))
+                    .map_err(|e| e.into())
+            })?;
             if let Some(first_name) = &self.first_name {
                 write_element_block("NamesBeforeKey", w, |w| {
                     w.write(XmlEvent::Characters(first_name))
@@ -1075,10 +1081,22 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                 w.write(XmlEvent::Characters(&self.last_name))
                     .map_err(|e| e.into())
             })?;
-            write_element_block("PersonName", w, |w| {
-                w.write(XmlEvent::Characters(&self.full_name))
-                    .map_err(|e| e.into())
-            })?;
+            for affiliation in &self.affiliations {
+                write_element_block("ProfessionalAffiliation", w, |w| {
+                    if let Some(position) = &affiliation.position {
+                        write_element_block("ProfessionalPosition", w, |w| {
+                            w.write(XmlEvent::Characters(position))
+                                .map_err(|e| e.into())
+                        })?;
+                    }
+                    write_element_block("Affiliation", w, |w| {
+                        w.write(XmlEvent::Characters(
+                            &affiliation.institution.institution_name,
+                        ))
+                        .map_err(|e| e.into())
+                    })
+                })?;
+            }
             if let Some(biography) = &self.biography {
                 write_element_block("BiographicalNote", w, |w| {
                     w.write(XmlEvent::Characters(biography))
@@ -1099,22 +1117,6 @@ impl XmlElementBlock<Onix3Thoth> for WorkContributions {
                     })
                 })?;
             }
-            for affiliation in &self.affiliations {
-                write_element_block("ProfessionalAffiliation", w, |w| {
-                    if let Some(position) = &affiliation.position {
-                        write_element_block("ProfessionalPosition", w, |w| {
-                            w.write(XmlEvent::Characters(position))
-                                .map_err(|e| e.into())
-                        })?;
-                    }
-                    write_element_block("Affiliation", w, |w| {
-                        w.write(XmlEvent::Characters(
-                            &affiliation.institution.institution_name,
-                        ))
-                        .map_err(|e| e.into())
-                    })
-                })?;
-            }
             Ok(())
         })
     }
@@ -1226,10 +1228,6 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
             write_element_block("PublishingRole", w, |w| {
                 w.write(XmlEvent::Characters("16")).map_err(|e| e.into())
             })?;
-            write_element_block("PublisherName", w, |w| {
-                w.write(XmlEvent::Characters(&self.institution.institution_name))
-                    .map_err(|e| e.into())
-            })?;
             if let Some(ror) = &self.institution.ror {
                 write_element_block("PublisherIdentifier", w, |w| {
                     // 40 ROR
@@ -1254,6 +1252,10 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
                     })
                 })?;
             }
+            write_element_block("PublisherName", w, |w| {
+                w.write(XmlEvent::Characters(&self.institution.institution_name))
+                    .map_err(|e| e.into())
+            })?;
             let mut identifiers: HashMap<String, String> = HashMap::new();
             if let Some(program) = &self.program {
                 identifiers.insert("programname".to_string(), program.to_string());

From f56cef2f7d6cccb3691a8e42e9ff9fb6e6c1b1b3 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Mon, 26 Feb 2024 16:12:48 +0000
Subject: [PATCH 21/44] Correct and extend onix3_thoth tests for independent
 element blocks (and fix error)

---
 thoth-export-server/src/xml/onix3_thoth.rs | 470 ++++++++++++++++++---
 1 file changed, 406 insertions(+), 64 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 95f60e9a..f36f2600 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1263,7 +1263,7 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
             if let Some(project_name) = &self.project_name {
                 identifiers.insert("projectname".to_string(), project_name.to_string());
             }
-            if let Some(project_shortname) = &self.project_name {
+            if let Some(project_shortname) = &self.project_shortname {
                 identifiers.insert(
                     "projectshortname".to_string(),
                     project_shortname.to_string(),
@@ -1429,18 +1429,22 @@ impl XmlElementBlock<Onix3Thoth> for (&str, &f64, &str) {
 
 #[cfg(test)]
 mod tests {
-    // Testing note: XML nodes cannot be guaranteed to be output in the same order every time
-    // We therefore rely on `assert!(contains)` rather than `assert_eq!`
+    // Testing note: Repeated XML nodes cannot be guaranteed to be output in the same order every time
+    // We therefore rely on `assert!(contains)` rather than `assert_eq!` in these cases
+    // println!s throughout will only be printed if test fails - this assists debugging
     use super::*;
     use std::str::FromStr;
     use thoth_api::model::Doi;
     use thoth_api::model::Isbn;
     use thoth_api::model::Orcid;
+    use thoth_api::model::Ror;
     use thoth_client::{
-        ContributionType, CurrencyCode, LanguageCode, LanguageRelation, LocationPlatform,
-        PublicationType, WorkContributionsContributor, WorkImprint, WorkImprintPublisher,
-        WorkIssuesSeries, WorkPublications, WorkPublicationsLocations, WorkPublicationsPrices,
-        WorkStatus, WorkSubjects, WorkType,
+        ContributionType, CurrencyCode, FundingInstitution, LanguageCode, LanguageRelation,
+        LocationPlatform, PublicationType, WorkContributionsAffiliations,
+        WorkContributionsAffiliationsInstitution, WorkContributionsContributor, WorkImprint,
+        WorkImprintPublisher, WorkIssuesSeries, WorkPublications, WorkPublicationsLocations,
+        WorkPublicationsPrices, WorkRelationsRelatedWork, WorkRelationsRelatedWorkImprint,
+        WorkRelationsRelatedWorkImprintPublisher, WorkStatus, WorkSubjects, WorkType,
     };
     use uuid::Uuid;
 
@@ -1471,48 +1475,105 @@ mod tests {
             contribution_type: ContributionType::AUTHOR,
             first_name: Some("Author".to_string()),
             last_name: "1".to_string(),
-            full_name: "Author 1".to_string(),
+            full_name: "Author N. 1".to_string(),
             main_contribution: true,
-            biography: None,
+            biography: Some("Author N. 1 is a made-up author".to_string()),
             contribution_ordinal: 1,
             contributor: WorkContributionsContributor {
                 orcid: Some(Orcid::from_str("https://orcid.org/0000-0002-0000-0001").unwrap()),
-                website: None,
+                website: Some("https://contributor.site".to_string()),
             },
-            affiliations: vec![],
+            affiliations: vec![WorkContributionsAffiliations {
+                position: Some("Manager".to_string()),
+                affiliation_ordinal: 1,
+                institution: WorkContributionsAffiliationsInstitution {
+                    institution_name: "University of Life".to_string(),
+                    institution_doi: None,
+                    ror: None,
+                    country_code: None,
+                },
+            }],
         };
 
         // Test standard output
         let output = generate_test_output(true, &test_contribution);
-        assert!(output.contains(r#"  <SequenceNumber>1</SequenceNumber>"#));
-        assert!(output.contains(r#"  <ContributorRole>A01</ContributorRole>"#));
-        assert!(output.contains(r#"  <NameIdentifier>"#));
-        assert!(output.contains(r#"    <NameIDType>21</NameIDType>"#));
-        assert!(output.contains(r#"    <IDValue>0000-0002-0000-0001</IDValue>"#));
-        assert!(output.contains(r#"  </NameIdentifier>"#));
-        // Given name is output as NamesBeforeKey and family name as KeyNames
-        assert!(output.contains(r#"  <NamesBeforeKey>Author</NamesBeforeKey>"#));
-        assert!(output.contains(r#"  <KeyNames>1</KeyNames>"#));
-        // PersonName is not output when given name is supplied
-        assert!(!output.contains(r#"  <PersonName>Author 1</PersonName>"#));
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<Contributor>
+  <SequenceNumber>1</SequenceNumber>
+  <ContributorRole>A01</ContributorRole>
+  <NameIdentifier>
+    <NameIDType>21</NameIDType>
+    <IDValue>0000-0002-0000-0001</IDValue>
+  </NameIdentifier>
+  <PersonName>Author N. 1</PersonName>
+  <NamesBeforeKey>Author</NamesBeforeKey>
+  <KeyNames>1</KeyNames>
+  <ProfessionalAffiliation>
+    <ProfessionalPosition>Manager</ProfessionalPosition>
+    <Affiliation>University of Life</Affiliation>
+  </ProfessionalAffiliation>
+  <BiographicalNote>Author N. 1 is a made-up author</BiographicalNote>
+  <Website>
+    <WebsiteRole>06</WebsiteRole>
+    <WebsiteDescription>Own website</WebsiteDescription>
+    <WebsiteLink>https://contributor.site</WebsiteLink>
+  </Website>
+</Contributor>"#
+        );
 
         // Change all possible values to test that output is updated
         test_contribution.contribution_type = ContributionType::EDITOR;
         test_contribution.contribution_ordinal = 2;
         test_contribution.contributor.orcid = None;
+        test_contribution.contributor.website = None;
         test_contribution.first_name = None;
+        test_contribution.biography = None;
+        test_contribution.affiliations[0].position = None;
+        let output = generate_test_output(true, &test_contribution);
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<Contributor>
+  <SequenceNumber>2</SequenceNumber>
+  <ContributorRole>B01</ContributorRole>
+  <PersonName>Author N. 1</PersonName>
+  <KeyNames>1</KeyNames>
+  <ProfessionalAffiliation>
+    <Affiliation>University of Life</Affiliation>
+  </ProfessionalAffiliation>
+</Contributor>"#
+        );
+
+        // Test multiple affiliations
+        test_contribution
+            .affiliations
+            .push(WorkContributionsAffiliations {
+                position: Some("Janitor".to_string()),
+                affiliation_ordinal: 2,
+                institution: WorkContributionsAffiliationsInstitution {
+                    institution_name: "Institute of Mopping".to_string(),
+                    institution_doi: None,
+                    ror: None,
+                    country_code: None,
+                },
+            });
         let output = generate_test_output(true, &test_contribution);
-        assert!(output.contains(r#"  <SequenceNumber>2</SequenceNumber>"#));
-        assert!(output.contains(r#"  <ContributorRole>B01</ContributorRole>"#));
-        // No ORCID supplied
-        assert!(!output.contains(r#"  <NameIdentifier>"#));
-        assert!(!output.contains(r#"    <NameIDType>21</NameIDType>"#));
-        assert!(!output.contains(r#"    <IDValue>0000-0002-0000-0001</IDValue>"#));
-        assert!(!output.contains(r#"  </NameIdentifier>"#));
-        // No given name supplied, so PersonName is output instead of KeyNames and NamesBeforeKey
-        assert!(!output.contains(r#"  <NamesBeforeKey>Author</NamesBeforeKey>"#));
-        assert!(!output.contains(r#"  <KeyNames>1</KeyNames>"#));
-        assert!(output.contains(r#"  <PersonName>Author 1</PersonName>"#));
+        println!("{output}");
+        assert!(output.contains(
+            r#"  <ProfessionalAffiliation>
+    <Affiliation>University of Life</Affiliation>
+  </ProfessionalAffiliation>"#
+        ));
+        assert!(output.contains(
+            r#"  <ProfessionalAffiliation>
+    <ProfessionalPosition>Janitor</ProfessionalPosition>
+    <Affiliation>Institute of Mopping</Affiliation>
+  </ProfessionalAffiliation>"#
+        ));
 
         // Test all remaining contributor roles
         test_contribution.contribution_type = ContributionType::TRANSLATOR;
@@ -1578,42 +1639,86 @@ mod tests {
                 series_name: "Name of series".to_string(),
                 issn_print: "1234-5678".to_string(),
                 issn_digital: "8765-4321".to_string(),
-                series_url: None,
+                series_url: Some("https://series.url".to_string()),
                 series_description: None,
-                series_cfp_url: None,
+                series_cfp_url: Some("https://series.cfp.url".to_string()),
             },
         };
 
         // Test standard output
         let output = generate_test_output(true, &test_issue);
-        assert!(output.contains(r#"<Collection>"#));
-        assert!(output.contains(r#"  <CollectionType>10</CollectionType>"#));
-        assert!(output.contains(r#"  <CollectionIdentifier>"#));
-        assert!(output.contains(r#"    <CollectionIDType>02</CollectionIDType>"#));
-        assert!(output.contains(r#"    <IDValue>87654321</IDValue>"#));
-        assert!(output.contains(r#"  <TitleDetail>"#));
-        assert!(output.contains(r#"    <TitleType>01</TitleType>"#));
-        assert!(output.contains(r#"    <TitleElement>"#));
-        assert!(output.contains(r#"      <TitleElementLevel>02</TitleElementLevel>"#));
-        assert!(output.contains(r#"      <PartNumber>1</PartNumber>"#));
-        assert!(output.contains(r#"      <TitleText>Name of series</TitleText>"#));
+        println!("{output}");
+        assert!(output.contains(
+            r#"<Collection>
+  <CollectionType>10</CollectionType>"#
+        ));
+        assert!(output.contains(
+            r#"  <CollectionIdentifier>
+    <CollectionIDType>02</CollectionIDType>
+    <IDValue>87654321</IDValue>
+  </CollectionIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"  <CollectionIdentifier>
+    <CollectionIDType>01</CollectionIDType>
+    <IDTypeName>Series URL</IDTypeName>
+    <IDValue>https://series.url</IDValue>
+  </CollectionIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"  <CollectionIdentifier>
+    <CollectionIDType>01</CollectionIDType>
+    <IDTypeName>Series Call for Proposals URL</IDTypeName>
+    <IDValue>https://series.cfp.url</IDValue>
+  </CollectionIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"  <CollectionSequence>
+    <CollectionSequenceType>03</CollectionSequenceType>
+    <CollectionSequenceNumber>1</CollectionSequenceNumber>
+  </CollectionSequence>
+  <TitleDetail>
+    <TitleType>01</TitleType>
+    <TitleElement>
+      <TitleElementLevel>02</TitleElementLevel>
+      <PartNumber>1</PartNumber>
+      <TitleText>Name of series</TitleText>
+    </TitleElement>
+  </TitleDetail>
+</Collection>"#
+        ));
 
         // Change all possible values to test that output is updated
         test_issue.issue_ordinal = 2;
         test_issue.series.series_name = "Different series".to_string();
         test_issue.series.issn_digital = "1111-2222".to_string();
+        test_issue.series.series_url = None;
+        test_issue.series.series_cfp_url = None;
         let output = generate_test_output(true, &test_issue);
-        assert!(output.contains(r#"<Collection>"#));
-        assert!(output.contains(r#"  <CollectionType>10</CollectionType>"#));
-        assert!(output.contains(r#"  <CollectionIdentifier>"#));
-        assert!(output.contains(r#"    <CollectionIDType>02</CollectionIDType>"#));
-        assert!(output.contains(r#"    <IDValue>11112222</IDValue>"#));
-        assert!(output.contains(r#"  <TitleDetail>"#));
-        assert!(output.contains(r#"    <TitleType>01</TitleType>"#));
-        assert!(output.contains(r#"    <TitleElement>"#));
-        assert!(output.contains(r#"      <TitleElementLevel>02</TitleElementLevel>"#));
-        assert!(output.contains(r#"      <PartNumber>2</PartNumber>"#));
-        assert!(output.contains(r#"      <TitleText>Different series</TitleText>"#));
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<Collection>
+  <CollectionType>10</CollectionType>
+  <CollectionIdentifier>
+    <CollectionIDType>02</CollectionIDType>
+    <IDValue>11112222</IDValue>
+  </CollectionIdentifier>
+  <CollectionSequence>
+    <CollectionSequenceType>03</CollectionSequenceType>
+    <CollectionSequenceNumber>2</CollectionSequenceNumber>
+  </CollectionSequence>
+  <TitleDetail>
+    <TitleType>01</TitleType>
+    <TitleElement>
+      <TitleElementLevel>02</TitleElementLevel>
+      <PartNumber>2</PartNumber>
+      <TitleText>Different series</TitleText>
+    </TitleElement>
+  </TitleDetail>
+</Collection>"#
+        );
     }
 
     #[test]
@@ -1621,21 +1726,29 @@ mod tests {
         let mut test_funding = WorkFundings {
             program: Some("Name of program".to_string()),
             project_name: Some("Name of project".to_string()),
-            project_shortname: None,
+            project_shortname: Some("Nop".to_string()),
             grant_number: Some("Number of grant".to_string()),
-            jurisdiction: None,
-            institution: thoth_client::FundingInstitution {
+            jurisdiction: Some("Republic of Moldova".to_string()),
+            institution: FundingInstitution {
                 institution_name: "Name of institution".to_string(),
-                institution_doi: None,
-                ror: None,
+                institution_doi: Some(
+                    Doi::from_str("https://doi.org/10.00001/INSTITUTION.0001").unwrap(),
+                ),
+                ror: Some(Ror::from_str("https://ror.org/0aaaaaa00").unwrap()),
                 country_code: None,
             },
         };
 
         // Test standard output
         let output = generate_test_output(true, &test_funding);
+        println!("{output}");
         assert!(output.contains(r#"<Publisher>"#));
         assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        assert!(output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
         assert!(output.contains(r#"  <PublisherName>Name of institution</PublisherName>"#));
         assert!(output.contains(r#"  <Funding>"#));
         assert!(output.contains(r#"    <FundingIdentifier>"#));
@@ -1644,16 +1757,26 @@ mod tests {
         assert!(output.contains(r#"      <IDValue>Name of program</IDValue>"#));
         assert!(output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
         assert!(output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Nop</IDValue>"#));
         assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
         assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
 
         // Change all possible values to test that output is updated
-
         test_funding.institution.institution_name = "Different institution".to_string();
         test_funding.program = None;
+        test_funding.institution.institution_doi = None;
         let output = generate_test_output(true, &test_funding);
         assert!(output.contains(r#"<Publisher>"#));
         assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        // No DOI supplied
+        assert!(!output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
         assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
         assert!(output.contains(r#"  <Funding>"#));
         assert!(output.contains(r#"    <FundingIdentifier>"#));
@@ -1663,13 +1786,50 @@ mod tests {
         assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
         assert!(output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
         assert!(output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Nop</IDValue>"#));
         assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
         assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
 
         test_funding.project_name = None;
+        test_funding.institution.ror = None;
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
+        // No DOI or ROR supplied, so PublisherIdentifier block is omitted completely
+        assert!(!output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
+        assert!(output.contains(r#"  <Funding>"#));
+        assert!(output.contains(r#"    <FundingIdentifier>"#));
+        assert!(output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        // No program supplied
+        assert!(!output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        // No project supplied
+        assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Nop</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
+
+        test_funding.project_shortname = None;
         let output = generate_test_output(true, &test_funding);
         assert!(output.contains(r#"<Publisher>"#));
         assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(!output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
         assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
         assert!(output.contains(r#"  <Funding>"#));
         assert!(output.contains(r#"    <FundingIdentifier>"#));
@@ -1680,15 +1840,54 @@ mod tests {
         // No project supplied
         assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
         assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        // No short name supplied
+        assert!(!output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Nop</IDValue>"#));
         assert!(output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
         assert!(output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
 
         test_funding.grant_number = None;
         let output = generate_test_output(true, &test_funding);
         assert!(output.contains(r#"<Publisher>"#));
         assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(!output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
         assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
-        // No program, project or grant supplied, so Funding block is omitted completely
+        assert!(output.contains(r#"  <Funding>"#));
+        assert!(output.contains(r#"    <FundingIdentifier>"#));
+        assert!(output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
+        // No program supplied
+        assert!(!output.contains(r#"      <IDTypeName>programname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
+        // No project supplied
+        assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        // No short name supplied
+        assert!(!output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Nop</IDValue>"#));
+        // No grant supplied
+        assert!(!output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
+
+        test_funding.jurisdiction = None;
+        let output = generate_test_output(true, &test_funding);
+        assert!(output.contains(r#"<Publisher>"#));
+        assert!(output.contains(r#"  <PublishingRole>16</PublishingRole>"#));
+        assert!(!output.contains(r#"  <PublisherIdentifier>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>40</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>0aaaaaa00</IDValue>"#));
+        assert!(!output.contains(r#"    <PublisherIDType>32</PublisherIDType>"#));
+        assert!(!output.contains(r#"    <IDValue>10.00001/INSTITUTION.0001</IDValue>"#));
+        assert!(output.contains(r#"  <PublisherName>Different institution</PublisherName>"#));
+        // No program, project, short name, grant or jurisdiction supplied,
+        // so Funding block is omitted completely
         assert!(!output.contains(r#"  <Funding>"#));
         assert!(!output.contains(r#"    <FundingIdentifier>"#));
         assert!(!output.contains(r#"      <FundingIDType>01</FundingIDType>"#));
@@ -1696,8 +1895,151 @@ mod tests {
         assert!(!output.contains(r#"      <IDValue>Name of program</IDValue>"#));
         assert!(!output.contains(r#"      <IDTypeName>projectname</IDTypeName>"#));
         assert!(!output.contains(r#"      <IDValue>Name of project</IDValue>"#));
+        assert!(!output.contains(r#"      <IDTypeName>projectshortname</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Nop</IDValue>"#));
         assert!(!output.contains(r#"      <IDTypeName>grantnumber</IDTypeName>"#));
         assert!(!output.contains(r#"      <IDValue>Number of grant</IDValue>"#));
+        assert!(!output.contains(r#"      <IDTypeName>jurisdiction</IDTypeName>"#));
+        assert!(!output.contains(r#"      <IDValue>Republic of Moldova</IDValue>"#));
+    }
+
+    #[test]
+    fn test_onix3_thoth_references() {
+        let mut test_reference = WorkReferences {
+            reference_ordinal: 1,
+            doi: Some(Doi::from_str("https://doi.org/10.00001/reference").unwrap()),
+            unstructured_citation: Some("Author, A. (2022) Article, Journal.".to_string()),
+            issn: None,
+            isbn: None,
+            journal_title: None,
+            article_title: None,
+            series_title: None,
+            volume_title: None,
+            edition: None,
+            author: None,
+            volume: None,
+            issue: None,
+            first_page: None,
+            component_number: None,
+            standard_designator: None,
+            standards_body_name: None,
+            standards_body_acronym: None,
+            publication_date: None,
+            retrieval_date: None,
+        };
+
+        // Test standard output
+        let output = generate_test_output(true, &test_reference);
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<RelatedProduct>
+  <ProductRelationCode>34</ProductRelationCode>
+  <ProductIdentifier>
+    <ProductIDType>06</ProductIDType>
+    <IDValue>10.00001/reference</IDValue>
+  </ProductIdentifier>
+</RelatedProduct>"#
+        );
+
+        // Remove DOI
+        test_reference.doi = None;
+        let output = generate_test_output(true, &test_reference);
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<RelatedProduct>
+  <ProductRelationCode>34</ProductRelationCode>
+  <ProductIdentifier>
+    <ProductIDType>01</ProductIDType>
+    <IDTypeName>Unstructured citation</IDTypeName>
+    <IDValue>Author, A. (2022) Article, Journal.</IDValue>
+  </ProductIdentifier>
+</RelatedProduct>"#
+        );
+    }
+
+    #[test]
+    fn test_onix3_thoth_relations() {
+        let mut test_relation = WorkRelations {
+            relation_type: RelationType::HAS_TRANSLATION,
+            relation_ordinal: 1,
+            related_work: WorkRelationsRelatedWork {
+                full_title: "N/A".to_string(),
+                title: "N/A".to_string(),
+                subtitle: None,
+                edition: None,
+                doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
+                publication_date: None,
+                license: None,
+                short_abstract: None,
+                long_abstract: None,
+                place: None,
+                first_page: None,
+                last_page: None,
+                page_count: None,
+                page_interval: None,
+                landing_page: None,
+                imprint: WorkRelationsRelatedWorkImprint {
+                    publisher: WorkRelationsRelatedWorkImprintPublisher {
+                        publisher_name: "N/A".to_string(),
+                    },
+                },
+                contributions: vec![],
+                publications: vec![],
+                references: vec![],
+                fundings: vec![],
+            },
+        };
+
+        // Test RelatedWork type
+        let output = generate_test_output(true, &test_relation);
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<RelatedWork>
+  <WorkRelationCode>49</WorkRelationCode>
+  <WorkIdentifier>
+    <WorkIDType>06</WorkIDType>
+    <IDValue>10.00001/RELATION.0001</IDValue>
+  </WorkIdentifier>
+</RelatedWork>"#
+        );
+
+        // Test RelatedProduct type, change DOI
+        test_relation.relation_type = RelationType::HAS_PART;
+        test_relation.related_work.doi =
+            Some(Doi::from_str("https://doi.org/10.00002/RELATION.0002").unwrap());
+        let output = generate_test_output(true, &test_relation);
+        println!("{output}");
+        assert_eq!(
+            output,
+            r#"<?xml version="1.0" encoding="utf-8"?>
+<RelatedProduct>
+  <ProductRelationCode>01</ProductRelationCode>
+  <ProductIdentifier>
+    <ProductIDType>06</ProductIDType>
+    <IDValue>10.00002/RELATION.0002</IDValue>
+  </ProductIdentifier>
+</RelatedProduct>"#
+        );
+
+        // Test all other relation codes
+        test_relation.relation_type = RelationType::IS_TRANSLATION_OF;
+        let output = generate_test_output(true, &test_relation);
+        assert!(output.contains(r#"  <WorkRelationCode>29</WorkRelationCode>"#));
+        test_relation.relation_type = RelationType::IS_PART_OF;
+        let output = generate_test_output(true, &test_relation);
+        assert!(output.contains(r#"  <ProductRelationCode>02</ProductRelationCode>"#));
+        test_relation.relation_type = RelationType::REPLACES;
+        let output = generate_test_output(true, &test_relation);
+        assert!(output.contains(r#"  <ProductRelationCode>03</ProductRelationCode>"#));
+        test_relation.relation_type = RelationType::IS_REPLACED_BY;
+        let output = generate_test_output(true, &test_relation);
+        assert!(output.contains(r#"  <ProductRelationCode>05</ProductRelationCode>"#));
     }
 
     #[test]

From 8349c56c50e744d55f4f46f180de51d6c4b3f331 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:04:02 +0000
Subject: [PATCH 22/44] Fix existing contributions tests not updated under
 #fbebeda (and copy-pasted into onix3_thoth)

---
 thoth-export-server/src/xml/onix21_ebsco_host.rs     |  9 +++++++++
 .../src/xml/onix21_proquest_ebrary.rs                |  9 +++++++++
 thoth-export-server/src/xml/onix3_overdrive.rs       | 12 ++++++++++++
 thoth-export-server/src/xml/onix3_project_muse.rs    | 12 ++++++++++++
 thoth-export-server/src/xml/onix3_thoth.rs           | 12 ++++++++++++
 5 files changed, 54 insertions(+)

diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs
index 07499d86..18390d68 100644
--- a/thoth-export-server/src/xml/onix21_ebsco_host.rs
+++ b/thoth-export-server/src/xml/onix21_ebsco_host.rs
@@ -736,6 +736,15 @@ mod tests {
         test_contribution.contribution_type = ContributionType::PREFACE_BY;
         let output = generate_test_output(true, &test_contribution);
         assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::SOFTWARE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A30</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::CONTRIBUTIONS_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A32</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INDEXER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A34</ContributorRole>"#));
     }
 
     #[test]
diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
index 56f7343c..2050038e 100644
--- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
+++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
@@ -728,6 +728,15 @@ mod tests {
         test_contribution.contribution_type = ContributionType::PREFACE_BY;
         let output = generate_test_output(true, &test_contribution);
         assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::SOFTWARE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A30</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::CONTRIBUTIONS_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A32</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INDEXER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A34</ContributorRole>"#));
     }
 
     #[test]
diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs
index 9bc04cff..632fa7cd 100644
--- a/thoth-export-server/src/xml/onix3_overdrive.rs
+++ b/thoth-export-server/src/xml/onix3_overdrive.rs
@@ -892,6 +892,18 @@ mod tests {
         test_contribution.contribution_type = ContributionType::PREFACE_BY;
         let output = generate_test_output(true, &test_contribution);
         assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::SOFTWARE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A30</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::RESEARCH_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A51</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::CONTRIBUTIONS_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A32</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INDEXER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A34</ContributorRole>"#));
     }
 
     #[test]
diff --git a/thoth-export-server/src/xml/onix3_project_muse.rs b/thoth-export-server/src/xml/onix3_project_muse.rs
index 50d810f8..54bdb102 100644
--- a/thoth-export-server/src/xml/onix3_project_muse.rs
+++ b/thoth-export-server/src/xml/onix3_project_muse.rs
@@ -674,6 +674,18 @@ mod tests {
         test_contribution.contribution_type = ContributionType::PREFACE_BY;
         let output = generate_test_output(true, &test_contribution);
         assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::SOFTWARE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A30</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::RESEARCH_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A51</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::CONTRIBUTIONS_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A32</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INDEXER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A34</ContributorRole>"#));
     }
 
     #[test]
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index f36f2600..e91bfd69 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1600,6 +1600,18 @@ mod tests {
         test_contribution.contribution_type = ContributionType::PREFACE_BY;
         let output = generate_test_output(true, &test_contribution);
         assert!(output.contains(r#"  <ContributorRole>A15</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::SOFTWARE_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A30</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::RESEARCH_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A51</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::CONTRIBUTIONS_BY;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A32</ContributorRole>"#));
+        test_contribution.contribution_type = ContributionType::INDEXER;
+        let output = generate_test_output(true, &test_contribution);
+        assert!(output.contains(r#"  <ContributorRole>A34</ContributorRole>"#));
     }
 
     #[test]

From d40a64ffa2b3252e660cf5778350c7b88bbd52dc Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:52:23 +0000
Subject: [PATCH 23/44] Minor improvements to test readability

---
 thoth-export-server/src/xml/onix3_thoth.rs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index e91bfd69..13ad464e 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1564,12 +1564,14 @@ mod tests {
         let output = generate_test_output(true, &test_contribution);
         println!("{output}");
         assert!(output.contains(
-            r#"  <ProfessionalAffiliation>
+            r#"
+  <ProfessionalAffiliation>
     <Affiliation>University of Life</Affiliation>
   </ProfessionalAffiliation>"#
         ));
         assert!(output.contains(
-            r#"  <ProfessionalAffiliation>
+            r#"
+  <ProfessionalAffiliation>
     <ProfessionalPosition>Janitor</ProfessionalPosition>
     <Affiliation>Institute of Mopping</Affiliation>
   </ProfessionalAffiliation>"#
@@ -1661,31 +1663,36 @@ mod tests {
         let output = generate_test_output(true, &test_issue);
         println!("{output}");
         assert!(output.contains(
-            r#"<Collection>
+            r#"
+<Collection>
   <CollectionType>10</CollectionType>"#
         ));
         assert!(output.contains(
-            r#"  <CollectionIdentifier>
+            r#"
+  <CollectionIdentifier>
     <CollectionIDType>02</CollectionIDType>
     <IDValue>87654321</IDValue>
   </CollectionIdentifier>"#
         ));
         assert!(output.contains(
-            r#"  <CollectionIdentifier>
+            r#"
+  <CollectionIdentifier>
     <CollectionIDType>01</CollectionIDType>
     <IDTypeName>Series URL</IDTypeName>
     <IDValue>https://series.url</IDValue>
   </CollectionIdentifier>"#
         ));
         assert!(output.contains(
-            r#"  <CollectionIdentifier>
+            r#"
+  <CollectionIdentifier>
     <CollectionIDType>01</CollectionIDType>
     <IDTypeName>Series Call for Proposals URL</IDTypeName>
     <IDValue>https://series.cfp.url</IDValue>
   </CollectionIdentifier>"#
         ));
         assert!(output.contains(
-            r#"  <CollectionSequence>
+            r#"
+  <CollectionSequence>
     <CollectionSequenceType>03</CollectionSequenceType>
     <CollectionSequenceNumber>1</CollectionSequenceNumber>
   </CollectionSequence>

From 4e3b1b41d2eac928de03fcecd42ee8b88456a5a3 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:56:24 +0000
Subject: [PATCH 24/44] Correct and extend test_onix3_thoth_works to cover most
 cases

---
 thoth-export-server/src/xml/onix3_thoth.rs | 1441 ++++++++++++++++----
 1 file changed, 1144 insertions(+), 297 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 13ad464e..1fec848f 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -700,19 +700,26 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         })?;
                     }
                     XmlElement::<Onix3Thoth>::xml_element(&self.work_status, w)?;
-                    write_element_block("PublishingDate", w, |w| {
-                        write_element_block("PublishingDateRole", w, |w| {
-                            // 01 Publication date
-                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                    if let Some(date) = &self.publication_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 01 Publication date
+                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
                         })?;
-                        // dateformat="00" YYYYMMDD
-                        write_full_element_block("Date", Some(vec![("dateformat", "00")]), w, |w| {
-                            w.write(XmlEvent::Characters(
-                                &self.publication_date.unwrap().format("%Y%m%d").to_string(),
-                            ))
-                            .map_err(|e| e.into())
-                        })
-                    })?;
+                    }
                     if let Some(copyright_holder) = &self.copyright_holder {
                         write_element_block("CopyrightStatement", w, |w| {
                             write_element_block("CopyrightOwner", w, |w| {
@@ -746,8 +753,11 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             && r.related_work.doi.is_some()
                     })
                     .collect();
-                // If only one ISBN is present, it'll be for the current product, not a related product
-                if isbns.len() > 1 || !non_child_relations.is_empty() || !self.references.is_empty()
+                // Only output ISBNs in RelatedMaterial if at least one is present which
+                // doesn't relate to the current publication
+                if (!isbns.is_empty() && !isbns.eq(&vec![current_isbn.clone().unwrap_or_default()]))
+                    || !non_child_relations.is_empty()
+                    || !self.references.is_empty()
                 {
                     write_element_block("RelatedMaterial", w, |w| {
                         // RelatedWorks should be listed before RelatedProducts
@@ -886,28 +896,26 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             write_element_block("ProductAvailability", w, |w| {
                                 w.write(XmlEvent::Characters("99")).map_err(|e| e.into())
                             })?;
-                            write_element_block("SupplyDate", w, |w| {
-                                write_element_block("SupplyDateRole", w, |w| {
-                                    // 02 Expected availability date
-                                    w.write(XmlEvent::Characters("08")).map_err(|e| e.into())
+                            if let Some(date) = &self.publication_date {
+                                write_element_block("SupplyDate", w, |w| {
+                                    write_element_block("SupplyDateRole", w, |w| {
+                                        // 02 Expected availability date
+                                        w.write(XmlEvent::Characters("08")).map_err(|e| e.into())
+                                    })?;
+                                    // dateformat="00" YYYYMMDD
+                                    write_full_element_block(
+                                        "Date",
+                                        Some(vec![("dateformat", "00")]),
+                                        w,
+                                        |w| {
+                                            w.write(XmlEvent::Characters(
+                                                &date.format("%Y%m%d").to_string(),
+                                            ))
+                                            .map_err(|e| e.into())
+                                        },
+                                    )
                                 })?;
-                                // dateformat="00" YYYYMMDD
-                                write_full_element_block(
-                                    "Date",
-                                    Some(vec![("dateformat", "00")]),
-                                    w,
-                                    |w| {
-                                        w.write(XmlEvent::Characters(
-                                            &self
-                                                .publication_date
-                                                .unwrap()
-                                                .format("%Y%m%d")
-                                                .to_string(),
-                                        ))
-                                        .map_err(|e| e.into())
-                                    },
-                                )
-                            })?;
+                            }
                             if publication.prices.is_empty() {
                                 // 04 Contact supplier
                                 write_element_block("UnpricedItemType", w, |w| {
@@ -2070,63 +2078,61 @@ mod tests {
             title: "Book Title".to_string(),
             subtitle: Some("Book Subtitle".to_string()),
             work_type: WorkType::MONOGRAPH,
-            reference: None,
-            edition: Some(1),
+            reference: Some("IntRef1".to_string()),
+            edition: Some(2),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
-            short_abstract: None,
-            long_abstract: Some("Lorem ipsum dolor sit amet".to_string()),
-            general_note: None,
-            bibliography_note: None,
+            short_abstract: Some("Lorem ipsum dolor sit amet.".to_string()),
+            long_abstract: Some(
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit.".to_string(),
+            ),
+            general_note: Some("This is a general note".to_string()),
+            bibliography_note: Some("This is a bibliography note".to_string()),
             place: Some("León, Spain".to_string()),
             page_count: Some(334),
             page_breakdown: None,
             first_page: None,
             last_page: None,
             page_interval: None,
-            image_count: None,
-            table_count: None,
-            audio_count: None,
-            video_count: None,
+            image_count: Some(15),
+            table_count: Some(20),
+            audio_count: Some(25),
+            video_count: Some(30),
             landing_page: Some("https://www.book.com".to_string()),
             toc: Some("1. Chapter 1".to_string()),
-            lccn: None,
-            oclc: None,
+            lccn: Some("123456789".to_string()),
+            oclc: Some("987654321".to_string()),
             cover_url: Some("https://www.book.com/cover".to_string()),
-            cover_caption: None,
+            cover_caption: Some("This is a cover caption".to_string()),
             imprint: WorkImprint {
                 imprint_name: "OA Editions Imprint".to_string(),
-                imprint_url: None,
+                imprint_url: Some("https://imprint.oa".to_string()),
                 publisher: WorkImprintPublisher {
                     publisher_name: "OA Editions".to_string(),
-                    publisher_shortname: Some("OAE".to_string()),
-                    publisher_url: None,
+                    publisher_shortname: None,
+                    publisher_url: Some("https://publisher.oa".to_string()),
                 },
             },
             issues: vec![],
             contributions: vec![],
-            languages: vec![WorkLanguages {
-                language_code: LanguageCode::SPA,
-                language_relation: LanguageRelation::TRANSLATED_FROM,
-                main_language: true,
-            }],
+            languages: vec![],
             publications: vec![WorkPublications {
-                publication_id: Uuid::from_str("00000000-0000-0000-DDDD-000000000004").unwrap(),
-                publication_type: PublicationType::PDF,
+                publication_id: Uuid::from_str("00000000-0000-0000-BBBB-000000000001").unwrap(),
+                publication_type: PublicationType::PAPERBACK,
                 isbn: Some(Isbn::from_str("978-3-16-148410-0").unwrap()),
-                width_mm: None,
-                width_cm: None,
-                width_in: None,
-                height_mm: None,
-                height_cm: None,
-                height_in: None,
-                depth_mm: None,
-                depth_cm: None,
-                depth_in: None,
-                weight_g: None,
-                weight_oz: None,
+                width_mm: Some(156.0),
+                width_cm: Some(15.6),
+                width_in: Some(6.14),
+                height_mm: Some(234.0),
+                height_cm: Some(23.4),
+                height_in: Some(9.21),
+                depth_mm: Some(25.0),
+                depth_cm: Some(2.5),
+                depth_in: Some(1.0),
+                weight_g: Some(152.0),
+                weight_oz: Some(5.3616),
                 prices: vec![
                     WorkPublicationsPrices {
                         currency_code: CurrencyCode::EUR,
@@ -2142,9 +2148,9 @@ mod tests {
                     },
                 ],
                 locations: vec![WorkPublicationsLocations {
-                    landing_page: Some("https://www.book.com/ebook_landing".to_string()),
-                    full_text_url: Some("https://www.book.com/ebook_fulltext".to_string()),
-                    location_platform: LocationPlatform::OTHER,
+                    landing_page: Some("https://www.book.com/pb_landing".to_string()),
+                    full_text_url: None,
+                    location_platform: LocationPlatform::PUBLISHER_WEBSITE,
                     canonical: true,
                 }],
             }],
@@ -2177,256 +2183,1097 @@ mod tests {
                 WorkSubjects {
                     subject_code: "custom1".to_string(),
                     subject_type: SubjectType::CUSTOM,
-                    subject_ordinal: 6,
+                    subject_ordinal: 1,
+                },
+                WorkSubjects {
+                    subject_code: "custom2".to_string(),
+                    subject_type: SubjectType::CUSTOM,
+                    subject_ordinal: 1,
                 },
             ],
             fundings: vec![],
-            relations: vec![],
-            references: vec![],
+            relations: vec![
+                WorkRelations {
+                    relation_type: RelationType::HAS_CHILD,
+                    relation_ordinal: 1,
+                    related_work: WorkRelationsRelatedWork {
+                        full_title: "Related work title".to_string(),
+                        title: "N/A".to_string(),
+                        subtitle: None,
+                        edition: None,
+                        doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
+                        publication_date: None,
+                        license: None,
+                        short_abstract: None,
+                        long_abstract: None,
+                        place: None,
+                        first_page: Some("10".to_string()),
+                        last_page: Some("20".to_string()),
+                        page_count: Some(11),
+                        page_interval: None,
+                        landing_page: None,
+                        imprint: WorkRelationsRelatedWorkImprint {
+                            publisher: WorkRelationsRelatedWorkImprintPublisher {
+                                publisher_name: "N/A".to_string(),
+                            },
+                        },
+                        contributions: vec![],
+                        publications: vec![],
+                        references: vec![],
+                        fundings: vec![],
+                    },
+                },
+                WorkRelations {
+                    relation_type: RelationType::HAS_PART,
+                    relation_ordinal: 2,
+                    related_work: WorkRelationsRelatedWork {
+                        full_title: "N/A".to_string(),
+                        title: "N/A".to_string(),
+                        subtitle: None,
+                        edition: None,
+                        doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0002").unwrap()),
+                        publication_date: None,
+                        license: None,
+                        short_abstract: None,
+                        long_abstract: None,
+                        place: None,
+                        first_page: None,
+                        last_page: None,
+                        page_count: None,
+                        page_interval: None,
+                        landing_page: None,
+                        imprint: WorkRelationsRelatedWorkImprint {
+                            publisher: WorkRelationsRelatedWorkImprintPublisher {
+                                publisher_name: "N/A".to_string(),
+                            },
+                        },
+                        contributions: vec![],
+                        publications: vec![],
+                        references: vec![],
+                        fundings: vec![],
+                    },
+                },
+                WorkRelations {
+                    relation_type: RelationType::HAS_TRANSLATION,
+                    relation_ordinal: 3,
+                    related_work: WorkRelationsRelatedWork {
+                        full_title: "N/A".to_string(),
+                        title: "N/A".to_string(),
+                        subtitle: None,
+                        edition: None,
+                        doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0003").unwrap()),
+                        publication_date: None,
+                        license: None,
+                        short_abstract: None,
+                        long_abstract: None,
+                        place: None,
+                        first_page: None,
+                        last_page: None,
+                        page_count: None,
+                        page_interval: None,
+                        landing_page: None,
+                        imprint: WorkRelationsRelatedWorkImprint {
+                            publisher: WorkRelationsRelatedWorkImprintPublisher {
+                                publisher_name: "N/A".to_string(),
+                            },
+                        },
+                        contributions: vec![],
+                        publications: vec![],
+                        references: vec![],
+                        fundings: vec![],
+                    },
+                },
+            ],
+            references: vec![WorkReferences {
+                reference_ordinal: 1,
+                doi: Some(Doi::from_str("https://doi.org/10.00001/reference").unwrap()),
+                unstructured_citation: None,
+                issn: None,
+                isbn: None,
+                journal_title: None,
+                article_title: None,
+                series_title: None,
+                volume_title: None,
+                edition: None,
+                author: None,
+                volume: None,
+                issue: None,
+                first_page: None,
+                component_number: None,
+                standard_designator: None,
+                standards_body_name: None,
+                standards_body_acronym: None,
+                publication_date: None,
+                retrieval_date: None,
+            }],
         };
 
         // Test standard output
         let output = generate_test_output(true, &test_work);
-        assert!(output.contains(r#"<Product>"#));
-        assert!(output.contains(
-            r#"  <RecordReference>urn:uuid:00000000-0000-0000-aaaa-000000000001</RecordReference>"#
-        ));
-        assert!(output.contains(r#"  <NotificationType>03</NotificationType>"#));
-        assert!(output.contains(r#"  <RecordSourceType>01</RecordSourceType>"#));
-        assert!(output.contains(r#"  <ProductIdentifier>"#));
-        assert!(output.contains(r#"    <ProductIDType>01</ProductIDType>"#));
-        assert!(output
-            .contains(r#"    <IDValue>urn:uuid:00000000-0000-0000-aaaa-000000000001</IDValue>"#));
-        assert!(output.contains(r#"    <ProductIDType>15</ProductIDType>"#));
-        assert!(output.contains(r#"    <IDValue>9783161484100</IDValue>"#));
-        assert!(output.contains(r#"    <ProductIDType>06</ProductIDType>"#));
-        assert!(output.contains(r#"    <IDValue>10.00001/BOOK.0001</IDValue>"#));
-        assert!(output.contains(r#"  <DescriptiveDetail>"#));
-        assert!(output.contains(r#"    <ProductComposition>00</ProductComposition>"#));
-        assert!(output.contains(r#"    <ProductForm>EB</ProductForm>"#));
-        assert!(output.contains(r#"    <ProductFormDetail>E107</ProductFormDetail>"#));
-        assert!(output.contains(r#"    <PrimaryContentType>10</PrimaryContentType>"#));
-        assert!(output.contains(r#"    <EpubLicense>"#));
-        assert!(
-            output.contains(r#"      <EpubLicenseName>Creative Commons License</EpubLicenseName>"#)
-        );
-        assert!(output.contains(r#"      <EpubLicenseExpression>"#));
-        assert!(
-            output.contains(r#"        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>"#)
-        );
-        assert!(output.contains(r#"        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>"#));
-        assert!(output.contains(r#"    <TitleDetail>"#));
-        assert!(output.contains(r#"      <TitleType>01</TitleType>"#));
-        assert!(output.contains(r#"      <TitleElement>"#));
-        assert!(output.contains(r#"        <TitleElementLevel>01</TitleElementLevel>"#));
-        assert!(output.contains(r#"        <TitleText>Book Title</TitleText>"#));
-        assert!(output.contains(r#"        <Subtitle>Book Subtitle</Subtitle>"#));
-        assert!(output.contains(r#"    <Language>"#));
-        assert!(output.contains(r#"      <LanguageRole>02</LanguageRole>"#));
-        assert!(output.contains(r#"      <LanguageCode>spa</LanguageCode>"#));
-        assert!(output.contains(r#"    <Extent>"#));
-        assert!(output.contains(r#"      <ExtentType>00</ExtentType>"#));
-        assert!(output.contains(r#"      <ExtentValue>334</ExtentValue>"#));
-        assert!(output.contains(r#"      <ExtentUnit>03</ExtentUnit>"#));
-        assert!(output.contains(r#"    <Subject>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>12</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>AAB</SubjectCode>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>10</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>AAA000000</SubjectCode>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>04</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>JA85</SubjectCode>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>JWA</SubjectCode>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>20</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>keyword1</SubjectCode>"#));
-        assert!(output.contains(r#"      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>"#));
-        assert!(output.contains(r#"      <SubjectCode>custom1</SubjectCode>"#));
-        assert!(output.contains(r#"    <Audience>"#));
-        assert!(output.contains(r#"      <AudienceCodeType>01</AudienceCodeType>"#));
-        assert!(output.contains(r#"      <AudienceCodeValue>06</AudienceCodeValue>"#));
-        assert!(output.contains(r#"  <CollateralDetail>"#));
-        assert!(output.contains(r#"    <TextContent>"#));
-        assert!(output.contains(r#"      <TextType>03</TextType>"#));
-        assert!(output.contains(r#"      <ContentAudience>00</ContentAudience>"#));
-        assert!(output.contains(r#"      <Text language="eng">Lorem ipsum dolor sit amet</Text>"#));
-        assert!(output.contains(r#"      <TextType>04</TextType>"#));
-        assert!(output.contains(r#"      <Text language="eng">1. Chapter 1</Text>"#));
-        assert!(output.contains(r#"    <SupportingResource>"#));
-        assert!(output.contains(r#"      <ResourceContentType>01</ResourceContentType>"#));
-        assert!(output.contains(r#"      <ResourceMode>03</ResourceMode>"#));
-        assert!(output.contains(r#"      <ResourceVersion>"#));
-        assert!(output.contains(r#"        <ResourceForm>02</ResourceForm>"#));
-        assert!(
-            output.contains(r#"        <ResourceLink>https://www.book.com/cover</ResourceLink>"#)
-        );
-        assert!(output.contains(r#"  <PublishingDetail>"#));
-        assert!(output.contains(r#"    <Imprint>"#));
-        assert!(output.contains(r#"      <ImprintName>OA Editions Imprint</ImprintName>"#));
-        assert!(output.contains(r#"    <Publisher>"#));
-        assert!(output.contains(r#"      <PublishingRole>01</PublishingRole>"#));
-        assert!(output.contains(r#"      <PublisherName>OA Editions</PublisherName>"#));
-        assert!(output.contains(r#"    <CityOfPublication>León, Spain</CityOfPublication>"#));
-        assert!(output.contains(r#"    <PublishingStatus>04</PublishingStatus>"#));
-        assert!(output.contains(r#"    <PublishingDate>"#));
-        assert!(output.contains(r#"      <PublishingDateRole>01</PublishingDateRole>"#));
-        assert!(output.contains(r#"      <Date dateformat="00">19991231</Date>"#));
-        assert!(output.contains(r#"    <SalesRights>"#));
-        assert!(output.contains(r#"      <SalesRightsType>02</SalesRightsType>"#));
-        assert!(output.contains(r#"      <Territory>"#));
-        assert!(output.contains(r#"         <RegionsIncluded>WORLD</RegionsIncluded>"#));
-        assert!(output.contains(r#"    <RelatedProduct>"#));
-        assert!(output.contains(r#"      <ProductRelationCode>06</ProductRelationCode>"#));
-        assert!(output.contains(r#"      <ProductIdentifier>"#));
-        assert!(output.contains(r#"        <ProductIDType>15</ProductIDType>"#));
-        assert!(output.contains(r#"        <IDValue>9783161484100</IDValue>"#));
-        assert!(output.contains(r#"  <ProductSupply>"#));
-        assert!(output.contains(r#"    <Market>"#));
-        assert!(output.contains(r#"      <Territory>"#));
-        assert!(output.contains(r#"         <RegionsIncluded>WORLD</RegionsIncluded>"#));
-        assert!(output.contains(r#"    <SupplyDetail>"#));
-        assert!(output.contains(r#"      <Supplier>"#));
-        assert!(output.contains(r#"        <SupplierRole>09</SupplierRole>"#));
-        assert!(output.contains(r#"        <SupplierName>OA Editions</SupplierName>"#));
-        assert!(output.contains(r#"        <Website>"#));
-        assert!(output.contains(r#"          <WebsiteRole>01</WebsiteRole>"#));
-        assert!(output.contains(
-            r#"          <WebsiteDescription>Publisher's website: web shop</WebsiteDescription>"#
-        ));
-        assert!(output.contains(r#"          <WebsiteLink>https://www.book.com</WebsiteLink>"#));
-        assert!(output.contains(r#"      <ProductAvailability>20</ProductAvailability>"#));
-        assert!(output.contains(r#"      <SupplyDate>"#));
-        assert!(output.contains(r#"        <SupplyDateRole>02</SupplyDateRole>"#));
-        assert!(output.contains(r#"        <Date dateformat="00">19991231</Date>"#));
-        assert!(output.contains(r#"      <Price>"#));
-        assert!(output.contains(r#"        <PriceType>02</PriceType>"#));
-        assert!(output.contains(r#"        <PriceAmount>8.00</PriceAmount>"#));
-        assert!(output.contains(r#"        <CurrencyCode>USD</CurrencyCode>"#));
-        assert!(output.contains(r#"        <Territory>"#));
-        assert!(output.contains(r#"          <RegionsIncluded>WORLD</RegionsIncluded>"#));
-        assert!(output.contains(r#"          <WebsiteRole>29</WebsiteRole>"#));
-        assert!(output.contains(r#"          <WebsiteDescription>Publisher's website: download the title</WebsiteDescription>"#));
-        assert!(output.contains(
-            r#"          <WebsiteLink>https://www.book.com/ebook_fulltext</WebsiteLink>"#
+        println!("{output}");
+        // Non-repeatable blocks should appear in a guaranteed order
+        assert!(output.contains(
+            r#"
+<Product>
+  <RecordReference>urn:uuid:00000000-0000-0000-bbbb-000000000001</RecordReference>
+  <NotificationType>03</NotificationType>
+  <RecordSourceType>01</RecordSourceType>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>01</ProductIDType>
+    <IDTypeName>thoth-work-id</IDTypeName>
+    <IDValue>urn:uuid:00000000-0000-0000-aaaa-000000000001</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>01</ProductIDType>
+    <IDTypeName>thoth-publication-id</IDTypeName>
+    <IDValue>urn:uuid:00000000-0000-0000-bbbb-000000000001</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>15</ProductIDType>
+    <IDValue>9783161484100</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>06</ProductIDType>
+    <IDValue>10.00001/BOOK.0001</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>13</ProductIDType>
+    <IDValue>123456789</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>23</ProductIDType>
+    <IDValue>987654321</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>01</ProductIDType>
+    <IDTypeName>internal-reference</IDTypeName>
+    <IDValue>IntRef1</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(output.contains(
+            r#"
+  <DescriptiveDetail>
+    <ProductComposition>00</ProductComposition>
+    <ProductForm>BC</ProductForm>
+    <PrimaryContentType>10</PrimaryContentType>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>01</MeasureType>
+      <Measurement>234</Measurement>
+      <MeasureUnitCode>mm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>01</MeasureType>
+      <Measurement>23.4</Measurement>
+      <MeasureUnitCode>cm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>01</MeasureType>
+      <Measurement>9.21</Measurement>
+      <MeasureUnitCode>in</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>02</MeasureType>
+      <Measurement>156</Measurement>
+      <MeasureUnitCode>mm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>02</MeasureType>
+      <Measurement>15.6</Measurement>
+      <MeasureUnitCode>cm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>02</MeasureType>
+      <Measurement>6.14</Measurement>
+      <MeasureUnitCode>in</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>03</MeasureType>
+      <Measurement>25</Measurement>
+      <MeasureUnitCode>mm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>03</MeasureType>
+      <Measurement>2.5</Measurement>
+      <MeasureUnitCode>cm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>03</MeasureType>
+      <Measurement>1</Measurement>
+      <MeasureUnitCode>in</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>08</MeasureType>
+      <Measurement>152</Measurement>
+      <MeasureUnitCode>gr</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Measure>
+      <MeasureType>08</MeasureType>
+      <Measurement>5.3616</Measurement>
+      <MeasureUnitCode>oz</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <EpubLicense>
+      <EpubLicenseName>Creative Commons Attribution 4.0 International license (CC BY 4.0).</EpubLicenseName>
+      <EpubLicenseExpression>
+        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>
+        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>
+      </EpubLicenseExpression>
+    </EpubLicense>
+    <TitleDetail>
+      <TitleType>01</TitleType>
+      <TitleElement>
+        <TitleElementLevel>01</TitleElementLevel>
+        <TitleText>Book Title</TitleText>
+        <Subtitle>Book Subtitle</Subtitle>
+      </TitleElement>
+    </TitleDetail>
+    <Edition>
+      <EditionNumber>2</EditionNumber>
+    </Edition>
+    <Extent>
+      <ExtentType>00</ExtentType>
+      <ExtentValue>334</ExtentValue>
+      <ExtentUnit>03</ExtentUnit>
+    </Extent>
+    <IllustrationsNote>This is a bibliography note</IllustrationsNote>"#));
+        assert!(output.contains(
+            r#"
+    <AncillaryContent>
+      <AncillaryContentType>09</AncillaryContentType>
+      <Number>15</Number>
+    </AncillaryContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <AncillaryContent>
+      <AncillaryContentType>11</AncillaryContentType>
+      <Number>20</Number>
+    </AncillaryContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <AncillaryContent>
+      <AncillaryContentType>19</AncillaryContentType>
+      <Number>25</Number>
+    </AncillaryContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <AncillaryContent>
+      <AncillaryContentType>00</AncillaryContentType>
+      <AncillaryContentDescription>Videos</AncillaryContentDescription>
+      <Number>30</Number>
+    </AncillaryContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <MainSubject />
+      <SubjectSchemeIdentifier>12</SubjectSchemeIdentifier>
+      <SubjectCode>AAB</SubjectCode>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>10</SubjectSchemeIdentifier>
+      <SubjectCode>AAA000000</SubjectCode>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>04</SubjectSchemeIdentifier>
+      <SubjectCode>JA85</SubjectCode>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>
+      <SubjectCode>JWA</SubjectCode>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>20</SubjectSchemeIdentifier>
+      <SubjectHeadingText>keyword1</SubjectHeadingText>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <MainSubject />
+      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>
+      <SubjectHeadingText>custom1</SubjectHeadingText>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>
+      <SubjectHeadingText>custom2</SubjectHeadingText>
+    </Subject>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <Audience>
+      <AudienceCodeType>01</AudienceCodeType>
+      <AudienceCodeValue>06</AudienceCodeValue>
+    </Audience>
+  </DescriptiveDetail>
+  <CollateralDetail>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>02</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet.</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>03</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>30</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>04</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">1. Chapter 1</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>20</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Open Access</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>13</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">This is a general note</Text>
+    </TextContent>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <SupportingResource>
+      <ResourceContentType>01</ResourceContentType>
+      <ContentAudience>00</ContentAudience>
+      <ResourceMode>03</ResourceMode>
+      <ResourceFeature>
+        <ResourceFeatureType>02</ResourceFeatureType>
+        <FeatureNote>This is a cover caption</FeatureNote>
+      </ResourceFeature>
+      <ResourceVersion>
+        <ResourceForm>02</ResourceForm>
+        <ResourceLink>https://www.book.com/cover</ResourceLink>
+      </ResourceVersion>
+    </SupportingResource>
+  </CollateralDetail>
+  <ContentDetail>
+    <ContentItem>
+      <LevelSequenceNumber>1</LevelSequenceNumber>
+    </ContentItem>
+    <TextItem>
+      <TextItemType>03</TextItemType>
+      <TextItemIdentifier>
+        <TextItemIDType>06</TextItemIDType>
+        <IDValue>10.00001/RELATION.0001</IDValue>
+      </TextItemIdentifier>
+    </TextItem>
+    <PageRun>
+      <FirstPageNumber>10</FirstPageNumber>
+      <LastPageNumber>20</LastPageNumber>
+    </PageRun>
+    <NumberOfPages>11</NumberOfPages>
+  </ContentDetail>
+  <PublishingDetail>
+    <Imprint>
+      <ImprintName>OA Editions Imprint</ImprintName>
+      <ImprintIdentifier>
+        <ImprintIDType>01</ImprintIDType>
+        <IDTypeName>URL</IDTypeName>
+        <IDValue>https://imprint.oa</IDValue>
+      </ImprintIdentifier>
+    </Imprint>
+    <Publisher>
+      <PublishingRole>01</PublishingRole>
+      <PublisherName>OA Editions</PublisherName>"#
+        ));
+        assert!(output.contains(
+            r#"
+      <Website>
+        <WebsiteRole>01</WebsiteRole>
+        <WebsiteDescription>Publisher's website: home page</WebsiteDescription>
+        <WebsiteLink>https://publisher.oa</WebsiteLink>
+      </Website>"#
+        ));
+        assert!(output.contains(
+            r#"
+      <Website>
+        <WebsiteRole>02</WebsiteRole>
+        <WebsiteDescription>Publisher's website: webpage for this title</WebsiteDescription>
+        <WebsiteLink>https://www.book.com</WebsiteLink>
+      </Website>"#
+        ));
+        assert!(output.contains(
+            r#"
+    </Publisher>
+    <CityOfPublication>León, Spain</CityOfPublication>
+    <PublishingStatus>04</PublishingStatus>
+    <PublishingDate>
+      <PublishingDateRole>01</PublishingDateRole>
+      <Date dateformat="00">19991231</Date>
+    </PublishingDate>
+    <CopyrightStatement>
+      <CopyrightOwner>
+        <PersonName>Author 1; Author 2</PersonName>
+      </CopyrightOwner>
+    </CopyrightStatement>
+    <SalesRights>
+      <SalesRightsType>02</SalesRightsType>
+      <Territory>
+        <RegionsIncluded>WORLD</RegionsIncluded>
+      </Territory>
+    </SalesRights>
+  </PublishingDetail>
+  <RelatedMaterial>
+    <RelatedWork>
+      <WorkRelationCode>49</WorkRelationCode>
+      <WorkIdentifier>
+        <WorkIDType>06</WorkIDType>
+        <IDValue>10.00001/RELATION.0003</IDValue>
+      </WorkIdentifier>
+    </RelatedWork>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <RelatedProduct>
+      <ProductRelationCode>01</ProductRelationCode>
+      <ProductIdentifier>
+        <ProductIDType>06</ProductIDType>
+        <IDValue>10.00001/RELATION.0002</IDValue>
+      </ProductIdentifier>
+    </RelatedProduct>"#
+        ));
+        assert!(output.contains(
+            r#"
+    <RelatedProduct>
+      <ProductRelationCode>34</ProductRelationCode>
+      <ProductIdentifier>
+        <ProductIDType>06</ProductIDType>
+        <IDValue>10.00001/reference</IDValue>
+      </ProductIdentifier>
+    </RelatedProduct>"#
+        ));
+        assert!(output.contains(
+            r#"
+  </RelatedMaterial>
+  <ProductSupply>
+    <Market>
+      <Territory>
+        <RegionsIncluded>WORLD</RegionsIncluded>
+      </Territory>
+    </Market>
+    <SupplyDetail>
+      <Supplier>
+        <SupplierRole>09</SupplierRole>
+        <SupplierName>OA Editions</SupplierName>
+        <Website>
+          <WebsiteRole>02</WebsiteRole>
+          <WebsiteDescription>Publisher's website: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.book.com/pb_landing</WebsiteLink>
+        </Website>
+      </Supplier>
+      <ProductAvailability>99</ProductAvailability>
+      <SupplyDate>
+        <SupplyDateRole>08</SupplyDateRole>
+        <Date dateformat="00">19991231</Date>
+      </SupplyDate>"#
+        ));
+        assert!(output.contains(
+            r#"
+      <Price>
+        <PriceType>02</PriceType>
+        <PriceAmount>5.95</PriceAmount>
+        <CurrencyCode>EUR</CurrencyCode>
+        <Territory>
+          <RegionsIncluded>WORLD</RegionsIncluded>
+        </Territory>
+      </Price>"#
+        ));
+        assert!(output.contains(
+            r#"
+      <Price>
+        <PriceType>02</PriceType>
+        <PriceAmount>4.95</PriceAmount>
+        <CurrencyCode>GBP</CurrencyCode>
+        <Territory>
+          <RegionsIncluded>WORLD</RegionsIncluded>
+        </Territory>
+      </Price>"#
+        ));
+        assert!(output.contains(
+            r#"
+      <Price>
+        <PriceType>02</PriceType>
+        <PriceAmount>8.00</PriceAmount>
+        <CurrencyCode>USD</CurrencyCode>
+        <Territory>
+          <RegionsIncluded>WORLD</RegionsIncluded>
+        </Territory>
+      </Price>"#
         ));
 
+        // Test ProductForm[Detail] with different publication types
+        test_work.publications[0].publication_type = PublicationType::HARDBACK;
+        let output = generate_test_output(true, &test_work);
+        assert!(!output.contains(r#"    <ProductForm>BC</ProductForm>"#));
+        assert!(output.contains(r#"    <ProductForm>BB</ProductForm>"#));
+        assert!(!output.contains(r#"    <ProductFormDetail>"#));
+        test_work.publications[0].publication_type = PublicationType::PDF;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E107</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::HTML;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E105</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::XML;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E113</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::EPUB;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E101</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::MOBI;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E127</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::AZW3;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E116</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::DOCX;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E104</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::FICTION_BOOK;
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <ProductForm>EB</ProductForm>
+    <ProductFormDetail>E100</ProductFormDetail>"#
+        ));
+        test_work.publications[0].publication_type = PublicationType::PAPERBACK;
+
         // Remove/change some values to test (non-)output of optional blocks
         test_work.doi = None;
+        test_work.lccn = None;
+        test_work.oclc = None;
+        test_work.reference = None;
         test_work.license = None;
         test_work.subtitle = None;
+        test_work.edition = Some(1);
         test_work.page_count = None;
+        test_work.bibliography_note = None;
+        test_work.image_count = None;
+        test_work.short_abstract = None;
+        test_work.long_abstract = None;
         test_work.toc = None;
-        test_work.cover_url = None;
-        test_work.place = None;
+        test_work.general_note = None;
+        test_work.cover_caption = None;
         test_work.landing_page = None;
-        test_work.publications[0].publication_type = PublicationType::EPUB;
-        test_work.subjects.clear();
+        test_work.place = None;
+        test_work.publication_date = None;
+        test_work.copyright_holder = None;
+        test_work.publications[0].isbn = None;
+        test_work.publications[0].height_mm = None;
+        test_work.publications[0].locations.clear();
+        test_work.publications[0].prices.pop();
+        test_work.relations[0].related_work.last_page = None;
+        test_work.relations[0].related_work.page_count = None;
+        test_work.references.clear();
+        test_work.imprint.imprint_url = None;
+        test_work.imprint.publisher.publisher_url = None;
+        test_work.subjects.pop();
         let output = generate_test_output(true, &test_work);
-        // Ebook type changed
-        assert!(!output.contains(r#"    <ProductFormDetail>E107</ProductFormDetail>"#));
-        assert!(output.contains(r#"    <ProductFormDetail>E101</ProductFormDetail>"#));
-        // No DOI supplied
-        assert!(!output.contains(r#"    <ProductIDType>06</ProductIDType>"#));
-        assert!(!output.contains(r#"    <IDValue>10.00001/BOOK.0001</IDValue>"#));
-        // No licence supplied
-        assert!(!output.contains(r#"    <EpubLicense>"#));
-        assert!(!output
-            .contains(r#"      <EpubLicenseName>Creative Commons License</EpubLicenseName>"#));
-        assert!(!output.contains(r#"      <EpubLicenseExpression>"#));
-        assert!(!output
-            .contains(r#"        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>"#));
-        assert!(!output.contains(r#"        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>"#));
-        // No subtitle supplied (within Thoth UI this would automatically update full_title)
+        println!("{output}");
+        assert!(!output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>15</ProductIDType>
+    <IDValue>9783161484100</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>06</ProductIDType>
+    <IDValue>10.00001/BOOK.0001</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>13</ProductIDType>
+    <IDValue>123456789</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>23</ProductIDType>
+    <IDValue>987654321</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+  <ProductIdentifier>
+    <ProductIDType>01</ProductIDType>
+    <IDTypeName>internal-reference</IDTypeName>
+    <IDValue>IntRef1</IDValue>
+  </ProductIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <Measure>
+      <MeasureType>01</MeasureType>
+      <Measurement>234</Measurement>
+      <MeasureUnitCode>mm</MeasureUnitCode>
+    </Measure>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <EpubLicense>
+      <EpubLicenseName>Creative Commons Attribution 4.0 International license (CC BY 4.0).</EpubLicenseName>
+      <EpubLicenseExpression>
+        <EpubLicenseExpressionType>02</EpubLicenseExpressionType>
+        <EpubLicenseExpressionLink>https://creativecommons.org/licenses/by/4.0/</EpubLicenseExpressionLink>
+      </EpubLicenseExpression>
+    </EpubLicense>"#
+        ));
+        // Title block still present but Subtitle absent
+        assert!(output.contains(
+            r#"
+    <TitleDetail>
+      <TitleType>01</TitleType>
+      <TitleElement>
+        <TitleElementLevel>01</TitleElementLevel>
+        <TitleText>Book Title</TitleText>
+      </TitleElement>
+    </TitleDetail>"#
+        ));
         assert!(!output.contains(r#"        <Subtitle>Book Subtitle</Subtitle>"#));
-        // No page count supplied
+        assert!(!output.contains(r#"    <Edition>"#));
         assert!(!output.contains(r#"    <Extent>"#));
-        assert!(!output.contains(r#"      <ExtentType>00</ExtentType>"#));
-        assert!(!output.contains(r#"      <ExtentValue>334</ExtentValue>"#));
-        assert!(!output.contains(r#"      <ExtentUnit>03</ExtentUnit>"#));
-        // No table of contents or cover URL supplied: CollateralDetail block only contains long abstract
-        assert!(output.contains(r#"  <CollateralDetail>"#));
-        assert!(output.contains(r#"    <TextContent>"#));
-        assert!(output.contains(r#"      <TextType>03</TextType>"#));
-        assert!(output.contains(r#"      <ContentAudience>00</ContentAudience>"#));
-        assert!(output.contains(r#"      <Text language="eng">Lorem ipsum dolor sit amet</Text>"#));
-        assert!(!output.contains(r#"      <TextType>04</TextType>"#));
-        assert!(!output.contains(r#"      <Text language="eng">1. Chapter 1</Text>"#));
-        assert!(!output.contains(r#"    <SupportingResource>"#));
-        assert!(!output.contains(r#"      <ResourceContentType>01</ResourceContentType>"#));
-        assert!(!output.contains(r#"      <ResourceMode>03</ResourceMode>"#));
-        assert!(!output.contains(r#"      <ResourceVersion>"#));
-        assert!(!output.contains(r#"        <ResourceForm>02</ResourceForm>"#));
         assert!(!output
-            .contains(r#"        <ResourceLink>"https://www.book.com/cover"</ResourceLink>"#));
-        // No place supplied
+            .contains(r#"    <IllustrationsNote>This is a bibliography note</IllustrationsNote>"#));
+        assert!(!output.contains(
+            r#"
+    <AncillaryContent>
+      <AncillaryContentType>09</AncillaryContentType>
+      <Number>15</Number>
+    </AncillaryContent>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <Subject>
+      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>
+      <SubjectHeadingText>custom2</SubjectHeadingText>
+    </Subject>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <TextContent>
+      <TextType>02</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet.</Text>
+    </TextContent>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <TextContent>
+      <TextType>03</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+    </TextContent>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <TextContent>
+      <TextType>30</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+    </TextContent>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <TextContent>
+      <TextType>04</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">1. Chapter 1</Text>
+    </TextContent>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <TextContent>
+      <TextType>13</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">This is a general note</Text>
+    </TextContent>"#
+        ));
+        // SupportingResource block still present but ResourceFeature absent
+        assert!(output.contains(
+            r#"
+    <SupportingResource>
+      <ResourceContentType>01</ResourceContentType>
+      <ContentAudience>00</ContentAudience>
+      <ResourceMode>03</ResourceMode>
+      <ResourceVersion>
+        <ResourceForm>02</ResourceForm>
+        <ResourceLink>https://www.book.com/cover</ResourceLink>
+      </ResourceVersion>
+    </SupportingResource>"#
+        ));
+        assert!(!output.contains(
+            r#"
+      <ResourceFeature>
+        <ResourceFeatureType>02</ResourceFeatureType>
+        <FeatureNote>This is a cover caption</FeatureNote>
+      </ResourceFeature>"#
+        ));
+        // PageRun block still present but LastPageNumber absent
+        assert!(output.contains(
+            r#"
+    <PageRun>
+      <FirstPageNumber>10</FirstPageNumber>
+    </PageRun>"#
+        ));
+        assert!(!output.contains(r#"      <LastPageNumber>20</LastPageNumber>"#));
+        assert!(!output.contains(r#"    <NumberOfPages>11</NumberOfPages>"#));
+        // Imprint block still present but ImprintIdentifier absent
+        assert!(output.contains(
+            r#"
+    <Imprint>
+      <ImprintName>OA Editions Imprint</ImprintName>
+    </Imprint>"#
+        ));
+        assert!(!output.contains(
+            r#"
+      <ImprintIdentifier>
+        <ImprintIDType>01</ImprintIDType>
+        <IDTypeName>URL</IDTypeName>
+        <IDValue>https://imprint.oa</IDValue>
+      </ImprintIdentifier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+      <Website>
+        <WebsiteRole>01</WebsiteRole>
+        <WebsiteDescription>Publisher's website: home page</WebsiteDescription>
+        <WebsiteLink>https://publisher.oa</WebsiteLink>
+      </Website>"#
+        ));
+        assert!(!output.contains(
+            r#"
+      <Website>
+        <WebsiteRole>02</WebsiteRole>
+        <WebsiteDescription>Publisher's website: webpage for this title</WebsiteDescription>
+        <WebsiteLink>https://www.book.com</WebsiteLink>
+      </Website>"#
+        ));
         assert!(!output.contains(r#"    <CityOfPublication>León, Spain</CityOfPublication>"#));
-        // No landing page supplied: only one SupplyDetail block, linking to ebook download
-        assert!(!output.contains(r#"          <WebsiteRole>01</WebsiteRole>"#));
         assert!(!output.contains(
-            r#"          <WebsiteDescription>Publisher's website: web shop</WebsiteDescription>"#
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>01</PublishingDateRole>
+      <Date dateformat="00">19991231</Date>
+    </PublishingDate>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <CopyrightStatement>
+      <CopyrightOwner>
+        <PersonName>Author 1; Author 2</PersonName>
+      </CopyrightOwner>
+    </CopyrightStatement>"#
+        ));
+        assert!(!output.contains(
+            r#"
+    <RelatedProduct>
+      <ProductRelationCode>34</ProductRelationCode>
+      <ProductIdentifier>
+        <ProductIDType>06</ProductIDType>
+        <IDValue>10.00001/reference</IDValue>
+      </ProductIdentifier>
+    </RelatedProduct>"#
+        ));
+        // Supplier block still present but Website absent
+        assert!(output.contains(
+            r#"
+      <Supplier>
+        <SupplierRole>09</SupplierRole>
+        <SupplierName>OA Editions</SupplierName>
+      </Supplier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+        <Website>
+          <WebsiteRole>02</WebsiteRole>
+          <WebsiteDescription>Publisher's website: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.book.com/pb_landing</WebsiteLink>
+        </Website>"#
+        ));
+        assert!(!output.contains(
+            r#"
+      <Price>
+        <PriceType>02</PriceType>
+        <PriceAmount>8.00</PriceAmount>
+        <CurrencyCode>USD</CurrencyCode>
+        <Territory>
+          <RegionsIncluded>WORLD</RegionsIncluded>
+        </Territory>
+      </Price>"#
         ));
-        assert!(!output.contains(r#"          <WebsiteLink>https://www.book.com</WebsiteLink>"#));
-        // No subjects supplied
-        assert!(!output.contains(r#"    <Subject>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>12</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>AAB</SubjectCode>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>10</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>AAA000000</SubjectCode>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>04</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>JA85</SubjectCode>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>JWA</SubjectCode>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>20</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>keyword1</SubjectCode>"#));
-        assert!(!output.contains(r#"      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>"#));
-        assert!(!output.contains(r#"      <SubjectCode>custom1</SubjectCode>"#));
-
-        // Remove the only language: result is error
-        test_work.languages.clear();
-        let output = generate_test_output(false, &test_work);
-        assert_eq!(
-            output,
-            "Could not generate onix_3.0::thoth: Missing Language Code(s)".to_string()
-        );
-
-        // Replace language but remove long abstract: result is error
-        test_work.languages = vec![WorkLanguages {
-            language_code: LanguageCode::SPA,
-            language_relation: LanguageRelation::TRANSLATED_FROM,
-            main_language: true,
-        }];
-        test_work.long_abstract = None;
-        let output = generate_test_output(false, &test_work);
-        assert_eq!(
-            output,
-            "Could not generate onix_3.0::thoth: Missing Long Abstract".to_string()
-        );
 
-        // Replace long abstract but remove publication date: result is error
-        test_work.long_abstract = Some("Lorem ipsum dolor sit amet".to_string());
-        test_work.publication_date = None;
-        let output = generate_test_output(false, &test_work);
-        assert_eq!(
-            output,
-            "Could not generate onix_3.0::thoth: Missing Publication Date".to_string()
-        );
+        // Remove even more values
+        test_work.edition = None;
+        test_work.table_count = None;
+        test_work.audio_count = None;
+        test_work.video_count = None;
+        test_work.cover_url = None;
+        test_work.relations[0].related_work.first_page = None;
+        // If first page is missing, last page isn't included even if present
+        test_work.relations[0].related_work.last_page = Some("20".to_string());
+        test_work.relations.pop();
+        test_work.subjects.clear();
+        test_work.publications[0].height_cm = None;
+        test_work.publications[0].height_in = None;
+        test_work.publications[0].width_mm = None;
+        test_work.publications[0].width_cm = None;
+        test_work.publications[0].width_in = None;
+        test_work.publications[0].depth_mm = None;
+        test_work.publications[0].depth_cm = None;
+        test_work.publications[0].depth_in = None;
+        test_work.publications[0].weight_g = None;
+        test_work.publications[0].weight_oz = None;
+        test_work.publications[0].prices.clear();
+        let output = generate_test_output(true, &test_work);
+        println!("{output}");
+        // Still no Edition, same as when value was 1
+        assert!(!output.contains(r#"    <Edition>"#));
+        // No AncillaryContent or Subject blocks at all - skip from TitleDetail straight to Audience
+        assert!(output.contains(
+            r#"
+    </TitleDetail>
+    <Audience>"#
+        ));
+        assert!(!output.contains(r#"    <AncillaryContent>"#));
+        assert!(!output.contains(r#"    <Subject>"#));
+        // No cover URL means no SupportingResource block - CollateralDetail only contains OA statement
+        assert!(output.contains(
+            r#"
+  <CollateralDetail>
+    <TextContent>
+      <TextType>20</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Open Access</Text>
+    </TextContent>
+  </CollateralDetail>"#
+        ));
+        assert!(!output.contains(r#"    <SupportingResource>"#));
+        assert!(!output.contains(r#"    <PageRun>"#));
+        assert!(!output.contains(r#"      <FirstPageNumber>10</FirstPageNumber>"#));
+        assert!(!output.contains(r#"      <LastPageNumber>20</LastPageNumber>"#));
+        // Only one item left in RelatedMaterial
+        assert!(output.contains(
+            r#"
+  <RelatedMaterial>
+    <RelatedProduct>
+      <ProductRelationCode>01</ProductRelationCode>
+      <ProductIdentifier>
+        <ProductIDType>06</ProductIDType>
+        <IDValue>10.00001/RELATION.0002</IDValue>
+      </ProductIdentifier>
+    </RelatedProduct>
+  </RelatedMaterial>"#
+        ));
+        assert!(!output.contains(r#"    <RelatedWork>"#));
+        // UnpricedItemType block instead of any Prices
+        assert!(output.contains(r#"      <UnpricedItemType>04</UnpricedItemType>"#));
+        assert!(!output.contains(r#"      <Price>"#));
 
-        // Replace publication date but remove USD price: result is error
-        test_work.publication_date = chrono::NaiveDate::from_ymd_opt(1999, 12, 31);
-        test_work.publications[0].prices.pop();
-        let output = generate_test_output(false, &test_work);
-        assert_eq!(
-            output,
-            "Could not generate onix_3.0::thoth: No USD price found".to_string()
-        );
+        // Remove chapter DOI: can't output ContentDetail block
+        test_work.relations[0].related_work.doi = None;
+        // Remove remaining related work DOI: can't output RelatedMaterial block
+        test_work.relations[1].related_work.doi = None;
+        // Test truncation of short abstract
+        test_work.short_abstract = Some("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementum odio feugiat tempus. Etiam eu felis ac metus viverra ornare. In consectetur neque sed feugiat ornare. Mauris at purus fringilla orci tincidunt pulvinar sed a massa. Nullam vestibulum posuere augue, sit amet tincidunt nisl pulvinar ac.".to_string());
+        let output = generate_test_output(true, &test_work);
+        println!("{output}");
+        assert!(!output.contains(r#"  <ContentDetail>"#));
+        assert!(!output.contains(r#"  <RelatedMaterial>"#));
+        assert!(!output.contains(r#"    <RelatedProduct>"#));
+        assert!(output.contains(
+            r#"
+    <TextContent>
+      <TextType>02</TextType>
+      <ContentAudience>00</ContentAudience>
+      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementu</Text>
+    </TextContent>"#
+        ));
+        test_work.short_abstract = None;
 
-        // Replace USD price but remove the only (PDF) publication's only location
-        // Result: error (can't generate OverDrive ONIX without EPUB or PDF URL)
-        test_work.publications[0].prices[0].currency_code = CurrencyCode::USD;
-        test_work.publications[0].locations.clear();
-        let output = generate_test_output(false, &test_work);
-        assert_eq!(
-            output,
-            "Could not generate onix_3.0::thoth: No priced EPUB or PDF URL".to_string()
-        );
+        // Add second publication, and test that two records are produced
+        test_work.publications.push(WorkPublications {
+            publication_id: Uuid::from_str("00000000-0000-0000-CCCC-000000000001").unwrap(),
+            publication_type: PublicationType::HARDBACK,
+            isbn: Some(Isbn::from_str("978-1-4028-9462-6").unwrap()),
+            width_mm: None,
+            width_cm: None,
+            width_in: None,
+            height_mm: None,
+            height_cm: None,
+            height_in: None,
+            depth_mm: None,
+            depth_cm: None,
+            depth_in: None,
+            weight_g: None,
+            weight_oz: None,
+            prices: vec![],
+            locations: vec![],
+        });
+        let output = generate_test_output(true, &test_work);
+        println!("{output}");
+        assert!(output.contains(
+            r#"
+<Product>
+  <RecordReference>urn:uuid:00000000-0000-0000-bbbb-000000000001</RecordReference>"#
+        ));
+        assert!(output.contains(
+            r#"
+<Product>
+  <RecordReference>urn:uuid:00000000-0000-0000-cccc-000000000001</RecordReference>"#
+        ));
+        // First record will now have a RelatedMaterial block (again) representing second record
+        assert!(output.contains(
+            r#"
+  </PublishingDetail>
+  <RelatedMaterial>
+    <RelatedProduct>
+      <ProductRelationCode>06</ProductRelationCode>
+      <ProductIdentifier>
+        <ProductIDType>15</ProductIDType>
+        <IDValue>9781402894626</IDValue>
+      </ProductIdentifier>
+    </RelatedProduct>
+  </RelatedMaterial>
+  <ProductSupply>"#
+        ));
+        // No RelatedMaterial block in second record, as no ISBN in first
+        // Skip straight from PublishingDetail to ProductSupply
+        assert!(output.contains(
+            r#"
+  </PublishingDetail>
+  <ProductSupply>"#
+        ));
     }
 }

From ecead91492de11e7b55f08d4bd0239eb4fd0c3c3 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:02:21 +0000
Subject: [PATCH 25/44] Add Locations to tests

---
 thoth-export-server/src/xml/onix3_thoth.rs | 110 +++++++++++++++++----
 1 file changed, 92 insertions(+), 18 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 1fec848f..736a433a 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -814,7 +814,7 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         publication.locations.clone();
                     if locations.is_empty() {
                         // Create single Supplier based on Work Landing Page
-                        // to ensure child elements such as Price are not omitted
+                        // so that we can output a SupplyDetail block (inc. Price info)
                         // (if Landing Page is None, Supplier will be complete apart from Website)
                         locations = vec![WorkPublicationsLocations {
                             landing_page: self.landing_page.clone(),
@@ -2147,12 +2147,21 @@ mod tests {
                         unit_price: 8.0,
                     },
                 ],
-                locations: vec![WorkPublicationsLocations {
-                    landing_page: Some("https://www.book.com/pb_landing".to_string()),
-                    full_text_url: None,
-                    location_platform: LocationPlatform::PUBLISHER_WEBSITE,
-                    canonical: true,
-                }],
+                locations: vec![
+                    WorkPublicationsLocations {
+                        landing_page: Some("https://www.book.com/pb_landing".to_string()),
+                        full_text_url: None,
+                        location_platform: LocationPlatform::PUBLISHER_WEBSITE,
+                        canonical: true,
+                    },
+                    WorkPublicationsLocations {
+                        landing_page: Some("https://www.jstor.com/pb_landing".to_string()),
+                        // Note a paperback can't technically have a Full Text URL - test purposes only
+                        full_text_url: Some("https://www.jstor.com/pb_fulltext".to_string()),
+                        location_platform: LocationPlatform::JSTOR,
+                        canonical: false,
+                    },
+                ],
             }],
             subjects: vec![
                 WorkSubjects {
@@ -2749,7 +2758,10 @@ mod tests {
       <Territory>
         <RegionsIncluded>WORLD</RegionsIncluded>
       </Territory>
-    </Market>
+    </Market>"#
+        ));
+        assert!(output.contains(
+            r#"
     <SupplyDetail>
       <Supplier>
         <SupplierRole>09</SupplierRole>
@@ -2768,6 +2780,29 @@ mod tests {
         ));
         assert!(output.contains(
             r#"
+    <SupplyDetail>
+      <Supplier>
+        <SupplierRole>11</SupplierRole>
+        <SupplierName>JSTOR</SupplierName>"#
+        ));
+        assert!(output.contains(
+            r#"
+        <Website>
+          <WebsiteRole>36</WebsiteRole>
+          <WebsiteDescription>JSTOR: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.jstor.com/pb_landing</WebsiteLink>
+        </Website>"#
+        ));
+        assert!(output.contains(
+            r#"
+        <Website>
+          <WebsiteRole>29</WebsiteRole>
+          <WebsiteDescription>JSTOR: download the title</WebsiteDescription>
+          <WebsiteLink>https://www.jstor.com/pb_fulltext</WebsiteLink>
+        </Website>"#
+        ));
+        assert!(output.contains(
+            r#"
       <Price>
         <PriceType>02</PriceType>
         <PriceAmount>5.95</PriceAmount>
@@ -2886,7 +2921,7 @@ mod tests {
         test_work.copyright_holder = None;
         test_work.publications[0].isbn = None;
         test_work.publications[0].height_mm = None;
-        test_work.publications[0].locations.clear();
+        test_work.publications[0].locations.pop();
         test_work.publications[0].prices.pop();
         test_work.relations[0].related_work.last_page = None;
         test_work.relations[0].related_work.page_count = None;
@@ -3106,20 +3141,27 @@ mod tests {
       </ProductIdentifier>
     </RelatedProduct>"#
         ));
-        // Supplier block still present but Website absent
-        assert!(output.contains(
+        assert!(!output.contains(
             r#"
+    <SupplyDetail>
       <Supplier>
-        <SupplierRole>09</SupplierRole>
-        <SupplierName>OA Editions</SupplierName>
-      </Supplier>"#
+        <SupplierRole>11</SupplierRole>
+        <SupplierName>JSTOR</SupplierName>"#
         ));
         assert!(!output.contains(
             r#"
         <Website>
-          <WebsiteRole>02</WebsiteRole>
-          <WebsiteDescription>Publisher's website: webpage for this product</WebsiteDescription>
-          <WebsiteLink>https://www.book.com/pb_landing</WebsiteLink>
+          <WebsiteRole>36</WebsiteRole>
+          <WebsiteDescription>JSTOR: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.jstor.com/pb_landing</WebsiteLink>
+        </Website>"#
+        ));
+        assert!(!output.contains(
+            r#"
+        <Website>
+          <WebsiteRole>29</WebsiteRole>
+          <WebsiteDescription>JSTOR: download the title</WebsiteDescription>
+          <WebsiteLink>https://www.jstor.com/pb_fulltext</WebsiteLink>
         </Website>"#
         ));
         assert!(!output.contains(
@@ -3156,6 +3198,7 @@ mod tests {
         test_work.publications[0].weight_g = None;
         test_work.publications[0].weight_oz = None;
         test_work.publications[0].prices.clear();
+        test_work.publications[0].locations.clear();
         let output = generate_test_output(true, &test_work);
         println!("{output}");
         // Still no Edition, same as when value was 1
@@ -3197,6 +3240,22 @@ mod tests {
   </RelatedMaterial>"#
         ));
         assert!(!output.contains(r#"    <RelatedWork>"#));
+        // Supplier block for publisher still present but Website absent
+        assert!(output.contains(
+            r#"
+      <Supplier>
+        <SupplierRole>09</SupplierRole>
+        <SupplierName>OA Editions</SupplierName>
+      </Supplier>"#
+        ));
+        assert!(!output.contains(
+            r#"
+        <Website>
+          <WebsiteRole>02</WebsiteRole>
+          <WebsiteDescription>Publisher's website: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.book.com/pb_landing</WebsiteLink>
+        </Website>"#
+        ));
         // UnpricedItemType block instead of any Prices
         assert!(output.contains(r#"      <UnpricedItemType>04</UnpricedItemType>"#));
         assert!(!output.contains(r#"      <Price>"#));
@@ -3207,6 +3266,8 @@ mod tests {
         test_work.relations[1].related_work.doi = None;
         // Test truncation of short abstract
         test_work.short_abstract = Some("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementum odio feugiat tempus. Etiam eu felis ac metus viverra ornare. In consectetur neque sed feugiat ornare. Mauris at purus fringilla orci tincidunt pulvinar sed a massa. Nullam vestibulum posuere augue, sit amet tincidunt nisl pulvinar ac.".to_string());
+        // Reinstate landing page: supplier block for publisher now contains it
+        test_work.landing_page = Some("https://www.book.com".to_string());
         let output = generate_test_output(true, &test_work);
         println!("{output}");
         assert!(!output.contains(r#"  <ContentDetail>"#));
@@ -3220,7 +3281,20 @@ mod tests {
       <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementu</Text>
     </TextContent>"#
         ));
-        test_work.short_abstract = None;
+        assert!(output.contains(
+            r#"
+      <Supplier>
+        <SupplierRole>09</SupplierRole>
+        <SupplierName>OA Editions</SupplierName>
+        <Website>
+          <WebsiteRole>02</WebsiteRole>
+          <WebsiteDescription>Publisher's website: webpage for this product</WebsiteDescription>
+          <WebsiteLink>https://www.book.com</WebsiteLink>
+        </Website>
+      </Supplier>"#
+        ));
+        assert!(!output
+            .contains(r#"          <WebsiteLink>https://www.book.com/pb_landing</WebsiteLink>"#));
 
         // Add second publication, and test that two records are produced
         test_work.publications.push(WorkPublications {

From db1b187120e5c5ada38fc7b2d0f1386ce429519e Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 28 Feb 2024 09:35:48 +0000
Subject: [PATCH 26/44] Raise error if no publications

---
 thoth-export-server/src/xml/onix3_thoth.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 736a433a..8c3a4c6e 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -65,6 +65,13 @@ impl XmlSpecification for Onix3Thoth {
 
 impl XmlElementBlock<Onix3Thoth> for Work {
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
+        // Format is one record per Publication
+        if self.publications.is_empty() {
+            return Err(ThothError::IncompleteMetadataRecord(
+                ONIX_ERROR.to_string(),
+                "No publications supplied".to_string(),
+            ));
+        }
         let work_id = format!("urn:uuid:{}", self.work_id);
         let mut isbns: Vec<String> = Vec::new();
         for publication in &self.publications {
@@ -3349,5 +3356,13 @@ mod tests {
   </PublishingDetail>
   <ProductSupply>"#
         ));
+
+        // Remove all publications and test that result is error
+        test_work.publications.clear();
+        let output = generate_test_output(false, &test_work);
+        assert_eq!(
+            output,
+            "Could not generate onix_3.0::thoth: No publications supplied".to_string()
+        );
     }
 }

From 552bd915a77029bc52fffdfd833c9176b558de2e Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Tue, 5 Mar 2024 08:04:12 +0000
Subject: [PATCH 27/44] Upgrade mio

---
 Cargo.lock | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4b15f18a..50e42cbb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1998,14 +1998,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3702,15 +3702,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.1",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3729,21 +3720,6 @@ dependencies = [
  "windows-targets 0.52.3",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.0"

From 3accc59426f4a26af463d7f80950bc7c7be501ca Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Tue, 5 Mar 2024 08:05:29 +0000
Subject: [PATCH 28/44] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2da061fa..e60e3bf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Security
+  - Upgrade `mio` to v0.8.11
 
 ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
 ### Changed

From 33dafc8f905249764d57602153b6721f2956dd1d Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Tue, 5 Mar 2024 08:06:05 +0000
Subject: [PATCH 29/44] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e60e3bf2..9623e693 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Security
-  - Upgrade `mio` to v0.8.11
+  - [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11
 
 ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
 ### Changed

From 1e2b4f19d45d28b374697bf12d9f95e17e3cb726 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 09:41:19 +0100
Subject: [PATCH 30/44] Added seconds to timestamp

---
 thoth-export-server/src/xml/doideposit_crossref.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thoth-export-server/src/xml/doideposit_crossref.rs b/thoth-export-server/src/xml/doideposit_crossref.rs
index b8c77db9..e26f536e 100644
--- a/thoth-export-server/src/xml/doideposit_crossref.rs
+++ b/thoth-export-server/src/xml/doideposit_crossref.rs
@@ -42,7 +42,7 @@ impl XmlSpecification for DoiDepositCrossref {
                 "Not enough data".to_string(),
             )),
             [work] => {
-                let timestamp = Utc::now().format("%Y%m%d%H%M").to_string();
+                let timestamp = Utc::now().format("%Y%m%d%H%M%S").to_string();
                 let work_id = format!("{}_{}", work.work_id, timestamp);
 
                 write_full_element_block("doi_batch", Some(CROSSREF_NS.to_vec()), w, |w| {

From 2692c8f5149db1cb58fd77cfd1e03e56689a0cb9 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 09:47:39 +0100
Subject: [PATCH 31/44] Updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2da061fa..f645ec2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
 
 ### Fixed
+  - [573](https://github.com/thoth-pub/thoth/pull/573) - Add seconds to timestamp for Crossref metadata output
   - [564](https://github.com/thoth-pub/thoth/issues/564) - Fix error in BibTeX not outputting editors in work types other than edited volume
   - [447](https://github.com/thoth-pub/thoth/issues/447) - Prevents Google Books Onix3 format output from Export API if Thoth record doesn't contain at least one BIC, BISAC or LCC subject code
   - [404](https://github.com/thoth-pub/thoth/issues/404) - Prevents JSTOR Onix3 format output from Export API if Thoth record doesn't contain at least one BISAC subject code

From e54685e78976d27405db30dff510c5587bcb369f Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 10:42:26 +0100
Subject: [PATCH 32/44] Fix overlapping URL text for Locations in Thoth Admin
 panel on website in Safari and Chromium browsers

---
 CHANGELOG.md                              | 1 +
 thoth-app/src/component/locations_form.rs | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2da061fa..93a79711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
 
 ### Fixed
+  - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
   - [564](https://github.com/thoth-pub/thoth/issues/564) - Fix error in BibTeX not outputting editors in work types other than edited volume
   - [447](https://github.com/thoth-pub/thoth/issues/447) - Prevents Google Books Onix3 format output from Export API if Thoth record doesn't contain at least one BIC, BISAC or LCC subject code
   - [404](https://github.com/thoth-pub/thoth/issues/404) - Prevents JSTOR Onix3 format output from Export API if Thoth record doesn't contain at least one BISAC subject code
diff --git a/thoth-app/src/component/locations_form.rs b/thoth-app/src/component/locations_form.rs
index 7a43cb3d..8ee8c1f8 100644
--- a/thoth-app/src/component/locations_form.rs
+++ b/thoth-app/src/component/locations_form.rs
@@ -378,13 +378,13 @@ impl LocationsFormComponent {
                     <i class="fas fa-file-invoice-dollar" aria-hidden="true"></i>
                 </span>
                 <div class="field-body">
-                    <div class="field" style="width: 11em;">
+                    <div class="field" style="width: 11em; word-wrap: break-word;">
                         <label class="label">{ "Landing Page" }</label>
                         <div class="control is-expanded">
                             {&l.landing_page.clone().unwrap_or_default()}
                         </div>
                     </div>
-                    <div class="field" style="width: 11em;">
+                    <div class="field" style="width: 11em; word-wrap: break-word;">
                         <label class="label">{ "Full Text URL" }</label>
                         <div class="control is-expanded">
                             {&l.full_text_url.clone().unwrap_or_default()}

From c05a638810daf00710dc43d99c4a99a85ed0a536 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 11:00:12 +0100
Subject: [PATCH 33/44] Fixed changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a79711..bbb71139 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+  - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
 
 ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
 ### Changed
@@ -23,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
 
 ### Fixed
-  - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
   - [564](https://github.com/thoth-pub/thoth/issues/564) - Fix error in BibTeX not outputting editors in work types other than edited volume
   - [447](https://github.com/thoth-pub/thoth/issues/447) - Prevents Google Books Onix3 format output from Export API if Thoth record doesn't contain at least one BIC, BISAC or LCC subject code
   - [404](https://github.com/thoth-pub/thoth/issues/404) - Prevents JSTOR Onix3 format output from Export API if Thoth record doesn't contain at least one BISAC subject code

From 579465fdb9aac3f5200b4a1b14ec3ea0f385db97 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 11:01:21 +0100
Subject: [PATCH 34/44] Fixed changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f645ec2f..cc6dfe13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+  - [573](https://github.com/thoth-pub/thoth/pull/573) - Add seconds to timestamp for Crossref metadata output
 
 ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
 ### Changed
@@ -23,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [499](https://github.com/thoth-pub/thoth/issues/499) - Default main\_contribution to true
 
 ### Fixed
-  - [573](https://github.com/thoth-pub/thoth/pull/573) - Add seconds to timestamp for Crossref metadata output
   - [564](https://github.com/thoth-pub/thoth/issues/564) - Fix error in BibTeX not outputting editors in work types other than edited volume
   - [447](https://github.com/thoth-pub/thoth/issues/447) - Prevents Google Books Onix3 format output from Export API if Thoth record doesn't contain at least one BIC, BISAC or LCC subject code
   - [404](https://github.com/thoth-pub/thoth/issues/404) - Prevents JSTOR Onix3 format output from Export API if Thoth record doesn't contain at least one BISAC subject code

From b5f2c2fa0c02fc62c1501e8dd77229dc3badfd85 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:20:57 +0000
Subject: [PATCH 35/44] Fix comment which became outdated under #e3052d0

---
 thoth-export-server/src/xml/onix21_proquest_ebrary.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
index 2050038e..395cb48f 100644
--- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
+++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
@@ -17,7 +17,7 @@ pub struct Onix21ProquestEbrary {}
 const ONIX_ERROR: &str = "onix_2.1::proquest_ebrary";
 
 // This specification is exactly the same as EBSCO Host's except for the price point:
-// 0.00 (ProQuest Ebrary) instead of 0.01 (EBSCO Host)
+// UnpricedItemType (ProQuest Ebrary) instead of 0.01 (EBSCO Host)
 impl XmlSpecification for Onix21ProquestEbrary {
     fn handle_event<W: Write>(w: &mut EventWriter<W>, works: &[Work]) -> ThothResult<()> {
         write_full_element_block("ONIXMessage", None, w, |w| {

From b448af87b449224a0bbdc64803be233e55461a64 Mon Sep 17 00:00:00 2001
From: Brendan OConnell <boconnell1@gmail.com>
Date: Tue, 5 Mar 2024 12:33:18 +0100
Subject: [PATCH 36/44] Fixed changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc6dfe13..d277070e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Fixed
-  - [573](https://github.com/thoth-pub/thoth/pull/573) - Add seconds to timestamp for Crossref metadata output
+  - [475](https://github.com/thoth-pub/thoth/issues/475) - Add seconds to timestamp for Crossref metadata output
 
 ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
 ### Changed

From 2f0685c55973f137c26614aa541903792643550a Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Wed, 6 Mar 2024 09:29:50 +0000
Subject: [PATCH 37/44] Upgrade actix-identity and actix-session

---
 Cargo.lock                  | 9 ++++-----
 thoth-api-server/Cargo.toml | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 50e42cbb..d987eb52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "actix-identity"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e1cc6f95e245b2f3c6995df4e1c0c697704c48c28ec325d135a3ca039d4952"
+checksum = "f2c99b7a5614b72a78f04aa2021e5370fc1aef2475fffeffc0c1266b99007062"
 dependencies = [
  "actix-service",
  "actix-session",
@@ -154,15 +154,14 @@ dependencies = [
 
 [[package]]
 name = "actix-session"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e6a28f813a6671e1847d005cad0be36ae4d016287690f765c303379837c13d6"
+checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2"
 dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web",
  "anyhow",
- "async-trait",
  "derive_more",
  "serde",
  "serde_json",
diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml
index 6468fc13..04de0e09 100644
--- a/thoth-api-server/Cargo.toml
+++ b/thoth-api-server/Cargo.toml
@@ -13,8 +13,8 @@ thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"]
 thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
-actix-identity = "0.6.0"
-actix-session = { version = "0.8.0", features = ["cookie-session"] }
+actix-identity = "0.7.1"
+actix-session = { version = "0.9.0", features = ["cookie-session"] }
 env_logger = "0.11.2"
 juniper = "0.15.12"
 serde = { version = "1.0", features = ["derive"] }

From e3f2bf2d190c238bb9f3f70cb34d94eba77d7ec3 Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Wed, 6 Mar 2024 09:30:49 +0000
Subject: [PATCH 38/44] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fc6fd8e..149118d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [475](https://github.com/thoth-pub/thoth/issues/475) - Add seconds to timestamp for Crossref metadata output
   - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
 
+### Changed
+ - Upgrade `actix-identity` to v0.7.1
+ - Upgrade `actix-session` to v0.9.0
+
 ### Security
   - [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11
 

From 4f7c587e8262693d0e20a769b9d598965ef52c54 Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Wed, 6 Mar 2024 09:31:42 +0000
Subject: [PATCH 39/44] Update changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149118d7..efd94148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
 
 ### Changed
- - Upgrade `actix-identity` to v0.7.1
- - Upgrade `actix-session` to v0.9.0
+ - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-identity` to v0.7.1
+ - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-session` to v0.9.0
 
 ### Security
   - [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11

From ede794e965bcb0caac4f070b7a418c631876d279 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:22:21 +0000
Subject: [PATCH 40/44] Review markups: fix incorrect endpoint, style
 improvements

---
 thoth-app/src/models/work/mod.rs           |   2 +-
 thoth-export-server/src/xml/onix3_thoth.rs | 183 +++++++++++----------
 2 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/thoth-app/src/models/work/mod.rs b/thoth-app/src/models/work/mod.rs
index 2ff0f417..f1d0c8e9 100644
--- a/thoth-app/src/models/work/mod.rs
+++ b/thoth-app/src/models/work/mod.rs
@@ -433,7 +433,7 @@ impl DisplayWork for WorkWithRelations {
                                     <div class="dropdown-menu" id="dropdown-menu" role="menu">
                                         <div class="dropdown-content">
                                             <a
-                                                href={self.onix_projectmuse_endpoint()}
+                                                href={self.onix_thoth_endpoint()}
                                                 class="dropdown-item"
                                             >
                                             {"ONIX 3.0 (Thoth)"}
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 8c3a4c6e..b368a48b 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -16,6 +16,12 @@ use thoth_errors::{ThothError, ThothResult};
 #[derive(Copy, Clone)]
 pub struct Onix3Thoth {}
 
+struct Measure {
+    measure_type: &'static str,
+    measurement: f64,
+    measure_unit_code: &'static str,
+}
+
 const ONIX_ERROR: &str = "onix_3.0::thoth";
 
 // Based on ONIX for Books Release 3.0.8 Specification
@@ -73,12 +79,12 @@ impl XmlElementBlock<Onix3Thoth> for Work {
             ));
         }
         let work_id = format!("urn:uuid:{}", self.work_id);
-        let mut isbns: Vec<String> = Vec::new();
-        for publication in &self.publications {
-            if let Some(isbn) = &publication.isbn.as_ref() {
-                isbns.push(isbn.to_hyphenless_string());
-            }
-        }
+        let isbns: Vec<String> = self
+            .publications
+            .iter()
+            .filter_map(|p| p.isbn.as_ref())
+            .map(|i| i.to_hyphenless_string())
+            .collect();
         for publication in &self.publications {
             let publication_id = format!("urn:uuid:{}", publication.publication_id);
             let current_isbn = &publication.isbn.as_ref().map(|p| p.to_hyphenless_string());
@@ -202,46 +208,34 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                     write_element_block("PrimaryContentType", w, |w| {
                         w.write(XmlEvent::Characters("10")).map_err(|e| e.into())
                     })?;
-                    if let Some(height_mm) = &publication.height_mm {
+                    for &(measurement_opt, measure_type, measure_unit_code) in &[
                         // 01 height
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_mm, "mm"), w)
-                            .ok();
-                    }
-                    if let Some(height_cm) = &publication.height_cm {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_cm, "cm"), w)
-                            .ok();
-                    }
-                    if let Some(height_in) = &publication.height_in {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("01", height_in, "in"), w)
-                            .ok();
-                    }
-                    if let Some(width_mm) = &publication.width_mm {
+                        (publication.height_mm, "01", "mm"),
+                        (publication.height_cm, "01", "cm"),
+                        (publication.height_in, "01", "in"),
                         // 02 width
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_mm, "mm"), w).ok();
-                    }
-                    if let Some(width_cm) = &publication.width_cm {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_cm, "cm"), w).ok();
-                    }
-                    if let Some(width_in) = &publication.width_in {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("02", width_in, "in"), w).ok();
-                    }
-                    if let Some(depth_mm) = &publication.depth_mm {
+                        (publication.width_mm, "02", "mm"),
+                        (publication.width_cm, "02", "cm"),
+                        (publication.width_in, "02", "in"),
                         // 03 thickness
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_mm, "mm"), w).ok();
-                    }
-                    if let Some(depth_cm) = &publication.depth_cm {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_cm, "cm"), w).ok();
-                    }
-                    if let Some(depth_in) = &publication.depth_in {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("03", depth_in, "in"), w).ok();
-                    }
-                    if let Some(weight_g) = &publication.weight_g {
+                        (publication.depth_mm, "03", "mm"),
+                        (publication.depth_cm, "03", "cm"),
+                        (publication.depth_in, "03", "in"),
                         // 08 unit weight
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("08", weight_g, "gr"), w).ok();
-                    }
-                    if let Some(weight_oz) = &publication.weight_oz {
-                        XmlElementBlock::<Onix3Thoth>::xml_element(&("08", weight_oz, "oz"), w)
+                        (publication.weight_g, "08", "gr"),
+                        (publication.weight_oz, "08", "oz"),
+                    ] {
+                        if let Some(measurement) = measurement_opt {
+                            XmlElementBlock::<Onix3Thoth>::xml_element(
+                                &Measure {
+                                    measure_type,
+                                    measurement,
+                                    measure_unit_code,
+                                },
+                                w,
+                            )
                             .ok();
+                        }
                     }
                     if let Some(license_url) = &self.license {
                         let license_text = match License::from_url(license_url) {
@@ -752,13 +746,13 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                 })?;
                 let non_child_relations: Vec<WorkRelations> = self
                     .relations
-                    .clone()
-                    .into_iter()
+                    .iter()
                     .filter(|r| {
                         r.relation_type != RelationType::HAS_CHILD
                             && r.relation_type != RelationType::IS_CHILD_OF
                             && r.related_work.doi.is_some()
                     })
+                    .cloned()
                     .collect();
                 // Only output ISBNs in RelatedMaterial if at least one is present which
                 // doesn't relate to the current publication
@@ -831,25 +825,33 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                         }];
                     }
                     for location in locations {
-                        let mut supplier_name = location.location_platform.to_string();
-                        let mut description_string = location.location_platform.to_string();
-                        // 11 Non-exclusive distributor to end-customers
-                        let mut supplier_role = "11";
-                        // 36 Supplier’s website for a specified work
-                        let mut landing_page_role = "36";
-
-                        if location.location_platform == LocationPlatform::PUBLISHER_WEBSITE {
-                            supplier_name = self.imprint.publisher.publisher_name.clone();
-                            description_string = "Publisher's website".to_string();
-                            // 09 Publisher to end-customers
-                            supplier_role = "09";
-                            // 02 Publisher's website for a specified work
-                            landing_page_role = "02";
-                        } else if location.location_platform == LocationPlatform::OTHER {
-                            supplier_name = "Unknown".to_string();
-                            description_string = "Unspecified hosting platform".to_string();
-                        }
-
+                        let (supplier_name, description_string, supplier_role, landing_page_role) =
+                            match location.location_platform {
+                                LocationPlatform::PUBLISHER_WEBSITE => (
+                                    self.imprint.publisher.publisher_name.clone(),
+                                    "Publisher's website".to_string(),
+                                    // 09 Publisher to end-customers
+                                    "09",
+                                    // 02 Publisher's website for a specified work
+                                    "02",
+                                ),
+                                LocationPlatform::OTHER => (
+                                    "Unknown".to_string(),
+                                    "Unspecified hosting platform".to_string(),
+                                    // 11 Non-exclusive distributor to end-customers
+                                    "11",
+                                    // 36 Supplier’s website for a specified work
+                                    "36",
+                                ),
+                                _ => (
+                                    location.location_platform.to_string(),
+                                    location.location_platform.to_string(),
+                                    // 11 Non-exclusive distributor to end-customers
+                                    "11",
+                                    // 36 Supplier’s website for a specified work
+                                    "36",
+                                ),
+                            };
                         write_element_block("SupplyDetail", w, |w| {
                             write_element_block("Supplier", w, |w| {
                                 write_element_block("SupplierRole", w, |w| {
@@ -1322,36 +1324,34 @@ impl XmlElementBlock<Onix3Thoth> for WorkReferences {
             write_element_block("ProductRelationCode", w, |w| {
                 w.write(XmlEvent::Characters("34")).map_err(|e| e.into())
             })?;
-            if let Some(doi) = &self.doi {
-                write_element_block("ProductIdentifier", w, |w| {
-                    // 06 DOI
-                    write_element_block("ProductIDType", w, |w| {
-                        w.write(XmlEvent::Characters("06")).map_err(|e| e.into())
-                    })?;
-                    write_element_block("IDValue", w, |w| {
-                        w.write(XmlEvent::Characters(&doi.to_string()))
-                            .map_err(|e| e.into())
-                    })
-                })
-            } else {
-                // Unstructured citation is mandatory in Thoth if DOI is missing
-                write_element_block("ProductIdentifier", w, |w| {
-                    // 01 Proprietary
-                    write_element_block("ProductIDType", w, |w| {
-                        w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
-                    })?;
+            let (product_id_type, id_value) = self.doi.as_ref().map_or_else(
+                || {
+                    (
+                        // 01 Proprietary
+                        "01",
+                        // Unstructured citation is mandatory in Thoth if DOI is missing
+                        self.unstructured_citation.as_ref().unwrap().to_owned(),
+                    )
+                },
+                // 06 DOI
+                |doi| ("06", doi.to_string()),
+            );
+            write_element_block("ProductIdentifier", w, |w| {
+                write_element_block("ProductIDType", w, |w| {
+                    w.write(XmlEvent::Characters(product_id_type))
+                        .map_err(|e| e.into())
+                })?;
+                if product_id_type == "01" {
                     write_element_block("IDTypeName", w, |w| {
                         w.write(XmlEvent::Characters("Unstructured citation"))
                             .map_err(|e| e.into())
                     })?;
-                    write_element_block("IDValue", w, |w| {
-                        w.write(XmlEvent::Characters(
-                            self.unstructured_citation.as_ref().unwrap(),
-                        ))
+                }
+                write_element_block("IDValue", w, |w| {
+                    w.write(XmlEvent::Characters(&id_value))
                         .map_err(|e| e.into())
-                    })
                 })
-            }
+            })
         })
     }
 }
@@ -1424,19 +1424,20 @@ impl XmlElementBlock<Onix3Thoth> for WorkRelations {
     }
 }
 
-impl XmlElementBlock<Onix3Thoth> for (&str, &f64, &str) {
-    // (MeasureType, Measurement, MeasureUnitCode)
+impl XmlElementBlock<Onix3Thoth> for Measure {
     fn xml_element<W: Write>(&self, w: &mut EventWriter<W>) -> ThothResult<()> {
         write_element_block("Measure", w, |w| {
             write_element_block("MeasureType", w, |w| {
-                w.write(XmlEvent::Characters(self.0)).map_err(|e| e.into())
+                w.write(XmlEvent::Characters(self.measure_type))
+                    .map_err(|e| e.into())
             })?;
             write_element_block("Measurement", w, |w| {
-                w.write(XmlEvent::Characters(&self.1.to_string()))
+                w.write(XmlEvent::Characters(&self.measurement.to_string()))
                     .map_err(|e| e.into())
             })?;
             write_element_block("MeasureUnitCode", w, |w| {
-                w.write(XmlEvent::Characters(self.2)).map_err(|e| e.into())
+                w.write(XmlEvent::Characters(self.measure_unit_code))
+                    .map_err(|e| e.into())
             })
         })
     }

From b611b6b3e5b103f2ae930e55897d886a4b7398c0 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:31:28 +0000
Subject: [PATCH 41/44] Review markups: user-entered text may be any language
 so remove 'eng' attr

---
 thoth-export-server/src/xml/onix3_thoth.rs | 70 ++++++++--------------
 1 file changed, 26 insertions(+), 44 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index b368a48b..9614ef02 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -434,15 +434,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             write_element_block("ContentAudience", w, |w| {
                                 w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                             })?;
-                            write_full_element_block(
-                                "Text",
-                                Some(vec![("language", "eng")]),
-                                w,
-                                |w| {
-                                    w.write(XmlEvent::Characters(&short_abstract))
-                                        .map_err(|e| e.into())
-                                },
-                            )
+                            write_element_block("Text", w, |w| {
+                                w.write(XmlEvent::Characters(&short_abstract))
+                                    .map_err(|e| e.into())
+                            })
                         })?;
                     }
                     if let Some(long_abstract) = &self.long_abstract {
@@ -457,15 +452,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                                 write_element_block("ContentAudience", w, |w| {
                                     w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                                 })?;
-                                write_full_element_block(
-                                    "Text",
-                                    Some(vec![("language", "eng")]),
-                                    w,
-                                    |w| {
-                                        w.write(XmlEvent::Characters(long_abstract))
-                                            .map_err(|e| e.into())
-                                    },
-                                )
+                                write_element_block("Text", w, |w| {
+                                    w.write(XmlEvent::Characters(long_abstract))
+                                        .map_err(|e| e.into())
+                                })
                             })?;
                         }
                     }
@@ -479,12 +469,9 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             write_element_block("ContentAudience", w, |w| {
                                 w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                             })?;
-                            write_full_element_block(
-                                "Text",
-                                Some(vec![("language", "eng")]),
-                                w,
-                                |w| w.write(XmlEvent::Characters(toc)).map_err(|e| e.into()),
-                            )
+                            write_element_block("Text", w, |w| {
+                                w.write(XmlEvent::Characters(toc)).map_err(|e| e.into())
+                            })
                         })?;
                     }
                     write_element_block("TextContent", w, |w| {
@@ -513,15 +500,10 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             write_element_block("ContentAudience", w, |w| {
                                 w.write(XmlEvent::Characters("00")).map_err(|e| e.into())
                             })?;
-                            write_full_element_block(
-                                "Text",
-                                Some(vec![("language", "eng")]),
-                                w,
-                                |w| {
-                                    w.write(XmlEvent::Characters(general_note))
-                                        .map_err(|e| e.into())
-                                },
-                            )
+                            write_element_block("Text", w, |w| {
+                                w.write(XmlEvent::Characters(general_note))
+                                    .map_err(|e| e.into())
+                            })
                         })?;
                     }
                     if let Some(cover_url) = &self.cover_url {
@@ -2603,7 +2585,7 @@ mod tests {
     <TextContent>
       <TextType>02</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet.</Text>
+      <Text>Lorem ipsum dolor sit amet.</Text>
     </TextContent>"#
         ));
         assert!(output.contains(
@@ -2611,7 +2593,7 @@ mod tests {
     <TextContent>
       <TextType>03</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+      <Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
     </TextContent>"#
         ));
         assert!(output.contains(
@@ -2619,7 +2601,7 @@ mod tests {
     <TextContent>
       <TextType>30</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+      <Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
     </TextContent>"#
         ));
         assert!(output.contains(
@@ -2627,7 +2609,7 @@ mod tests {
     <TextContent>
       <TextType>04</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">1. Chapter 1</Text>
+      <Text>1. Chapter 1</Text>
     </TextContent>"#
         ));
         assert!(output.contains(
@@ -2643,7 +2625,7 @@ mod tests {
     <TextContent>
       <TextType>13</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">This is a general note</Text>
+      <Text>This is a general note</Text>
     </TextContent>"#
         ));
         assert!(output.contains(
@@ -3028,7 +3010,7 @@ mod tests {
     <TextContent>
       <TextType>02</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet.</Text>
+      <Text>Lorem ipsum dolor sit amet.</Text>
     </TextContent>"#
         ));
         assert!(!output.contains(
@@ -3036,7 +3018,7 @@ mod tests {
     <TextContent>
       <TextType>03</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+      <Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
     </TextContent>"#
         ));
         assert!(!output.contains(
@@ -3044,7 +3026,7 @@ mod tests {
     <TextContent>
       <TextType>30</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
+      <Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</Text>
     </TextContent>"#
         ));
         assert!(!output.contains(
@@ -3052,7 +3034,7 @@ mod tests {
     <TextContent>
       <TextType>04</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">1. Chapter 1</Text>
+      <Text>1. Chapter 1</Text>
     </TextContent>"#
         ));
         assert!(!output.contains(
@@ -3060,7 +3042,7 @@ mod tests {
     <TextContent>
       <TextType>13</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">This is a general note</Text>
+      <Text>This is a general note</Text>
     </TextContent>"#
         ));
         // SupportingResource block still present but ResourceFeature absent
@@ -3286,7 +3268,7 @@ mod tests {
     <TextContent>
       <TextType>02</TextType>
       <ContentAudience>00</ContentAudience>
-      <Text language="eng">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementu</Text>
+      <Text>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementu</Text>
     </TextContent>"#
         ));
         assert!(output.contains(

From bf8cf81d4969257906f63436b34ed119ef9891e2 Mon Sep 17 00:00:00 2001
From: rhigman <73792779+rhigman@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:35:55 +0000
Subject: [PATCH 42/44] Review markups: streamline Fundings logic (also in
 existing modules used as template)

---
 thoth-export-server/src/xml/onix3_oapen.rs    | 45 +++++++-------
 .../src/xml/onix3_overdrive.rs                | 45 +++++++-------
 thoth-export-server/src/xml/onix3_thoth.rs    | 60 ++++++++-----------
 3 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/thoth-export-server/src/xml/onix3_oapen.rs b/thoth-export-server/src/xml/onix3_oapen.rs
index 780ff883..879c534e 100644
--- a/thoth-export-server/src/xml/onix3_oapen.rs
+++ b/thoth-export-server/src/xml/onix3_oapen.rs
@@ -592,32 +592,29 @@ impl XmlElementBlock<Onix3Oapen> for WorkFundings {
                 w.write(XmlEvent::Characters(&self.institution.institution_name))
                     .map_err(|e| e.into())
             })?;
-            let mut identifiers: HashMap<String, String> = HashMap::new();
-            if let Some(program) = &self.program {
-                identifiers.insert("programname".to_string(), program.to_string());
-            }
-            if let Some(project_name) = &self.project_name {
-                identifiers.insert("projectname".to_string(), project_name.to_string());
-            }
-            if let Some(grant_number) = &self.grant_number {
-                identifiers.insert("grantnumber".to_string(), grant_number.to_string());
-            }
-            if !identifiers.is_empty() {
+            let identifiers: Vec<(&str, Option<&str>)> = vec![
+                ("programname", self.program.as_deref().to_owned()),
+                ("projectname", self.project_name.as_deref().to_owned()),
+                ("grantnumber", self.grant_number.as_deref().to_owned()),
+            ];
+            if identifiers.iter().any(|(_, i)| i.is_some()) {
                 write_element_block("Funding", w, |w| {
-                    for (typename, value) in &identifiers {
-                        write_element_block("FundingIdentifier", w, |w| {
-                            // 01 Proprietary
-                            write_element_block("FundingIDType", w, |w| {
-                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
-                            })?;
-                            write_element_block("IDTypeName", w, |w| {
-                                w.write(XmlEvent::Characters(typename))
-                                    .map_err(|e| e.into())
+                    for (typename, value_opt) in &identifiers {
+                        if let Some(value) = *value_opt {
+                            write_element_block("FundingIdentifier", w, |w| {
+                                // 01 Proprietary
+                                write_element_block("FundingIDType", w, |w| {
+                                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDTypeName", w, |w| {
+                                    w.write(XmlEvent::Characters(typename))
+                                        .map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDValue", w, |w| {
+                                    w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
+                                })
                             })?;
-                            write_element_block("IDValue", w, |w| {
-                                w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
-                            })
-                        })?;
+                        }
                     }
                     Ok(())
                 })?;
diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs
index 632fa7cd..ab31ad56 100644
--- a/thoth-export-server/src/xml/onix3_overdrive.rs
+++ b/thoth-export-server/src/xml/onix3_overdrive.rs
@@ -743,32 +743,29 @@ impl XmlElementBlock<Onix3Overdrive> for WorkFundings {
                 w.write(XmlEvent::Characters(&self.institution.institution_name))
                     .map_err(|e| e.into())
             })?;
-            let mut identifiers: HashMap<String, String> = HashMap::new();
-            if let Some(program) = &self.program {
-                identifiers.insert("programname".to_string(), program.to_string());
-            }
-            if let Some(project_name) = &self.project_name {
-                identifiers.insert("projectname".to_string(), project_name.to_string());
-            }
-            if let Some(grant_number) = &self.grant_number {
-                identifiers.insert("grantnumber".to_string(), grant_number.to_string());
-            }
-            if !identifiers.is_empty() {
+            let identifiers: Vec<(&str, Option<&str>)> = vec![
+                ("programname", self.program.as_deref().to_owned()),
+                ("projectname", self.project_name.as_deref().to_owned()),
+                ("grantnumber", self.grant_number.as_deref().to_owned()),
+            ];
+            if identifiers.iter().any(|(_, i)| i.is_some()) {
                 write_element_block("Funding", w, |w| {
-                    for (typename, value) in &identifiers {
-                        write_element_block("FundingIdentifier", w, |w| {
-                            // 01 Proprietary
-                            write_element_block("FundingIDType", w, |w| {
-                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
-                            })?;
-                            write_element_block("IDTypeName", w, |w| {
-                                w.write(XmlEvent::Characters(typename))
-                                    .map_err(|e| e.into())
+                    for (typename, value_opt) in &identifiers {
+                        if let Some(value) = *value_opt {
+                            write_element_block("FundingIdentifier", w, |w| {
+                                // 01 Proprietary
+                                write_element_block("FundingIDType", w, |w| {
+                                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDTypeName", w, |w| {
+                                    w.write(XmlEvent::Characters(typename))
+                                        .map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDValue", w, |w| {
+                                    w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
+                                })
                             })?;
-                            write_element_block("IDValue", w, |w| {
-                                w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
-                            })
-                        })?;
+                        }
                     }
                     Ok(())
                 })?;
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 9614ef02..aa68f0b2 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1,6 +1,5 @@
 use cc_license::License;
 use chrono::Utc;
-use std::collections::HashMap;
 use std::io::Write;
 use thoth_client::{
     ContributionType, LanguageRelation, LocationPlatform, PublicationType, RelationType,
@@ -1255,41 +1254,34 @@ impl XmlElementBlock<Onix3Thoth> for WorkFundings {
                 w.write(XmlEvent::Characters(&self.institution.institution_name))
                     .map_err(|e| e.into())
             })?;
-            let mut identifiers: HashMap<String, String> = HashMap::new();
-            if let Some(program) = &self.program {
-                identifiers.insert("programname".to_string(), program.to_string());
-            }
-            if let Some(project_name) = &self.project_name {
-                identifiers.insert("projectname".to_string(), project_name.to_string());
-            }
-            if let Some(project_shortname) = &self.project_shortname {
-                identifiers.insert(
-                    "projectshortname".to_string(),
-                    project_shortname.to_string(),
-                );
-            }
-            if let Some(grant_number) = &self.grant_number {
-                identifiers.insert("grantnumber".to_string(), grant_number.to_string());
-            }
-            if let Some(jurisdiction) = &self.jurisdiction {
-                identifiers.insert("jurisdiction".to_string(), jurisdiction.to_string());
-            }
-            if !identifiers.is_empty() {
+            let identifiers: Vec<(&str, Option<&str>)> = vec![
+                ("programname", self.program.as_deref().to_owned()),
+                ("projectname", self.project_name.as_deref().to_owned()),
+                (
+                    "projectshortname",
+                    self.project_shortname.as_deref().to_owned(),
+                ),
+                ("grantnumber", self.grant_number.as_deref().to_owned()),
+                ("jurisdiction", self.jurisdiction.as_deref().to_owned()),
+            ];
+            if identifiers.iter().any(|(_, i)| i.is_some()) {
                 write_element_block("Funding", w, |w| {
-                    for (typename, value) in &identifiers {
-                        write_element_block("FundingIdentifier", w, |w| {
-                            // 01 Proprietary
-                            write_element_block("FundingIDType", w, |w| {
-                                w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
-                            })?;
-                            write_element_block("IDTypeName", w, |w| {
-                                w.write(XmlEvent::Characters(typename))
-                                    .map_err(|e| e.into())
+                    for (typename, value_opt) in &identifiers {
+                        if let Some(value) = *value_opt {
+                            write_element_block("FundingIdentifier", w, |w| {
+                                // 01 Proprietary
+                                write_element_block("FundingIDType", w, |w| {
+                                    w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDTypeName", w, |w| {
+                                    w.write(XmlEvent::Characters(typename))
+                                        .map_err(|e| e.into())
+                                })?;
+                                write_element_block("IDValue", w, |w| {
+                                    w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
+                                })
                             })?;
-                            write_element_block("IDValue", w, |w| {
-                                w.write(XmlEvent::Characters(value)).map_err(|e| e.into())
-                            })
-                        })?;
+                        }
                     }
                     Ok(())
                 })?;

From 0c293224abada7114473e2ba95588f0f801842bd Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Thu, 7 Mar 2024 08:02:37 +0000
Subject: [PATCH 43/44] Bump v0.11.18

---
 Cargo.lock                     | 16 ++++++++--------
 Cargo.toml                     | 12 ++++++------
 thoth-api-server/Cargo.toml    |  6 +++---
 thoth-api/Cargo.toml           |  4 ++--
 thoth-app-server/Cargo.toml    |  2 +-
 thoth-app/Cargo.toml           |  6 +++---
 thoth-app/manifest.json        |  2 +-
 thoth-client/Cargo.toml        |  8 ++++----
 thoth-errors/Cargo.toml        |  2 +-
 thoth-export-server/Cargo.toml |  8 ++++----
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d987eb52..8c81f5fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3087,7 +3087,7 @@ dependencies = [
 
 [[package]]
 name = "thoth"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "cargo-husky",
  "clap",
@@ -3102,7 +3102,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-api"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "actix-web",
  "argon2rs",
@@ -3131,7 +3131,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-api-server"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "actix-cors",
  "actix-identity",
@@ -3147,7 +3147,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-app"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "anyhow",
  "chrono",
@@ -3176,7 +3176,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-app-server"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "actix-cors",
  "actix-web",
@@ -3186,7 +3186,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-client"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "chrono",
  "graphql_client",
@@ -3202,7 +3202,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-errors"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "actix-web",
  "csv",
@@ -3223,7 +3223,7 @@ dependencies = [
 
 [[package]]
 name = "thoth-export-server"
-version = "0.11.17"
+version = "0.11.18"
 dependencies = [
  "actix-cors",
  "actix-web",
diff --git a/Cargo.toml b/Cargo.toml
index d68146cf..f4bf8e48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "0.11.17", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.11.17", path = "thoth-api-server" }
-thoth-app-server = { version = "0.11.17", path = "thoth-app-server" }
-thoth-errors = { version = "0.11.17", path = "thoth-errors" }
-thoth-export-server = { version = "0.11.17", path = "thoth-export-server" }
+thoth-api = { version = "0.11.18", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.11.18", path = "thoth-api-server" }
+thoth-app-server = { version = "0.11.18", path = "thoth-app-server" }
+thoth-errors = { version = "0.11.18", path = "thoth-errors" }
+thoth-export-server = { version = "0.11.18", path = "thoth-export-server" }
 clap = { version = "4.4.7", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"
diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml
index 04de0e09..33c868c4 100644
--- a/thoth-api-server/Cargo.toml
+++ b/thoth-api-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
+thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 actix-identity = "0.7.1"
diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
index 1a734808..8698de5d 100644
--- a/thoth-api/Cargo.toml
+++ b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"]
 
 [dependencies]
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 actix-web = { version = "4.5.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"
diff --git a/thoth-app-server/Cargo.toml b/thoth-app-server/Cargo.toml
index ac21b31e..ed298870 100644
--- a/thoth-app-server/Cargo.toml
+++ b/thoth-app-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml
index 04b013d8..6e4232e9 100644
--- a/thoth-app/Cargo.toml
+++ b/thoth-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -36,8 +36,8 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
 # `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
 # https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"] }
-thoth-api = { version = "0.11.17", path = "../thoth-api"  }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
+thoth-api = { version = "0.11.18", path = "../thoth-api"  }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"
diff --git a/thoth-app/manifest.json b/thoth-app/manifest.json
index 04b3f381..f75b02c5 100644
--- a/thoth-app/manifest.json
+++ b/thoth-app/manifest.json
@@ -9,7 +9,7 @@
   "start_url": "/?homescreen=1",
   "background_color": "#ffffff",
   "theme_color": "#ffdd57",
-  "version": "0.11.17",
+  "version": "0.11.18",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",
diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
index b038422b..01ef6338 100644
--- a/thoth-client/Cargo.toml
+++ b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,8 +10,8 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = {version = "0.11.17", path = "../thoth-api" }
-thoth-errors = {version = "0.11.17", path = "../thoth-errors" }
+thoth-api = {version = "0.11.18", path = "../thoth-api" }
+thoth-errors = {version = "0.11.18", path = "../thoth-errors" }
 graphql_client = "0.13.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
@@ -22,4 +22,4 @@ serde_json = "1.0"
 uuid = { version = "0.8.2", features = ["serde"] }
 
 [build-dependencies]
-thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }
diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
index 15ab5a3d..74cdb8bc 100644
--- a/thoth-errors/Cargo.toml
+++ b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/thoth-export-server/Cargo.toml b/thoth-export-server/Cargo.toml
index 6da6399e..10d5638e 100644
--- a/thoth-export-server/Cargo.toml
+++ b/thoth-export-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-export-server"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,9 +10,9 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = { version = "0.11.17", path = "../thoth-api" }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
-thoth-client = { version = "0.11.17", path = "../thoth-client" }
+thoth-api = { version = "0.11.18", path = "../thoth-api" }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
+thoth-client = { version = "0.11.18", path = "../thoth-client" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"

From 45bd4abf2fabd772ac84cf95c1bb05bd994a8960 Mon Sep 17 00:00:00 2001
From: Javier Arias <javier@jarias.org>
Date: Thu, 7 Mar 2024 08:03:07 +0000
Subject: [PATCH 44/44] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d090eeae..3b92da7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [[0.11.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.18) - 2024-03-07
 ### Added
   - [441](https://github.com/thoth-pub/thoth/issues/441) - Implement ONIX 3.0 "Thoth" specification (i.e. complete record reflecting full data model)
   - [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output