Release v2.1.2

src/main/java/tla/web/model/Sentence.java

@@ -134,7 +134,7 @@ private static List<DatePair> extractDatierung(Text text) {
             //System.out.println("Extracted "+text.getPassport().extractProperty("date.date.date").get(0).getContents());
         } catch (Exception e) {
            // log.debug("could not extract date from text {}", text.getId());
-           System.out.println("could not extract bibliography from text "+  text.getId());
+           // System.out.println("could not extract date from text "+  text.getId());
         }
         return datierung;
     }

src/main/java/tla/web/model/Text.java

@@ -177,7 +177,7 @@ private static ObjectReference extractObjectReference(Text text, String searchSt
            Passport pass= text.getPassport().extractProperty(searchString).get(0);
             objectReference = pass.extractObjectReferences().get(0);        
         } catch (Exception e) {
-          System.out.println("could not extract language from text {} "+text.getId());
+          // System.out.println("could not extract language from text {} "+text.getId());
         }
         return objectReference;
     }
@@ -192,7 +192,7 @@ private static List<String> extractNamesOfArray(Text text, String searchField) {
                 	values.add(pass.get(i).extractObjectReferences().get(0).getName());
                 }           
             } catch (Exception e) {
-              System.out.println("could not extract" + searchField + "from text {} "+text.getId());
+              // System.out.println("could not extract" + searchField + "from text {} "+text.getId());
             }
             return values;
         }
@@ -205,7 +205,7 @@ private static String extractString(Text text, String searchField, Integer numbe
         		List<Passport> pass = text.getPassport().extractProperty(searchField);
         		value = pass.get(number).toString();
         	}catch (Exception e) {
-                System.out.println("could not extract " + searchField + " from text {} "+text.getId());
+                // System.out.println("could not extract " + searchField + " from text {} "+text.getId());
         	}
         	return value;
         }
@@ -228,7 +228,7 @@ private static String extractIsOrigPlace(Text text) {
             		if (isOrigPl.equals("true")) isOrigPl="original";
             		else isOrigPl=null;       
         } catch (Exception e) {
-          System.out.println("could not extract is orig place from text {} "+text.getId());isOrigPl=null;
+          // System.out.println("could not extract is orig place from text {} "+text.getId());isOrigPl=null;
         }
         return isOrigPl;
     }
@@ -243,7 +243,7 @@ private static List<String> extractOrigplace(Text text) {
 
 
         } catch (Exception e) {
-          System.out.println("could not extract original place from text {} "+text.getId());
+          // System.out.println("could not extract original place from text {} "+text.getId());
         }
         return origplace;
     }
@@ -258,7 +258,7 @@ private static List<String> extractPresloc(Text text) {
 
 
         } catch (Exception e) {
-          System.out.println("could not extract present place from text {} "+text.getId());
+          // System.out.println("could not extract present place from text {} "+text.getId());
         }
         return presloc;
     }
@@ -278,7 +278,7 @@ private static List<String> extractDate(Text text) {
 
         } catch (Exception e) {
            // log.debug("could not extract date from text {}", text.getId());
-           System.out.println("could not extract date from text "+  text.getId());
+           // System.out.println("could not extract date from text "+  text.getId());
         }
         return datierung;
     }

src/main/java/tla/web/model/ThsEntry.java

@@ -66,7 +66,7 @@ private static List<String> extractDescription(ThsEntry thsEntry) {
                 )
             );
         } catch (Exception e) {
-          System.out.println("INFO: Could not extract description from thesaurus entry "+thsEntry.getId());
+          // System.out.println("INFO: Could not extract description from thesaurus entry "+thsEntry.getId());
         }
         return description;
     }
@@ -102,7 +102,7 @@ private static List<String> extractFileComment(ThsEntry thsEntry) {
                 )
             );
         } catch (Exception e) {
-          System.out.println("INFO: Could not extract file comment from thesaurus entry "+thsEntry.getId());
+          // System.out.println("INFO: Could not extract file comment from thesaurus entry "+thsEntry.getId());
         }
         return fileComment;
     }

