From 847250e48a5a43ab3e8c659a29539b46f10b875e Mon Sep 17 00:00:00 2001 From: benibela Date: Fri, 1 Sep 2023 14:38:36 +0200 Subject: [PATCH 001/114] munich no search terms --- data/libraries/templates/aDISWeb/search | 1 + 1 file changed, 1 insertion(+) diff --git a/data/libraries/templates/aDISWeb/search b/data/libraries/templates/aDISWeb/search index d6790eac..bef924d5 100644 --- a/data/libraries/templates/aDISWeb/search +++ b/data/libraries/templates/aDISWeb/search @@ -97,6 +97,7 @@ Ihre Suche erzielte keinen Treffer

Ihre Suche.*erzielte keinen? Treffer

Bitte geben Sie einen Suchbegriff ein

+

Bitte geben Sie einen Suchbegriff ein

search-result-count := 0 From 849edaf4910d72a298c105d62fd2b439b66c7af7 Mon Sep 17 00:00:00 2001 From: benibela Date: Tue, 5 Sep 2023 15:45:38 +0200 Subject: [PATCH 002/114] fix videlibri errors not being caught --- .../src/de/benibela/videlibri/activities/ImportExport.kt | 4 ++-- .../src/de/benibela/videlibri/activities/NewLibrary.kt | 2 +- .../src/de/benibela/videlibri/activities/SourceEdit.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/android/src/de/benibela/videlibri/activities/ImportExport.kt b/android/android/src/de/benibela/videlibri/activities/ImportExport.kt index e1af8ea6..a2a2b6f0 100644 --- a/android/android/src/de/benibela/videlibri/activities/ImportExport.kt +++ b/android/android/src/de/benibela/videlibri/activities/ImportExport.kt @@ -285,7 +285,7 @@ class Import : ImportExportBase() { if (data == null) data = try { Bridge.VLImportAccountsPrepare(filename) - } catch (e: InternalError){ + } catch (e: de.benibela.videlibri.jni.InternalError){ showMessage(getString(R.string.import_file_open_failed) + ":\n" + e.message) null } @@ -330,7 +330,7 @@ class Import : ImportExportBase() { File(state.fileName).delete() state.fileName = "" this.data = null - } catch (e: InternalError) { + } catch (e: de.benibela.videlibri.jni.InternalError) { showMessage(e.message) } } diff --git a/android/android/src/de/benibela/videlibri/activities/NewLibrary.kt b/android/android/src/de/benibela/videlibri/activities/NewLibrary.kt index 14bea11f..c6741fd1 100644 --- a/android/android/src/de/benibela/videlibri/activities/NewLibrary.kt +++ b/android/android/src/de/benibela/videlibri/activities/NewLibrary.kt @@ -115,7 +115,7 @@ class NewLibrary : VideLibriBaseActivity() { val details = try { Bridge.VLGetTemplateDetails(template) ?: return - } catch (e: InternalError) { + } catch (e: de.benibela.videlibri.jni.InternalError) { showMessage(e.localizedMessage) return } diff --git a/android/android/src/de/benibela/videlibri/activities/SourceEdit.kt b/android/android/src/de/benibela/videlibri/activities/SourceEdit.kt index eca2c91f..30392c8f 100644 --- a/android/android/src/de/benibela/videlibri/activities/SourceEdit.kt +++ b/android/android/src/de/benibela/videlibri/activities/SourceEdit.kt @@ -183,7 +183,7 @@ class SourceEdit : VideLibriBaseActivity() { Bridge.VLReloadLibrary(selection2[fileSpinner.selectedItemPosition].replace(".xml", "")) else Bridge.VLReloadTemplate(templateIds[pos - 1]) - } catch (e: InternalError) { + } catch (e: de.benibela.videlibri.jni.InternalError) { showMessage(e.localizedMessage) } From a48b9fe518aa3bb664285203d192dd1bd4e6daac Mon Sep 17 00:00:00 2001 From: benibela Date: Fri, 6 Oct 2023 23:28:33 +0200 Subject: [PATCH 003/114] zones: use renew link on logged-in page --- _meta/tests/zones18/loggedIn.html.result | 1 + data/libraries/templates/zones18/loggedIn | 1 + data/libraries/templates/zones18/template | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/_meta/tests/zones18/loggedIn.html.result b/_meta/tests/zones18/loggedIn.html.result index 8dbfe031..d2a4c2b5 100644 --- a/_meta/tests/zones18/loggedIn.html.result +++ b/_meta/tests/zones18/loggedIn.html.result @@ -1,3 +1,4 @@ book := {} delete-current-books() := () bookListUrl := "APS_ZONES?fn=MyLoans&Lang=GER&Parent=Obj_201391375532601%3FStyle%3DPortal2%26SubStyle%3D%26Lang%3DGER%26ResponseEncoding%3Dutf-8" +bulkRenew := "APS_ZONES?fn=RenewMyLoans&Lang=GER&Parent=Obj_201391375532601%3FStyle%3DPortal2%26SubStyle%3D%26Lang%3DGER%26ResponseEncoding%3Dutf-8" diff --git a/data/libraries/templates/zones18/loggedIn b/data/libraries/templates/zones18/loggedIn index e36ece5f..f298150e 100644 --- a/data/libraries/templates/zones18/loggedIn +++ b/data/libraries/templates/zones18/loggedIn @@ -8,6 +8,7 @@ {bookListUrl := @href}? + {bulkRenew := @href}? {ordersListUrl := @href}? diff --git a/data/libraries/templates/zones18/template b/data/libraries/templates/zones18/template index 16af5995..8507c9e5 100644 --- a/data/libraries/templates/zones18/template +++ b/data/libraries/templates/zones18/template @@ -14,7 +14,8 @@ (: accountUrl := x"{$baseurl}/APS_ACCOUNT?Style={$style}&SubStyle=&Theme=&Lang=GER&ResponseEncoding=utf-8&Parent=APS_OPAC&BrowseAsHloc=11" :) (: accountUrl := x"{$baseurl}/APS_ZONES?fn=MyLoans&Lang=GER" :) - + ordersListUrl := (), bookListUrl := (), bulkRenew := () +s + @@ -167,6 +167,13 @@ s + requestId := 1 + + + requestId := $requestId + 1 + + + renewConfirm := form-combine($baseForm, $options) @@ -181,7 +188,7 @@ s $i := $i + 1 - + From 19372caeed0ddddb2a666eaa31ecaddd687e40dc Mon Sep 17 00:00:00 2001 From: benibela Date: Sun, 15 Oct 2023 19:39:34 +0200 Subject: [PATCH 008/114] sisis for Stb Bremen --- data/libraries/templates/sisis/loggedIn | 96 ++++++++++-- data/libraries/templates/sisis/searchList | 30 ++++ data/libraries/templates/sisis/searchSingle | 8 +- .../templates/sisis/searchSingleExemplar | 143 +++++++++++------- 4 files changed, 202 insertions(+), 75 deletions(-) diff --git a/data/libraries/templates/sisis/loggedIn b/data/libraries/templates/sisis/loggedIn index 9b15fbd9..8111068b 100644 --- a/data/libraries/templates/sisis/loggedIn +++ b/data/libraries/templates/sisis/loggedIn @@ -12,7 +12,7 @@ touchpoint := get('touchpoint', false())
-
+ { let $account-links := .//a[contains(@href, "methodToCall=showAccount") and extract(.., "[0-9]+")[. > "0"]] return ( @@ -34,15 +34,24 @@ touchpoint := get('touchpoint', false())
-
- -

Ausleihen|Loans - mode := 1 -

-

Bestellungen|Requestsmode := 2

-

Vormerkungen|Reservationsmode := 3

- -
+ +
+ +

Ausleihen|Loans + mode := 1 +

+

Bestellungen|Requestsmode := 2

+

Vormerkungen|Reservationsmode := 3

+ +
+ +

Ausleihen|Loans + mode := 1 +

+

Bestellungen|Requestsmode := 2

+

Vormerkungen|Reservationsmode := 3

+ +
@@ -59,7 +68,7 @@ touchpoint := get('touchpoint', false()) - +
@@ -131,6 +140,11 @@ touchpoint := get('touchpoint', false())
+ + + + +
@@ -166,8 +180,66 @@ touchpoint := get('touchpoint', false())
*
+ + + + +
+
+
+
+
Ti
+
Le
+
+
+ {book := $default-book, + let $selectionInputs := td[1]//input + where $selectionInputs + let $sel := $selectionInputs[starts-with(@name, "selectedMediaListentries")] + where empty($sel/@disabled) + let $id := $selectionInputs[starts-with(@name, "mediaNrEntries") ] + return $book.actionID := $id/@value} +
+
?
+
+ + {$book.title} + + {$book.author} + + + {$book.status} + +
+ +
{ + let $dates := extract(., '((\d{2}\.\d{2}\.\d{4}) *-)? *(\d{2}\.\d{2}\.\d{4})', (1,3)) + return ( + if ($dates[1]) then book.issuedate:=parse-date($dates[1], 'dd.mm.yyyy') else (), + if ($dates[2]) then book.duedate:=parse-date($dates[2], 'dd.mm.yyyy') else vl:raise("DATUM KANN NICHT GELESEN WERDEN: " || .) + ) + }
+
+ +
+ + + +
Ausgewähltes Unterkonto enthält keine Daten|Selected sub-account does not contain any data
+ + + + + + + + + + + + + @@ -191,7 +263,7 @@ touchpoint := get('touchpoint', false()) } ?
- + diff --git a/data/libraries/templates/sisis/searchList b/data/libraries/templates/sisis/searchList index 6c2e6fb8..1e8a7bfa 100644 --- a/data/libraries/templates/sisis/searchList +++ b/data/libraries/templates/sisis/searchList @@ -115,6 +115,36 @@ +
+
+
+

{extract(., "[0-9]+")[.] ! (search-result-count := .)}

+ + +
+
+ {book := {"orderable": false()}} +

+ {$book.title} + {$book._detail-url := resolve-html() } + {let $text := following-sibling::text()!normalize-space()[.] + let $text := if ($text[1] => matches("[0-9]+")) then ("", $text) else $text + return ( + $book.author := $text[1], + $book.year := $text[2], + $book.libraryLocation := $text[3] + ) + } +

+
{$book.isbn}
? +
+ +
+
+
+
+ {search-result-count:=0}
diff --git a/data/libraries/templates/sisis/searchSingle b/data/libraries/templates/sisis/searchSingle index 3a2cbfb8..b75e0a31 100644 --- a/data/libraries/templates/sisis/searchSingle +++ b/data/libraries/templates/sisis/searchSingle @@ -30,12 +30,11 @@ } - - -
+ ^Titelzusatz$book.title:= concat($book.title, " ", (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1]) ^(Titel|Title)$book.title:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] - ^Autor|^Verfasser$book.author:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] + ^Autor|^Verfasser|Person$book.author:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] ^Ort$book.location:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] ^Verlag$book.publisher:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] ^Jahr$book.year:= (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1] @@ -43,8 +42,7 @@

