Skip to content

Commit 38807b3

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.0'
2 parents dd965d8 + 3ea0342 commit 38807b3

32 files changed

Lines changed: 692 additions & 499 deletions

‎CHANGELOG.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.11.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.0) - 2023-04-14
10+
### Added
11+
- [490](https://github.com/thoth-pub/thoth/issues/490) - Generate MARC 21 markup
12+
- [491](https://github.com/thoth-pub/thoth/issues/491) - Generate MARC 21 XML
13+
- [492](https://github.com/thoth-pub/thoth/pull/492) - Add Thoth's MARC organization code to MARC records
14+
- [492](https://github.com/thoth-pub/thoth/pull/492) - Add ORCID IDs to MARC
15+
- [492](https://github.com/thoth-pub/thoth/pull/492) - Add contact details to APP
16+
17+
### Changed
18+
- [492](https://github.com/thoth-pub/thoth/pull/492) - Streamline `thoth-export-server`'s XML module
19+
920
## [[0.10.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.10.0) - 2023-04-03
1021
### Added
11-
- [42](https://github.com/thoth-pub/thoth/pull/42) - Generate MARC 21 records
22+
- [42](https://github.com/thoth-pub/thoth/issues/42) - Generate MARC 21 records
1223
- New `work` field `bibliography_note`
1324

1425
## [[0.9.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.18) - 2023-03-27

‎Cargo.lock‎

Lines changed: 13 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1717

1818
[dependencies]
19-
thoth-api = { version = "0.10.0", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.10.0", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.10.0", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.10.0", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.10.0", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.0", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.0", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.0", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.0", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.0", path = "thoth-export-server" }
2424
clap = "2.33.3"
2525
dialoguer = "0.7.1"
2626
dotenv = "0.15.0"

‎thoth-api-server/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.10.0", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.10.0", path = "../thoth-errors" }
12+
thoth-api = { version = "0.11.0", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.0", path = "../thoth-errors" }
1414
actix-web = "4.3.0"
1515
actix-cors = "0.6.4"
1616
actix-identity = "0.4.0"

‎thoth-api/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
1717

1818
[dependencies]
19-
thoth-errors = { version = "0.10.0", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.11.0", path = "../thoth-errors" }
2020
actix-web = { version = "4.3.0", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-app-server/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-app/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.10.0"
3+
version = "0.11.0"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
4141
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
4242
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
4343
getrandom = { version = "0.2", features = ["js"] }
44-
thoth-api = { version = "0.10.0", path = "../thoth-api" }
45-
thoth-errors = { version = "0.10.0", path = "../thoth-errors" }
44+
thoth-api = { version = "0.11.0", path = "../thoth-api" }
45+
thoth-errors = { version = "0.11.0", path = "../thoth-errors" }

‎thoth-app/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start_url": "/?homescreen=1",
1010
"background_color": "#ffffff",
1111
"theme_color": "#ffdd57",
12-
"version": "0.10.0",
12+
"version": "0.11.0",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

‎thoth-app/src/component/about.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ impl Component for AboutComponent {
3535
<li>{ "Ross Higman (Software Engineer)" }</li>
3636
</ul>
3737
<p>{ "Support us through the " }<a href={ "https://www.openbookcollective.org/packages/20/info/" }>{ "Open Book Collective" }</a>{ "." }</p>
38+
<p>{ "Contact us at " }<a href={ "mailto:info@thoth.pub" }>{ "info@thoth.pub" }</a>{ "." }</p>
3839
</div>
3940
</div>
4041
}

‎thoth-app/src/models/work/mod.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ impl MetadataTable for WorkWithRelations {
114114

115115
pub trait DisplayWork {
116116
fn marc21_thoth_endpoint(&self) -> String;
117+
fn marc21markup_thoth_endpoint(&self) -> String;
118+
fn marc21xml_thoth_endpoint(&self) -> String;
117119
fn onix_projectmuse_endpoint(&self) -> String;
118120
fn onix_oapen_endpoint(&self) -> String;
119121
fn onix_jstor_endpoint(&self) -> String;
@@ -140,6 +142,20 @@ impl DisplayWork for WorkWithRelations {
140142
)
141143
}
142144

145+
fn marc21markup_thoth_endpoint(&self) -> String {
146+
format!(
147+
"{}/specifications/marc21markup::thoth/work/{}",
148+
THOTH_EXPORT_API, &self.work_id
149+
)
150+
}
151+
152+
fn marc21xml_thoth_endpoint(&self) -> String {
153+
format!(
154+
"{}/specifications/marc21xml::thoth/work/{}",
155+
THOTH_EXPORT_API, &self.work_id
156+
)
157+
}
158+
143159
fn onix_projectmuse_endpoint(&self) -> String {
144160
format!(
145161
"{}/specifications/onix_3.0::project_muse/work/{}",
@@ -486,6 +502,18 @@ impl DisplayWork for WorkWithRelations {
486502
>
487503
{"MARC 21 Record"}
488504
</a>
505+
<a
506+
href={self.marc21markup_thoth_endpoint()}
507+
class="dropdown-item"
508+
>
509+
{"MARC 21 Markup"}
510+
</a>
511+
<a
512+
href={self.marc21xml_thoth_endpoint()}
513+
class="dropdown-item"
514+
>
515+
{"MARC 21 XML"}
516+
</a>
489517
</div>
490518
</div>
491519
</div>

0 commit comments

Comments
 (0)