src/main/resources/application.yml

@@ -29,8 +29,7 @@ tla:
         aegyptiaca:
             default-format: https://aegyptiaca.uni-muenster.de/Record/{id}
         bm:
-            type-formats:
-                object: https://www.britishmuseum.org/collection/object/{id}
+            default-format: https://www.britishmuseum.org/collection/object/{id}
         dwl:
             default-format: https://www.dwl.aegyptologie.lmu.de/suche.php?nummer={id}
         dza:
@@ -82,7 +81,7 @@ tla:
         dpdp:
             type-formats:
                 lemmata: http://129.206.5.162/beta/palaeography/palaeography.html?q=tla:{id}
-                papyri: http://129.206.5.162/beta/palaeography/database/papyri/{id}.html
+                papyri: http://129.206.5.162/beta/palaeography/database/papyri/{id}
         pleiades:
             default-format: https://pleiades.stoa.org/places/{id}
             id-pattern: ^[1-9][0-9]*$
@@ -92,6 +91,10 @@ tla:
             default-format: https://collections.louvre.fr/en/ark:/53355/{id}
         pnm:
             default-format: https://pnm.uni-mainz.de/name/{id}
+        vega:
+            default-format: https://app.vega-lexique.fr/?entries=w{id}
+        smb:
+            default-format: https://id.smb.museum/object/{id}
 
 search:
     config:

src/main/resources/i18n/messages_de.properties

@@ -3,21 +3,21 @@ date_not_edited=kein Datum eingegeben
 
 tla_Title=Thesaurus Linguae Aegyptiae
 tla_Editor=Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig
-tla_version=2.1.1
-tla_ReleaseDate=3.11.2023
-
-tla_corpusversion=17
-tla_corpusdate=25.10.2022
-lemma-entries-types-hiero-en=54,681
-lemma-entries-types-dem-en=15,253
-lemma-tokens-hiero-en=1,115 thous.
-lemma-tokens-dem-en=326 thous.
-corpus-lemma-tokens-amount-en=1.44 mill.
-lemma-entries-types-hiero-de=54.681
-lemma-entries-types-dem-de=15.253
-lemma-tokens-hiero-de=1.115 Tsd.
-lemma-tokens-dem-de=326 Tsd.
-corpus-lemma-tokens-amount-de=1,44 Mill.
+tla_version=2.1.2
+tla_ReleaseDate=24.11.2023
+
+tla_corpusversion=18
+tla_corpusdate=24.11.2023
+lemma-entries-types-hiero-en=55,333
+lemma-entries-types-dem-en=15,321
+lemma-tokens-hiero-en=1,159 thous.
+lemma-tokens-dem-en=328 thous.
+corpus-lemma-tokens-amount-en=1.49 mill.
+lemma-entries-types-hiero-de=55.333
+lemma-entries-types-dem-de=15.321
+lemma-tokens-hiero-de=1.159 Tsd.
+lemma-tokens-dem-de=328 Tsd.
+corpus-lemma-tokens-amount-de=1,49 Mill.
 
 error_404=Objekt nicht gefunden oder nicht geliefert (Server-Timeout)
 error_500=Serverfehler
@@ -27,7 +27,7 @@ msg_loading_sentences=Lade Sätze...
 msg_loading_sentences_browser=Wir arbeiten daran, die Performance dieser Seite zu verbessern.
 msg_more_metadata=Wenige weitere Metadaten in einer zukünftigen Version der TLA-Web-Applikation.
 msg_hieroglyph_search=Eine <strong>Hieroglyphensuche</strong> wird in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