{$book.title}

{$book(. || "!") := (./following-sibling::*[1] | ./following-sibling::text())[normalize-space(.)][1]/(if (exists(@href) and contains(@href, '://')) then x'{.} ( {@href} )' else .)} -
+ \ No newline at end of file diff --git a/data/libraries/templates/sisis/searchSingleExemplar b/data/libraries/templates/sisis/searchSingleExemplar index a5e7442e..3056cea0 100644 --- a/data/libraries/templates/sisis/searchSingleExemplar +++ b/data/libraries/templates/sisis/searchSingleExemplar @@ -2,67 +2,94 @@
{needOrders := not($book.orderable)} - - - - ? - ? - ? - ? - ? - ? - ? - ? - ? - ? - ? - ? - ? - ? - - {$holding := {}} - - - - - - - - - - - - - - - - - + +
Signatur
Regalstandort		Signatur
Status		Mediennummer
Standort		Zweigstelle
Mediennummer		Standort
Zweigstelle		Status
Mediennummer		Bibliothek
Standort		SignaturStandortMediennummerStrichcodeStatusZweigstelleQR-Code* - -
{$holding.id:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.id:=matched-text()}
{$holding.status:=matched-text()}		{$holding.barcode:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.libraryBranch:=matched-text()}
{$holding.barcode:=matched-text()}		{$holding.libraryLocation:=matched-text()}
{$holding.libraryBranch:=matched-text()}		{$holding.status:=matched-text()}
{$holding.barcode:=matched-text()}		{$holding.libraryBranch:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.id}{$holding.libraryLocation := inner-text()}{$holding.barcode}{$holding.barcode}{$holding.status}{$holding.libraryBranch := inner-text()}
+ + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + {$holding := {}} + + + + + + + + + + + + + + + + + + + + {let $links := .//a[contains(@href, 'availability.do') and contains(@href, 'katkey')] + where exists($links) + return ( + for $l at $i in $links return ( + $book("_orderTitle"||$i) := $l, + $book("_order"||$i) := resolve-html($l) + ), + $book.orderable := true(), + $book._orderCount := count($links) + ) + } + {for $key in ("libraryBranch", "libraryLocation") return + if (matches($holding($key), "Wegweise|Lageplan|Was heißt das")) then + $holding($key) := replace($holding($key), "\s*(Wegweiser|Lageplan|-? *Was heißt das.*)", "") + else (), + $book.holdings[] := $holding} + * + +
Signatur
Regalstandort		Signatur
Status		Mediennummer
Standort		Zweigstelle
Mediennummer		Standort
Zweigstelle		Status
Mediennummer		Bibliothek
Standort		SignaturStandortMediennummerStrichcodeStatusZweigstelleQR-Code* + +
{$holding.id:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.id:=matched-text()}
{$holding.status:=matched-text()}		{$holding.barcode:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.libraryBranch:=matched-text()}
{$holding.barcode:=matched-text()}		{$holding.libraryLocation:=matched-text()}
{$holding.libraryBranch:=matched-text()}		{$holding.status:=matched-text()}
{$holding.barcode:=matched-text()}		{$holding.libraryBranch:=matched-text()}
{$holding.libraryLocation:=matched-text()}		{$holding.id}{$holding.libraryLocation := inner-text()}{$holding.barcode}{$holding.barcode}{$holding.status}{$holding.libraryBranch := inner-text()}
+ +
+
+ +
Mediennummer
+
Signatur
+
Zweigstelle
+
Status
+
* + +
+
{$holding := {}} + +
{$holding.barcode}
+
{$holding.libraryLocation}
+
{$holding.libraryBranch}
+
{$holding.status}
+
+ + {$book.holdings[] := $holding} +
+
+ + - - {let $links := .//a[contains(@href, 'availability.do') and contains(@href, 'katkey')] - where exists($links) - return ( - for $l at $i in $links return ( - $book("_orderTitle"||$i) := $l, - $book("_order"||$i) := resolve-html($l) - ), - $book.orderable := true(), - $book._orderCount := count($links) - ) - } - {for $key in ("libraryBranch", "libraryLocation") return - if (matches($holding($key), "Wegweise|Lageplan|Was heißt das")) then - $holding($key) := replace($holding($key), "\s*(Wegweiser|Lageplan|-? *Was heißt das.*)", "") - else (), - $book.holdings[] := $holding} - * - -
? +

{local:raise(.)}

+

{local:raise(.)}

+

{local:raise(.)}

From ce07e13288c63f72fc8e832f3bdf2cd04e763f05 Mon Sep 17 00:00:00 2001 From: benibela Date: Thu, 26 Oct 2023 19:26:55 +0200 Subject: [PATCH 020/114] VideLibri 2.76 --- _meta/installer/videlibri.iss | 4 ++-- _meta/sfsite/downloadTable.html | 20 +++++++++---------- _meta/version/changelog.xml | 13 +++++++++++- _meta/version/version.xml | 2 +- android/android/AndroidManifest.xml | 4 ++-- applicationconfig.pas | 2 +- .../metadata/android/de/changelogs/2760.txt | 6 ++++++ .../android/en-US/changelogs/2760.txt | 6 ++++++ 8 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 fastlane/metadata/android/de/changelogs/2760.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/2760.txt diff --git a/_meta/installer/videlibri.iss b/_meta/installer/videlibri.iss index 8ef7cd03..ffa6826c 100644 --- a/_meta/installer/videlibri.iss +++ b/_meta/installer/videlibri.iss @@ -1,8 +1,8 @@  [Setup] ;Change this in every version -AppVerName=VideLibri 2.752 -AppVersion=2.752 +AppVerName=VideLibri 2.760 +AppVersion=2.760 ;Don't change ;Unicode-Check: ääääääööööüüüüüü diff --git a/_meta/sfsite/downloadTable.html b/_meta/sfsite/downloadTable.html index 0522263d..41a2bc9b 100644 --- a/_meta/sfsite/downloadTable.html +++ b/_meta/sfsite/downloadTable.html @@ -1,22 +1,22 @@ diff --git a/_meta/version/changelog.xml b/_meta/version/changelog.xml index 5efe711e..bfee2e3b 100644 --- a/_meta/version/changelog.xml +++ b/_meta/version/changelog.xml @@ -1,10 +1,21 @@ - + + Unterstützt Unicode Version 15. + Aktualisiere FLRE (für reguläre Ausdrücke) von Version 21316f2dd2 zu 643bac + Als Android 13 kompatibel markiert (ohne Änderungen dazu) + Stadtbibliothek Hannover: Anpassung an geänderten Verlängerungslink. + Stadtbibliothek Köln: repariere verlängerbar-Status-Anzeige. + Stadtbibliothek Bremen: Anpassung an neues System + Anpassung an neue Katalogadressen der Stadtbücherei Lauda-Königshofen, GemeindeBücherei Laudenbach, Universitäts- und Landesbibliothek Bonn, Mediothek Boxberg, Universitätsbibliothek Clausthal, Unibibliothek RUB Bochum, und Stadtbibliothek Solingen + Anpassung an geänderte Loginseite von primo verwendenden Unibibs (z.B.: Bibliothek der DHBW Mannheim) + Stadtbücherei Landshut + + windows: deaktive DOS-Fenster. keine "no html tree"-Fehlermeldungen mehr diff --git a/_meta/version/version.xml b/_meta/version/version.xml index 53c8607a..dc09be35 100644 --- a/_meta/version/version.xml +++ b/_meta/version/version.xml @@ -1,4 +1,4 @@ - + diff --git a/android/android/AndroidManifest.xml b/android/android/AndroidManifest.xml index 52808c7f..bb7d9603 100644 --- a/android/android/AndroidManifest.xml +++ b/android/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="2760" + android:versionName="2.760"> diff --git a/applicationconfig.pas b/applicationconfig.pas index ca148ce3..2acb556d 100755 --- a/applicationconfig.pas +++ b/applicationconfig.pas @@ -72,7 +72,7 @@ type TStringAsMemoryStream = class(TMemoryStream) nextLimitStr: string; appFullTitle:string='VideLibri'; - versionNumber:integer=2752; + versionNumber:integer=2760; versionBuildId: string = 'unknown'; //=>versionNumber/1000 newVersionInstalled: boolean=false; diff --git a/fastlane/metadata/android/de/changelogs/2760.txt b/fastlane/metadata/android/de/changelogs/2760.txt new file mode 100644 index 00000000..efdd92a4 --- /dev/null +++ b/fastlane/metadata/android/de/changelogs/2760.txt @@ -0,0 +1,6 @@ +* Neue Unicode Version 15 und FLRE-Version. +* Als Android 13 kompatibel markiert (ohne Änderungen dazu) +* Stadtbibliothek Hannover, Köln: Anpassung für Verlängerungen. +* Stadtbibliothek Bremen: Anpassung an neues System +* Anpassung an neue URLs der Stadtbücherei Lauda-Königshofen, GemeindeBücherei Laudenbach, Universitäts- und Landesbibliothek Bonn, Mediothek Boxberg, Universitätsbibliothek Clausthal, Unibibliothek RUB Bochum, und Stadtbibliothek Solingen +* Stadtbücherei Landshut diff --git a/fastlane/metadata/android/en-US/changelogs/2760.txt b/fastlane/metadata/android/en-US/changelogs/2760.txt new file mode 100644 index 00000000..33a9b86c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/2760.txt @@ -0,0 +1,6 @@ +* Update to Unicode Version 15 and FLRE-Version. +* Target SDK Android 13 (no actual change) +* Public libraries Hannover, Köln: Anpassung für Verlängerungen. +* Public libraries Bremen: Anpassung an neues System +* Update URLs of public libraries Lauda-Königshofen, Laudenbach, Mediothek Boxberg, Solingen; university libraries Bonn, Clausthal and RUB Bochum +* add Stadtbücherei Landshut From 677cb6923a6bedb51e5934c96e5da0e07b505887 Mon Sep 17 00:00:00 2001 From: convert-repo Date: Fri, 27 Oct 2023 12:08:14 +0000 Subject: [PATCH 021/114] update tags --- .hgtags | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.hgtags b/.hgtags index ffac9afd..20a49a59 100644 --- a/.hgtags +++ b/.hgtags @@ -33,6 +33,7 @@ 49cc0a11f03a800e2bb0069deccb42a7d4cc59a4 VIDELIBRI 2.070 4a755a5004d86d2afaa4b5de5e9a37cc357602a4 VIDELIBRI 1.805 4d6e08177aa174985324bcf0d6f62c4728e145e3 VIDELIBRI 1.870 +4f0aa984421f8e351749c9f98cdca6471922aaf3 VIDELIBRI 2.752 4fc506fa093f9949922e69870ac0ee7aa77ee187 VideLibri 2.610 528c0df8c06b27ece9cd427cadc000338b4757b5 VIDELIBRI 1.5 587290970bf844c2686db8b31d0c529cb8c5856e VIDELIBRI 2.185 @@ -50,6 +51,7 @@ 7440b0864e61b28bcb5fc4743a9428b54c948795 VIDELIBRI 2.046 744df7979e98b8eda56d9aa8476fe63dbf7b5542 VIDELIBRI 1.930 7466d9a46908a70cf33c4d23a141f5685809cb44 VIDELIBRI 2.590 +74c7b31a15dc42eeeb235ecd6689c63f03539f6d VIDELIBRI 2.750 761913108a40d613198023d4aa4a177b30c016c0 VIDELIBRI 1.67 770dd12a2d0456f4fc2686739791f9ea4cfde3fe VIDELIBRI 2.630 77d3f1c0b3820482cfe829b62a0f716764c7edba VIDELIBRI 2.194 @@ -70,6 +72,7 @@ a17f8ba73c8d9a29d7c4ad892ae07efd56ba5fdf VIDELIBRI 2.040 a56e024adf7de1c32642668b815aa7aee05870d4 VIDELIBRI 1.950 a64b720bdbc48c4f16c6554019ff3b5c982bfe6b VIDELIBRI 1.620 +a681e253d19d246969ce69050008a02ad30e225b VIDELIBRI 2.710 b15833dca2cd7e541f903dac5970f1a829cf0204 VIDELIBRI 2.650 b52778efe1717dd8549f40fca9627132fb2d7034 VIDELIBRI 2.100 b83cbbdac661ee53aa76218080d29f7ae5ff08cb VIDELIBRI 1.985 @@ -81,6 +84,7 @@ c14865258f4ecf51c345b23138f13dbd6f208941 VIDELIBRI 2.050 c196df88df0eee3d418b66f1e16f58a4f2bddbc2 VIDELIBRI 1.998 c6145a3fe3f224ae00a519c4bf425b7cffe021aa VIDELIBRI 2.600 cbb51fc605dff113170acb7c4961460b57fa146a VIDELIBRI 2.172 +d6b0846e9cda3051ac059e5f7427c8b5562c4a9d VIDELIBRI 2.760 d8ce4f79e52794374087209a18991f7919e73825 VIDELIBRI 2.064 dae30241cf0d11e886ff1392c4dc15984148fa85 VIDELIBRI 1.820 dba7d54ac2e1547a91a947ec706df451a916f3c4 VIDELIBRI 1.6 @@ -90,6 +94,7 @@ dedb800dd0dd821088844cfb536d0f2ea91b0e6f VIDELIBRI1.402 df8117b2d5f5ba39b54f105fa39b93236f21416b VIDELIBRI 1.51 e4755bb717671d65118a2e214da2d17a9b92449f VIDELIBRI 2.192 e4cd43e0203c9f96cce01de0332026a6c28f5cc2 VIDELIBRI 1.690 +e7990666f5c27ccd27e8cb6a09f108ac3f873f43 VIDELIBRI 2.700 eb4bef2bc6af3959ea9e52827730d72f891181be VIDELIBRI 2.120 ebfc0e0470ae132ff6bfe4e4cb288d02a585fee1 VIDELIBRI 1.845 ed06fb9af3f63b5083013994082ffa5ce281c6a7 VIDELIBRI 1.987 From 2a8bed008a0c0b58b14265a085cc114b3d32f77e Mon Sep 17 00:00:00 2001 From: benibela Date: Mon, 6 Nov 2023 18:20:55 +0100 Subject: [PATCH 022/114] fix warnings --- .../android/src/de/benibela/videlibri/activities/Options.kt | 2 +- .../de/benibela/videlibri/jni/CommonInterfaceExtensions.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/android/src/de/benibela/videlibri/activities/Options.kt b/android/android/src/de/benibela/videlibri/activities/Options.kt index 2e65f6de..3edaadb5 100644 --- a/android/android/src/de/benibela/videlibri/activities/Options.kt +++ b/android/android/src/de/benibela/videlibri/activities/Options.kt @@ -260,7 +260,7 @@ class Options : VideLibriBaseActivity() { title(R.string.lay_options_btn_newcertificate) onClick { val defaultServer: String? = VideLibriApp.errors.asSequence().map { e -> - if (e.kind == PendingExceptionKind.Internet && e.error.contains("https://") == true) { + if (e.kind == PendingExceptionKind.Internet && e.error.contains("https://")) { val matcher = Pattern.compile("https://([^/]+)").matcher(e.error) if (matcher.find()) matcher.group(1) else null } else null diff --git a/android/android/src/de/benibela/videlibri/jni/CommonInterfaceExtensions.kt b/android/android/src/de/benibela/videlibri/jni/CommonInterfaceExtensions.kt index 98cbe7cd..b0edd2f5 100644 --- a/android/android/src/de/benibela/videlibri/jni/CommonInterfaceExtensions.kt +++ b/android/android/src/de/benibela/videlibri/jni/CommonInterfaceExtensions.kt @@ -24,21 +24,25 @@ val LibraryDetails.accountMightWork get() = testingAccount <= 1 +@Suppress("unused") open class InternalError : RuntimeException { constructor(msg: String? = null, cause: Throwable? = null) : super(msg, cause) constructor(cause: Throwable? = null) : super(null, cause) } +@Suppress("unused") open class InternalErrorJNI : InternalError { constructor(msg: String? = null, cause: Throwable? = null) : super(msg, cause) constructor(cause: Throwable? = null) : super(null, cause) } +@Suppress("unused") open class InternalErrorFile : InternalError { constructor(msg: String? = null, cause: Throwable? = null) : super(msg, cause) constructor(cause: Throwable? = null) : super(null, cause) } +@Suppress("unused") open class InternalErrorExternal : InternalError { constructor(msg: String? = null, cause: Throwable? = null) : super(msg, cause) constructor(cause: Throwable? = null) : super(null, cause) From 87ef65f0e273815d0c0ee095abfcba804ec136a3 Mon Sep 17 00:00:00 2001 From: benibela Date: Tue, 7 Nov 2023 19:39:23 +0100 Subject: [PATCH 023/114] fix xml warnings --- data/libraries/DE_Baden-W+uerttemberg_Neckargem+uend_SRH.xml | 2 +- .../libraries/DE_Baden-W+uerttemberg_Schw+aebisch++Hall_Stb.xml | 2 +- data/libraries/DE_Bayern_Passau_Ub.xml | 2 +- data/libraries/DE_Hessen_Erbach_Stb.xml | 2 +- data/libraries/DE_Hessen_Pfungstadt_Stb.xml | 2 +- data/libraries/DE_Nordrhein-Westfalen_Troisdorf_Stb.xml | 2 +- data/libraries/DE_Nordrhein-Westfalen_Witten_Stb.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/libraries/DE_Baden-W+uerttemberg_Neckargem+uend_SRH.xml b/data/libraries/DE_Baden-W+uerttemberg_Neckargem+uend_SRH.xml index 3eaf9f6c..08c2ecd1 100644 --- a/data/libraries/DE_Baden-W+uerttemberg_Neckargem+uend_SRH.xml +++ b/data/libraries/DE_Baden-W+uerttemberg_Neckargem+uend_SRH.xml @@ -5,7 +5,7 @@