diff --git a/CHANGELOG.md b/CHANGELOG.md index cc41250db..5ff3f95e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,6 @@ 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 - - [581](https://github.com/thoth-pub/thoth/issues/581) - Add crossmark policy DOI to imprint record ## [[0.12.1]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.1) - 2024-04-8 ### Fixed diff --git a/thoth-api/migrations/v0.11.19/down.sql b/thoth-api/migrations/v0.11.19/down.sql deleted file mode 100644 index f21aa271a..000000000 --- a/thoth-api/migrations/v0.11.19/down.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE imprint - DROP COLUMN crossmark_doi; diff --git a/thoth-api/migrations/v0.11.19/up.sql b/thoth-api/migrations/v0.11.19/up.sql deleted file mode 100644 index 9f2f56d91..000000000 --- a/thoth-api/migrations/v0.11.19/up.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE imprint - ADD COLUMN crossmark_doi TEXT CHECK (crossmark_doi ~* 'https:\/\/doi.org\/10.\d{4,9}\/[-._\;\(\)\/:a-zA-Z0-9]+$'); diff --git a/thoth-api/src/graphql/model.rs b/thoth-api/src/graphql/model.rs index 5afc51f1d..6f608b9ca 100644 --- a/thoth-api/src/graphql/model.rs +++ b/thoth-api/src/graphql/model.rs @@ -3035,19 +3035,10 @@ impl Imprint { &self.imprint_name } - #[graphql(description = "URL of the imprint's landing page")] pub fn imprint_url(&self) -> Option<&String> { self.imprint_url.as_ref() } - #[graphql( - description = "DOI of the imprint's Crossmark policy page, if publisher participates. Crossmark 'gives readers quick and easy access to the - current status of an item of content, including any corrections, retractions, or updates'. More: https://www.crossref.org/services/crossmark/" - )] - pub fn crossmark_doi(&self) -> Option<&Doi> { - self.crossmark_doi.as_ref() - } - pub fn created_at(&self) -> Timestamp { self.created_at.clone() } diff --git a/thoth-api/src/model/imprint/crud.rs b/thoth-api/src/model/imprint/crud.rs index 7f127576c..6feea42c7 100644 --- a/thoth-api/src/model/imprint/crud.rs +++ b/thoth-api/src/model/imprint/crud.rs @@ -54,10 +54,6 @@ impl Crud for Imprint { Direction::Asc => query.order(imprint_url.asc()), Direction::Desc => query.order(imprint_url.desc()), }, - ImprintField::CrossmarkDoi => match order.direction { - Direction::Asc => query.order(crossmark_doi.asc()), - Direction::Desc => query.order(crossmark_doi.desc()), - }, ImprintField::CreatedAt => match order.direction { Direction::Asc => query.order(created_at.asc()), Direction::Desc => query.order(created_at.desc()), diff --git a/thoth-api/src/model/imprint/mod.rs b/thoth-api/src/model/imprint/mod.rs index ceb1ad4db..a87b965f8 100644 --- a/thoth-api/src/model/imprint/mod.rs +++ b/thoth-api/src/model/imprint/mod.rs @@ -1,4 +1,3 @@ -use crate::model::Doi; use serde::Deserialize; use serde::Serialize; use strum::Display; @@ -28,8 +27,6 @@ pub enum ImprintField { ImprintName, #[strum(serialize = "ImprintURL")] ImprintUrl, - #[strum(serialize = "CrossmarkDOI")] - CrossmarkDoi, CreatedAt, UpdatedAt, } @@ -42,7 +39,6 @@ pub struct Imprint { pub publisher_id: Uuid, pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, pub created_at: Timestamp, pub updated_at: Timestamp, } @@ -53,7 +49,6 @@ pub struct ImprintWithPublisher { pub imprint_id: Uuid, pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, pub updated_at: Timestamp, pub publisher: Publisher, } @@ -67,7 +62,6 @@ pub struct NewImprint { pub publisher_id: Uuid, pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, } #[cfg_attr( @@ -80,7 +74,6 @@ pub struct PatchImprint { pub publisher_id: Uuid, pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, } #[cfg_attr(feature = "backend", derive(Queryable))] @@ -125,7 +118,6 @@ fn test_imprintfield_display() { assert_eq!(format!("{}", ImprintField::ImprintId), "ID"); assert_eq!(format!("{}", ImprintField::ImprintName), "Imprint"); assert_eq!(format!("{}", ImprintField::ImprintUrl), "ImprintURL"); - assert_eq!(format!("{}", ImprintField::CrossmarkDoi), "CrossmarkDOI"); assert_eq!(format!("{}", ImprintField::CreatedAt), "CreatedAt"); assert_eq!(format!("{}", ImprintField::UpdatedAt), "UpdatedAt"); } @@ -145,10 +137,6 @@ fn test_imprintfield_fromstr() { ImprintField::from_str("ImprintURL").unwrap(), ImprintField::ImprintUrl ); - assert_eq!( - ImprintField::from_str("CrossmarkDOI").unwrap(), - ImprintField::CrossmarkDoi - ); assert_eq!( ImprintField::from_str("CreatedAt").unwrap(), ImprintField::CreatedAt diff --git a/thoth-api/src/schema.rs b/thoth-api/src/schema.rs index 795ffa493..cada1078b 100644 --- a/thoth-api/src/schema.rs +++ b/thoth-api/src/schema.rs @@ -189,7 +189,6 @@ table! { publisher_id -> Uuid, imprint_name -> Text, imprint_url -> Nullable, - crossmark_doi -> Nullable, created_at -> Timestamptz, updated_at -> Timestamptz, } diff --git a/thoth-app/src/component/imprint.rs b/thoth-app/src/component/imprint.rs index 7ee396651..247b23ebc 100644 --- a/thoth-app/src/component/imprint.rs +++ b/thoth-app/src/component/imprint.rs @@ -2,7 +2,6 @@ use thoth_api::account::model::AccountAccess; use thoth_api::account::model::AccountDetails; use thoth_api::model::imprint::ImprintWithPublisher; use thoth_api::model::publisher::Publisher; -use thoth_api::model::{Doi, DOI_DOMAIN}; use thoth_errors::ThothError; use uuid::Uuid; use yew::html; @@ -22,7 +21,6 @@ use crate::agent::notification_bus::Request; use crate::component::delete_dialogue::ConfirmDeleteComponent; use crate::component::utils::FormPublisherSelect; use crate::component::utils::FormTextInput; -use crate::component::utils::FormTextInputExtended; use crate::component::utils::FormUrlInput; use crate::component::utils::Loader; use crate::models::imprint::delete_imprint_mutation::DeleteImprintRequest; @@ -61,9 +59,6 @@ pub struct ImprintComponent { notification_bus: NotificationDispatcher, // Store props value locally in order to test whether it has been updated on props change resource_access: AccountAccess, - // Track the user-entered DOI string, which may not be validly formatted - crossmark_doi: String, - crossmark_doi_warning: String, } #[derive(Default)] @@ -83,7 +78,6 @@ pub enum Msg { ChangePublisher(Uuid), ChangeImprintName(String), ChangeImprintUrl(String), - ChangeCrossmarkDoi(String), } #[derive(PartialEq, Eq, Properties)] @@ -105,8 +99,6 @@ impl Component for ImprintComponent { let notification_bus = NotificationBus::dispatcher(); let imprint: ImprintWithPublisher = Default::default(); let resource_access = ctx.props().current_user.resource_access.clone(); - let crossmark_doi = Default::default(); - let crossmark_doi_warning = Default::default(); ctx.link().send_message(Msg::GetImprint); ctx.link().send_message(Msg::GetPublishers); @@ -120,8 +112,6 @@ impl Component for ImprintComponent { fetch_publishers, notification_bus, resource_access, - crossmark_doi, - crossmark_doi_warning, } } @@ -164,13 +154,6 @@ impl Component for ImprintComponent { Some(c) => c.to_owned(), None => Default::default(), }; - // Initialise user-entered DOI variable to match DOI in database - self.crossmark_doi = self - .imprint - .crossmark_doi - .clone() - .unwrap_or_default() - .to_string(); // If user doesn't have permission to edit this object, redirect to dashboard if let Some(publishers) = ctx.props().current_user.resource_access.restricted_to() @@ -209,13 +192,6 @@ impl Component for ImprintComponent { FetchState::Fetching(_) => false, FetchState::Fetched(body) => match &body.data.update_imprint { Some(i) => { - self.crossmark_doi = self - .imprint - .crossmark_doi - .clone() - .unwrap_or_default() - .to_string(); - self.crossmark_doi_warning.clear(); self.notification_bus.send(Request::NotificationBusMsg(( format!("Saved {}", i.imprint_name), NotificationStatus::Success, @@ -240,20 +216,11 @@ impl Component for ImprintComponent { } } Msg::UpdateImprint => { - // Only update the DOI value with the current user-entered string - // if it is validly formatted - otherwise keep the default. - // If no DOI was provided, no format check is required. - if self.crossmark_doi.is_empty() { - self.imprint.crossmark_doi.neq_assign(None); - } else if let Ok(result) = self.crossmark_doi.parse::() { - self.imprint.crossmark_doi.neq_assign(Some(result)); - } let body = UpdateImprintRequestBody { variables: UpdateVariables { imprint_id: self.imprint.imprint_id, imprint_name: self.imprint.imprint_name.clone(), imprint_url: self.imprint.imprint_url.clone(), - crossmark_doi: self.imprint.crossmark_doi.clone(), publisher_id: self.imprint.publisher.publisher_id, }, ..Default::default() @@ -332,27 +299,6 @@ impl Component for ImprintComponent { Msg::ChangeImprintUrl(value) => { self.imprint.imprint_url.neq_assign(value.to_opt_string()) } - Msg::ChangeCrossmarkDoi(value) => { - if self.crossmark_doi.neq_assign(value.trim().to_owned()) { - // If DOI is not correctly formatted, display a warning. - // Don't update self.imprint.crossmark_doi yet, as user may later - // overwrite a new valid value with an invalid one. - self.crossmark_doi_warning.clear(); - match self.crossmark_doi.parse::() { - Err(e) => { - match e { - // If no DOI was provided, no warning is required. - ThothError::DoiEmptyError => {} - _ => self.crossmark_doi_warning = e.to_string(), - } - } - Ok(value) => self.crossmark_doi = value.to_string(), - } - true - } else { - false - } - } } } @@ -414,13 +360,6 @@ impl Component for ImprintComponent { value={ self.imprint.imprint_url.clone() } oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeImprintUrl(e.to_value())) } /> -
diff --git a/thoth-app/src/component/new_imprint.rs b/thoth-app/src/component/new_imprint.rs index 8ba2371dc..87048461b 100644 --- a/thoth-app/src/component/new_imprint.rs +++ b/thoth-app/src/component/new_imprint.rs @@ -2,7 +2,6 @@ use thoth_api::account::model::AccountAccess; use thoth_api::account::model::AccountDetails; use thoth_api::model::imprint::Imprint; use thoth_api::model::publisher::Publisher; -use thoth_api::model::{Doi, DOI_DOMAIN}; use thoth_errors::ThothError; use uuid::Uuid; use yew::html; @@ -21,7 +20,6 @@ use crate::agent::notification_bus::NotificationStatus; use crate::agent::notification_bus::Request; use crate::component::utils::FormPublisherSelect; use crate::component::utils::FormTextInput; -use crate::component::utils::FormTextInputExtended; use crate::component::utils::FormUrlInput; use crate::models::imprint::create_imprint_mutation::CreateImprintRequest; use crate::models::imprint::create_imprint_mutation::CreateImprintRequestBody; @@ -48,9 +46,6 @@ pub struct NewImprintComponent { notification_bus: NotificationDispatcher, // Store props value locally in order to test whether it has been updated on props change resource_access: AccountAccess, - // Track the user-entered DOI string, which may not be validly formatted - crossmark_doi: String, - crossmark_doi_warning: String, } #[derive(Default)] @@ -66,7 +61,6 @@ pub enum Msg { ChangePublisher(Uuid), ChangeImprintName(String), ChangeImprintUrl(String), - ChangeCrossmarkDoi(String), } #[derive(PartialEq, Eq, Properties)] pub struct Props { @@ -85,8 +79,6 @@ impl Component for NewImprintComponent { let data: ImprintFormData = Default::default(); let fetch_publishers: FetchPublishers = Default::default(); let resource_access = ctx.props().current_user.resource_access.clone(); - let crossmark_doi = Default::default(); - let crossmark_doi_warning = Default::default(); ctx.link().send_message(Msg::GetPublishers); @@ -98,8 +90,6 @@ impl Component for NewImprintComponent { fetch_publishers, notification_bus, resource_access, - crossmark_doi, - crossmark_doi_warning, } } @@ -164,19 +154,10 @@ impl Component for NewImprintComponent { } } Msg::CreateImprint => { - // Only update the DOI value with the current user-entered string - // if it is validly formatted - otherwise keep the default. - // If no DOI was provided, no format check is required. - if self.crossmark_doi.is_empty() { - self.imprint.crossmark_doi.neq_assign(None); - } else if let Ok(result) = self.crossmark_doi.parse::() { - self.imprint.crossmark_doi.neq_assign(Some(result)); - } let body = CreateImprintRequestBody { variables: Variables { imprint_name: self.imprint.imprint_name.clone(), imprint_url: self.imprint.imprint_url.clone(), - crossmark_doi: self.imprint.crossmark_doi.clone(), publisher_id: self.publisher_id, }, ..Default::default() @@ -197,27 +178,6 @@ impl Component for NewImprintComponent { Msg::ChangeImprintUrl(value) => { self.imprint.imprint_url.neq_assign(value.to_opt_string()) } - Msg::ChangeCrossmarkDoi(value) => { - if self.crossmark_doi.neq_assign(value.trim().to_owned()) { - // If DOI is not correctly formatted, display a warning. - // Don't update self.imprint.crossmark_doi yet, as user may later - // overwrite a new valid value with an invalid one. - self.crossmark_doi_warning.clear(); - match self.crossmark_doi.parse::() { - Err(e) => { - match e { - // If no DOI was provided, no warning is required. - ThothError::DoiEmptyError => {} - _ => self.crossmark_doi_warning = e.to_string(), - } - } - Ok(value) => self.crossmark_doi = value.to_string(), - } - true - } else { - false - } - } } } @@ -268,13 +228,6 @@ impl Component for NewImprintComponent { value={ self.imprint.imprint_url.clone() } oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeImprintUrl(e.to_value())) } /> -
diff --git a/thoth-app/src/models/imprint/create_imprint_mutation.rs b/thoth-app/src/models/imprint/create_imprint_mutation.rs index 77da8011e..8b1669272 100644 --- a/thoth-app/src/models/imprint/create_imprint_mutation.rs +++ b/thoth-app/src/models/imprint/create_imprint_mutation.rs @@ -1,20 +1,17 @@ use serde::Deserialize; use serde::Serialize; use thoth_api::model::imprint::Imprint; -use thoth_api::model::Doi; use uuid::Uuid; const CREATE_IMPRINT_MUTATION: &str = " mutation CreateImprint( $imprintName: String!, $imprintUrl: String, - $crossmarkDoi: Doi, $publisherId: Uuid! ) { createImprint(data: { imprintName: $imprintName imprintUrl: $imprintUrl - crossmarkDoi: $crossmarkDoi publisherId: $publisherId }){ imprintId @@ -42,7 +39,6 @@ graphql_query_builder! { pub struct Variables { pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, pub publisher_id: Uuid, } diff --git a/thoth-app/src/models/imprint/imprint_query.rs b/thoth-app/src/models/imprint/imprint_query.rs index 38d050abd..6799810f9 100644 --- a/thoth-app/src/models/imprint/imprint_query.rs +++ b/thoth-app/src/models/imprint/imprint_query.rs @@ -9,7 +9,6 @@ pub const IMPRINT_QUERY: &str = " imprintId imprintName imprintUrl - crossmarkDoi updatedAt publisher { publisherId diff --git a/thoth-app/src/models/imprint/imprints_query.rs b/thoth-app/src/models/imprint/imprints_query.rs index 3004e1214..501d71915 100644 --- a/thoth-app/src/models/imprint/imprints_query.rs +++ b/thoth-app/src/models/imprint/imprints_query.rs @@ -9,7 +9,6 @@ const IMPRINTS_QUERY: &str = " imprintId imprintName imprintUrl - crossmarkDoi updatedAt publisher { publisherId diff --git a/thoth-app/src/models/imprint/update_imprint_mutation.rs b/thoth-app/src/models/imprint/update_imprint_mutation.rs index fdab90c5d..3a5f58723 100644 --- a/thoth-app/src/models/imprint/update_imprint_mutation.rs +++ b/thoth-app/src/models/imprint/update_imprint_mutation.rs @@ -1,7 +1,6 @@ use serde::Deserialize; use serde::Serialize; use thoth_api::model::imprint::Imprint; -use thoth_api::model::Doi; use uuid::Uuid; const UPDATE_IMPRINT_MUTATION: &str = " @@ -9,14 +8,12 @@ const UPDATE_IMPRINT_MUTATION: &str = " $imprintId: Uuid!, $imprintName: String!, $imprintUrl: String, - $crossmarkDoi: Doi, $publisherId: Uuid! ) { updateImprint(data: { imprintId: $imprintId imprintName: $imprintName imprintUrl: $imprintUrl - crossmarkDoi: $crossmarkDoi publisherId: $publisherId }){ imprintId @@ -45,7 +42,6 @@ pub struct Variables { pub imprint_id: Uuid, pub imprint_name: String, pub imprint_url: Option, - pub crossmark_doi: Option, pub publisher_id: Uuid, } diff --git a/thoth-client/assets/queries.graphql b/thoth-client/assets/queries.graphql index 7bd9a8e5c..b25301c8e 100644 --- a/thoth-client/assets/queries.graphql +++ b/thoth-client/assets/queries.graphql @@ -71,7 +71,6 @@ fragment Work on Work { imprint { imprintName imprintUrl - crossmarkDoi publisher { publisherName publisherShortname diff --git a/thoth-export-server/src/bibtex/bibtex_thoth.rs b/thoth-export-server/src/bibtex/bibtex_thoth.rs index 8c86e7c42..257e6cfb2 100644 --- a/thoth-export-server/src/bibtex/bibtex_thoth.rs +++ b/thoth-export-server/src/bibtex/bibtex_thoth.rs @@ -308,7 +308,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/csv/csv_thoth.rs b/thoth-export-server/src/csv/csv_thoth.rs index 3ae7b0eb1..dd8a05f0f 100644 --- a/thoth-export-server/src/csv/csv_thoth.rs +++ b/thoth-export-server/src/csv/csv_thoth.rs @@ -548,7 +548,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/csv/kbart_oclc.rs b/thoth-export-server/src/csv/kbart_oclc.rs index fd53eb97a..b0d29a827 100644 --- a/thoth-export-server/src/csv/kbart_oclc.rs +++ b/thoth-export-server/src/csv/kbart_oclc.rs @@ -275,7 +275,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/json/json_thoth.rs b/thoth-export-server/src/json/json_thoth.rs index 022b3cf16..1c9eefbe8 100644 --- a/thoth-export-server/src/json/json_thoth.rs +++ b/thoth-export-server/src/json/json_thoth.rs @@ -111,7 +111,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), @@ -470,7 +469,6 @@ mod tests { "imprint": { "imprintName": "OA Editions Imprint", "imprintUrl": null, - "crossmarkDoi": null, "publisher": { "publisherName": "OA Editions", "publisherShortname": "OAE", diff --git a/thoth-export-server/src/marc21/marc21record_thoth.rs b/thoth-export-server/src/marc21/marc21record_thoth.rs index be459db28..7b119eec8 100644 --- a/thoth-export-server/src/marc21/marc21record_thoth.rs +++ b/thoth-export-server/src/marc21/marc21record_thoth.rs @@ -821,7 +821,6 @@ pub(crate) mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: None, diff --git a/thoth-export-server/src/xml/doideposit_crossref.rs b/thoth-export-server/src/xml/doideposit_crossref.rs index b3d4d6492..1ab19866f 100644 --- a/thoth-export-server/src/xml/doideposit_crossref.rs +++ b/thoth-export-server/src/xml/doideposit_crossref.rs @@ -1041,7 +1041,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), @@ -1610,7 +1609,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs index 3bbb9a93b..18390d688 100644 --- a/thoth-export-server/src/xml/onix21_ebsco_host.rs +++ b/thoth-export-server/src/xml/onix21_ebsco_host.rs @@ -897,7 +897,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some(("OAE").to_string()), diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs index 59b563b6c..395cb48fc 100644 --- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs +++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs @@ -889,7 +889,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some(("OAE").to_string()), diff --git a/thoth-export-server/src/xml/onix3_google_books.rs b/thoth-export-server/src/xml/onix3_google_books.rs index 769de8060..0578701a4 100644 --- a/thoth-export-server/src/xml/onix3_google_books.rs +++ b/thoth-export-server/src/xml/onix3_google_books.rs @@ -856,7 +856,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix3_jstor.rs b/thoth-export-server/src/xml/onix3_jstor.rs index ce84a86ec..e679c1ee8 100644 --- a/thoth-export-server/src/xml/onix3_jstor.rs +++ b/thoth-export-server/src/xml/onix3_jstor.rs @@ -737,7 +737,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix3_oapen.rs b/thoth-export-server/src/xml/onix3_oapen.rs index 899408c83..879c534ee 100644 --- a/thoth-export-server/src/xml/onix3_oapen.rs +++ b/thoth-export-server/src/xml/onix3_oapen.rs @@ -993,7 +993,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs index edfe10990..ab31ad56a 100644 --- a/thoth-export-server/src/xml/onix3_overdrive.rs +++ b/thoth-export-server/src/xml/onix3_overdrive.rs @@ -1100,7 +1100,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix3_project_muse.rs b/thoth-export-server/src/xml/onix3_project_muse.rs index a640e16ea..54bdb1020 100644 --- a/thoth-export-server/src/xml/onix3_project_muse.rs +++ b/thoth-export-server/src/xml/onix3_project_muse.rs @@ -754,7 +754,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: None, - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: Some("OAE".to_string()), diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs index 9d2404845..0f7185366 100644 --- a/thoth-export-server/src/xml/onix3_thoth.rs +++ b/thoth-export-server/src/xml/onix3_thoth.rs @@ -2096,7 +2096,6 @@ mod tests { imprint: WorkImprint { imprint_name: "OA Editions Imprint".to_string(), imprint_url: Some("https://imprint.oa".to_string()), - crossmark_doi: None, publisher: WorkImprintPublisher { publisher_name: "OA Editions".to_string(), publisher_shortname: None,