-msg_collocation_search=Eine Kollokationssuche <strong>mit definiertem Lemma-Abstand</strong> wird in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
+msg_collocation_search=Es können aktuell nur zwei <strong><em>verschiedene</em> Lemmata</strong> gesucht werden. <br/>Eine Kollokationssuche >mit definiertem Lemma-Abstand wird in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden. <br/>Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
 msg_occurences_sorting=Möglichkeiten die Ergebnisliste zu <strong>sortieren</strong> werden in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden.
 msg_sentences_page=Eine Seite mit der <strong>Sequenz von Sätzen</strong> des Textes wird aktuell für eine nächste Version der TLA-Web-Applikation programmiert. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
 msg_pid_variant_warning=<em class="text-warning">Achtung:</em> Aus technischen Gründen können für Satzlesungsvarianten keine individuellen permanenten IDs gearantiert werden. Die Zitation erfolgt daher nur über die Basis-Satz-ID inkl. aller Varianten.
@@ -90,10 +90,11 @@ menu_global_help=Hilfe
 
 editorial_title_home=
 editorial_title_contact=Kontakt
+editorial_title_listings_thesauri=Thesauri
 editorial_title_listings_bts-glossings=BTS Glossierung
 editorial_title_listings_ling-glossings=Linguistische Glossierung
 editorial_title_listings_digital-references=Digitale Verweise
-editorial_title_listings_bibliography=Abgekürzte Literatur
+editorial_title_listings_bibliography=Abgekürzte (selbständige) Literatur
 editorial_title_info_collaboration=Kooperation
 editorial_title_info_lemma-lists=Lemma-Listen
 editorial_title_info_introduction=Einführung
@@ -266,6 +267,7 @@ dict_hieratic=Hieroglyphisch/Hieratisch
 
 review_state_published=Verifiziert
 review_state_published-inactive=Inaktiv
+review_state_published-obsolete=Obsolet
 review_state_published-awaiting-verification=Verifizierung steht aus
 artificially_aligned=Hieroglyphen künstlich angeordnet
 
@@ -422,6 +424,9 @@ external_reference_provider_wikidata=Wikidata
 external_reference_provider_zdb=Zeitschriftendatenbank
 external_reference_provider_dpdp=Demotic Palaeographical Database Project
 external_reference_provider_pleiades=Pleiades
+external_reference_provider_cachette_de_karnak=Cachette de Karnak
+external_reference_provider_louvre=Louvre
+external_reference_provider_pnm=Persons and Names of the Middle Kingdom
 
 lang_label_de=Deutsch
 lang_label_en=English
@@ -582,13 +587,16 @@ button_label_hide_property_switchannotation-wordtokenid=Satzelement-ID
 button_label_hide_property_translation=Übersetzung
 button_label_hide_property_dating=Datierung
 button_label_hide_property_texteditor=Text-Editor:innen
+
+button_label_hideTextsentences_property_hieroglyphs=Hieroglyphen
 button_label_hideTextsentences_property_switchannotation=Wechsel Annotations-/Block-Ansicht
 button_label_hideTextsentences_property_switchannotation-wordclass=Lemma-Wortklasse
 button_label_hideTextsentences_property_switchannotation-tlaglossing=Gram. Annotation BTS
 button_label_hideTextsentences_property_switchannotation-linguisticglossing= Ling. Glossierung
 button_label_hideTextsentences_property_switchannotation-tokentranslation=Lemma-Übersetzung
 button_label_hideTextsentences_property_switchannotation-wordtokenid=Satzelement-ID
 button_label_hideTextsentences_property_translation=Übersetzung
+
 sentence_main_editor=Autor:innen
 sentence_contributors=unter Mitarbeit von
 sentence_created=Textdatensatz erstellt
@@ -612,7 +620,7 @@ result_page_description_middle=von
 result_page_description_right_lemma=Lemma-Listen-Eintrag
 result_page_description_right_lemmas=Lemma-Listen-Einträgen
 result_page_description_right_sentence=Satz mit Beleg(en)
-result_page_description_right_sentences=Sätzen mit Belegen
+result_page_description_right_sentences=Sätzen mit Belegen (inkl. Lesevarianten)
 result_page_no_results=Keine Ergebnisse.
 result_page_facets=Ergebnisse filtern
 

src/main/resources/i18n/messages_en.properties

