From 689f79fbe7a1a65160b7ac72d2d1426cf58f79a6 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Mon, 13 Jul 2020 16:53:15 +0200 Subject: [PATCH 1/4] upgrade JSoup --- opacclient/libopac/build.gradle | 2 +- opacclient/opacapp/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opacclient/libopac/build.gradle b/opacclient/libopac/build.gradle index edba554e8..95778c50e 100644 --- a/opacclient/libopac/build.gradle +++ b/opacclient/libopac/build.gradle @@ -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' diff --git a/opacclient/opacapp/build.gradle b/opacclient/opacapp/build.gradle index bf37e2047..947fbc70c 100644 --- a/opacclient/opacapp/build.gradle +++ b/opacclient/opacapp/build.gradle @@ -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' From 5da18e9d0354bfaa84854ded366505c77ccc0e1b Mon Sep 17 00:00:00 2001 From: johan12345 Date: Mon, 13 Jul 2020 16:55:46 +0200 Subject: [PATCH 2/4] fix JSoup changes affecting VuFind https://github.com/jhy/jsoup/issues/1105 --- .../src/main/java/de/geeksfactory/opacclient/apis/VuFind.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/VuFind.java b/opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/VuFind.java index 28ea47878..62708463a 100644 --- a/opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/VuFind.java +++ b/opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/VuFind.java @@ -1059,7 +1059,7 @@ static List 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.]", ""); From 7bf278b85712ec499499ee95642bf8db92d2ca69 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Mon, 13 Jul 2020 17:02:18 +0200 Subject: [PATCH 3/4] fix JSoup changes affecting BiBer1992 different handling of .text() (missing  ) --- .../src/main/resources/biber1992/headers_reservations.json | 1 + 1 file changed, 1 insertion(+) diff --git a/opacclient/libopac/src/main/resources/biber1992/headers_reservations.json b/opacclient/libopac/src/main/resources/biber1992/headers_reservations.json index 69bebabd4..740730cb6 100644 --- a/opacclient/libopac/src/main/resources/biber1992/headers_reservations.json +++ b/opacclient/libopac/src/main/resources/biber1992/headers_reservations.json @@ -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, From 82c94623bb154313e94227021dec939c861140f2 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Mon, 13 Jul 2020 17:09:35 +0200 Subject: [PATCH 4/4] fix JSoup changes affecting Bibliotheca different handling of .text() (missing  ) --- .../libopac/src/main/resources/bibliotheca/headers_lent.json | 2 +- .../src/main/resources/bibliotheca/headers_reservations.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opacclient/libopac/src/main/resources/bibliotheca/headers_lent.json b/opacclient/libopac/src/main/resources/bibliotheca/headers_lent.json index f78929c90..7f371973e 100644 --- a/opacclient/libopac/src/main/resources/bibliotheca/headers_lent.json +++ b/opacclient/libopac/src/main/resources/bibliotheca/headers_lent.json @@ -1,5 +1,5 @@ { - "": null, + "": "prolongurl", "Abgabefrist": "returndate", "Anzahl Verl\u00e4ngerungen": "status", "Anz.Verl.": "status", diff --git a/opacclient/libopac/src/main/resources/bibliotheca/headers_reservations.json b/opacclient/libopac/src/main/resources/bibliotheca/headers_reservations.json index e9c5775c7..811e86ea9 100644 --- a/opacclient/libopac/src/main/resources/bibliotheca/headers_reservations.json +++ b/opacclient/libopac/src/main/resources/bibliotheca/headers_reservations.json @@ -1,5 +1,5 @@ { - "": null, + "": "cancelurl", "Abholbar bis": "expirationdate", "Ausleihstelle": "branch", "Author": "author",