Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

[WIP] JSoup upgrade #584

Open
johan12345 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] JSoup upgrade #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
689f79f
upgrade JSoup
johan12345 Jul 13, 2020
5da18e9
fix JSoup changes affecting VuFind
johan12345 Jul 13, 2020
7bf278b
fix JSoup changes affecting BiBer1992
johan12345 Jul 13, 2020
82c9462
fix JSoup changes affecting Bibliotheca
johan12345 Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opacclient/libopac/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
// Other
// Use older org.json version to have an environment equivalent to the android platform
api 'org.json:json:20090211'
implementation 'org.jsoup:jsoup:1.8.3'
implementation 'org.jsoup:jsoup:1.13.1'
implementation 'org.apache.httpcomponents:httpmime:4.5.12'
api 'joda-time:joda-time:2.10.6'
api 'com.squareup.okhttp3:okhttp:3.12.12'
Expand Down
2 changes: 1 addition & 1 deletion opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/VuFind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ static List<LentItem> parse_lent(Document doc) {
Element due = record.select(
"strong:contains(Rückgabedatum), strong:contains(Due date), " +
"strong:contains(Fecha de Vencimiento), strong:contains(Délais " +
"d'emprunt), strong:contains(Data di scadenza)")
"d\\'emprunt), strong:contains(Data di scadenza)")
.first();
if (due != null) {
String text = due.text().replaceAll("[^\\d.]", "");
Expand Down
1 change: 1 addition & 0 deletions opacclient/libopac/src/main/resources/biber1992/headers_reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"Nr": null,
"Mediennr": null,
"\u00a0A\u00a0": null,
"A": null,
"Signatur / Kurztitel": "author+title",
"Vormerkung: Signatur / Kurztitel": "author+title",
"g\u00fcltig ab": null,
Expand Down
2 changes: 1 addition & 1 deletion opacclient/libopac/src/main/resources/bibliotheca/headers_lent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"": null,
"": "prolongurl",
"Abgabefrist": "returndate",
"Anzahl Verl\u00e4ngerungen": "status",
"Anz.Verl.": "status",
Expand Down
2 changes: 1 addition & 1 deletion opacclient/libopac/src/main/resources/bibliotheca/headers_reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"": null,
"": "cancelurl",
"Abholbar bis": "expirationdate",
"Ausleihstelle": "branch",
"Author": "author",
Expand Down
2 changes: 1 addition & 1 deletion opacclient/opacapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ dependencies {

// Other
implementation 'io.sentry:sentry-android-core:2.2.0'
implementation 'org.jsoup:jsoup:1.8.3'
implementation 'org.jsoup:jsoup:1.13.1'
implementation 'org.apmem.tools:layouts:1.10@aar'
implementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
implementation 'joda-time:joda-time:2.10.6'
Expand Down