@@ -3,21 +3,21 @@ date_not_edited=no date edited
 
 tla_Title=Thesaurus Linguae Aegyptiae
 tla_Editor=Tonio Sebastian Richter & Daniel A. Werning on behalf of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils on behalf of the Sächsische Akademie der Wissenschaften zu Leipzig
-tla_version=2.1.1
-tla_ReleaseDate=11/3/2023
-
-tla_corpusversion=17
-tla_corpusdate=10/25/2022
-lemma-entries-types-hiero-en=54,681
-lemma-entries-types-dem-en=15,253
-lemma-tokens-hiero-en=1,115 thous.
-lemma-tokens-dem-en=326 thous.
-corpus-lemma-tokens-amount-en=1.44 mill.
-lemma-entries-types-hiero-de=54.681
-lemma-entries-types-dem-de=15.253
-lemma-tokens-hiero-de=1.115 Tsd.
-lemma-tokens-dem-de=326 Tsd.
-corpus-lemma-tokens-amount-de=1,44 Mill.
+tla_version=2.1.2
+tla_ReleaseDate=11/24/2023
+
+tla_corpusversion=18
+tla_corpusdate=11/24/2023
+lemma-entries-types-hiero-en=55,333
+lemma-entries-types-dem-en=15,321
+lemma-tokens-hiero-en=1,159 thous.
+lemma-tokens-dem-en=328 thous.
+corpus-lemma-tokens-amount-en=1.49 mill.
+lemma-entries-types-hiero-de=55.333
+lemma-entries-types-dem-de=15.321
+lemma-tokens-hiero-de=1.159 Tsd.
+lemma-tokens-dem-de=328 Tsd.
+corpus-lemma-tokens-amount-de=1,49 Mill.
 
 error_404=Object not found or not delivered (server timeout)
 error_500=Server error
@@ -27,7 +27,7 @@ msg_loading_sentences=Loading sentences...
 msg_loading_sentences_browser=We are struggling to improve the performance of this page.
 msg_more_metadata=Few more metadata in a future version of the TLA web app.
 msg_hieroglyph_search=<strong>Hieroglyph search</strong> yet to be implemented for a future version of the TLA web app. For the development plan, see <a href="/info/tla-development">here</a>.
-msg_collocation_search=A collocation search <strong>with defined lemma distance</strong> yet to be implemented for a future version of the TLA web app. For the development plan, see <a href="/info/tla-development">here</a>.
+msg_collocation_search=Only two <strong><em>different</em> lemmata</strong> can currently be searched for. <br/>A collocation search with defined lemma distance will be implemented in a future version of the TLA web app. <br/>For the development plan, see <a href="/info/tla-development">here</a>.
 msg_occurences_sorting=Possibilities  to <strong>sort</strong> the results list will be added in a future version of the TLA web application.
 msg_sentences_page=A page that displays the <strong>sequence of sentences</strong> of the text is currently being implemented for a future release of the TLA web app. For the development plan, see <a href="/info/tla-development">here</a>.
 msg_pid_variant_warning=<em class="text-warning">Attention:</em> For technical reasons, no permanent IDs can be assigned to individual sentence reading variants. Therefore, the citation is only via the base sentence ID incl. all variants.
@@ -90,10 +90,11 @@ menu_global_help=Help
 
 editorial_title_home=
 editorial_title_contact=Contact
+editorial_title_listings_thesauri=Thesauri
 editorial_title_listings_bts-glossings=BTS Glossing
 editorial_title_listings_ling-glossings=Linguistic Glossing
 editorial_title_listings_digital-references=Digital References
-editorial_title_listings_bibliography=Abbreviated Literature
+editorial_title_listings_bibliography=Abbreviated Literature (Monographs, Independent and in Series)
 editorial_title_info_collaboration=Collaboration
 editorial_title_info_lemma-lists=Lemma Lists
 editorial_title_info_introduction=Introduction
@@ -266,6 +267,7 @@ dict_hieratic=Hieroglyphic/hieratic
 
 review_state_published=Verified
 review_state_published-inactive=Inactive
+review_state_published-obsolete=Obsolete
 review_state_published-awaiting-verification=Verification pending
 artificially_aligned=Glyphs artificially arranged
 
@@ -401,8 +403,8 @@ text_sentences_property_object_paths=Text path(s)
 object_property_object_paths=Context
 
 external_reference_provider_aaew=Legacy TLA
-external_reference_provider_aegyptiaca=Aegyptiaca
 external_reference_provider_aegaron=Ancient Egyptian Architecture Online
+external_reference_provider_aegyptiaca=Aegyptiaca
 external_reference_provider_bm=British Museum
 external_reference_provider_cfeetk=Projet Karnak
 external_reference_provider_dwl=Demotische Wortliste
@@ -422,6 +424,9 @@ external_reference_provider_wikidata=Wikidata
 external_reference_provider_zdb=Zeitschriftendatenbank
 external_reference_provider_dpdp=Demotic Palaeographical Database Project
 external_reference_provider_pleiades=Pleiades
+external_reference_provider_cachette_de_karnak=Cachette de Karnak
+external_reference_provider_louvre=Louvre
+external_reference_provider_pnm=Persons and Names of the Middle Kingdom
 
 lang_label_de=Deutsch
 lang_label_en=English
@@ -558,6 +563,7 @@ button_label_modify_search=Modify Search
 button_label_hide_property_lemma-id=Lemma ID
 button_label_hide1Lemma_property_lemma-id=Lemma ID
 button_label_hide_property_hieroglyphs=Hieroglyphs
+button_label_hideTextsentences_property_hieroglyphs=Hieroglyphs
 button_label_hide1Lemma_property_hieroglyphs=Hieroglyphs
 button_label_hide_property_wordClass=Word class
 button_label_hide1Lemma_property_wordClass=Word class
@@ -572,7 +578,6 @@ button_label_show_property_de=German
 button_label_show_property_en=English
 button_label_show_property_fr=French
 
-
 button_label_hide_property_switchannotation=Switch annotation/block view
 button_label_hide_property_switchannotation-wordclass=Lemma word class
 button_label_hide_property_switchannotation-tlaglossing=Gram. tagging BTS
@@ -591,6 +596,7 @@ button_label_hideTextsentences_property_switchannotation-linguisticglossing=Ling
 button_label_hideTextsentences_property_switchannotation-tokentranslation=Lemma translation
 button_label_hideTextsentences_property_switchannotation-wordtokenid=Sentence token ID
 button_label_hideTextsentences_property_translation=Translation
+
 sentence_main_editor=Author(s)
 sentence_contributors=with contributions by
 sentence_created=Text file created
@@ -614,7 +620,7 @@ result_page_description_middle=of
 result_page_description_right_lemma=lemma list entry
 result_page_description_right_lemmas=lemma list entries
 result_page_description_right_sentence=sentence with occurrence(s)
-result_page_description_right_sentences=sentences with occurrences
+result_page_description_right_sentences=sentences with occurrences (incl. reading variants)
 result_page_no_results=No results.
 result_page_facets=Search facets
 

src/main/resources/pages/de/home.html

@@ -12,6 +12,7 @@ <h1>Willkommen im <strong><i>Thesaurus Linguae Aegyptiae</i></strong>!</h1>
 <div class="mt-sm-2 mb-sm-3">
 	<a href="/search"><button type="button" class="btn btn-danger text-left text-decoration-none"><span class="fas fa-arrow-circle-right"></span>&nbsp;Suchen im TLA</button></a>
 </div>
+<div><em class="text-success">Neu:</em> Textkorpus-Ausgabe 18 (Nov. 2023): neue <a href="info/authors">Autor:innen</a>, neue/erweiterte <a href="info/text-corpus" target="_blank">Korpora</a>, Überblick <a href="https://nubes.bbaw.de/s/xD7MYJrmE8xNBNt">Textobjekt-Baum</a> [PDF].</div>
 </section>
 
 <section>