From 29f064946318cb201f2e06ce1e5e15cccfb5ed21 Mon Sep 17 00:00:00 2001 From: berndmoos Date: Thu, 19 Dec 2024 14:40:21 +0100 Subject: [PATCH] #218 and some other changes in passing --- src/main/java/org/zumult/io/Constants.java | 6 +- .../java/org/zumult/io/communication2HTML.xsl | 29 +++++++ src/main/java/org/zumult/io/speaker2HTML.xsl | 29 +++++++ .../zumult/webservices/ZumultDataServlet.java | 12 ++- .../resources/MessageBundle.properties | 4 +- .../resources/MessageBundle_de_DE.properties | 4 +- web/WEB-INF/jspf/metadataModal.jspf | 2 - web/WEB-INF/jspf/zuRechtContextOptions.jspf | 4 +- web/css/query.css | 7 ++ web/jsp/zuAnn.jsp | 9 +- web/jsp/zuRecht.jsp | 53 ++++++++++-- web/jsp/zuRechtKwic2Html.xsl | 86 ++++++++----------- 12 files changed, 176 insertions(+), 69 deletions(-) create mode 100644 src/main/java/org/zumult/io/communication2HTML.xsl create mode 100644 src/main/java/org/zumult/io/speaker2HTML.xsl diff --git a/src/main/java/org/zumult/io/Constants.java b/src/main/java/org/zumult/io/Constants.java index 88f44c5..3f273b6 100644 --- a/src/main/java/org/zumult/io/Constants.java +++ b/src/main/java/org/zumult/io/Constants.java @@ -63,9 +63,9 @@ public class Constants { public static String WORDLIST2HTML_STYLESHEET = "/org/zumult/io/tokenlist2html_table.xsl"; // new for #175 - public static String EVENT2HTML_STYLESHEET = "/org/zumult/io/folkEvent2html_table.xsl"; - public static String SPEECHEVENT2HTML_STYLESHEET = "/org/zumult/io/speechEvent2Table.xsl"; - public static String SPEAKER2HTML_STYLESHEET = ""; + public static String EVENT2HTML_STYLESHEET = "/org/zumult/io/communication2HTML.xsl"; + public static String SPEECHEVENT2HTML_STYLESHEET = "/org/zumult/io/communication2HTML.xsl"; + public static String SPEAKER2HTML_STYLESHEET = "/org/zumult/io/speaker2HTML.xsl"; public static String EVENT_TITLE_METADATAKEY = "v_e_se_art"; // issue #55 diff --git a/src/main/java/org/zumult/io/communication2HTML.xsl b/src/main/java/org/zumult/io/communication2HTML.xsl new file mode 100644 index 0000000..49ac4a6 --- /dev/null +++ b/src/main/java/org/zumult/io/communication2HTML.xsl @@ -0,0 +1,29 @@ + + + + + + + + + + + + +
+ + + + + + + + + + diff --git a/src/main/java/org/zumult/io/speaker2HTML.xsl b/src/main/java/org/zumult/io/speaker2HTML.xsl new file mode 100644 index 0000000..f2863da --- /dev/null +++ b/src/main/java/org/zumult/io/speaker2HTML.xsl @@ -0,0 +1,29 @@ + + + + + + + + + + + + +
+ + + + + + + + + + diff --git a/src/main/java/org/zumult/webservices/ZumultDataServlet.java b/src/main/java/org/zumult/webservices/ZumultDataServlet.java index 53a66c7..177aaf9 100644 --- a/src/main/java/org/zumult/webservices/ZumultDataServlet.java +++ b/src/main/java/org/zumult/webservices/ZumultDataServlet.java @@ -42,7 +42,6 @@ import org.zumult.objects.SpeechEvent; import org.zumult.objects.TokenList; import org.zumult.objects.Transcript; -import org.zumult.objects.implementations.COMAMedia; import org.zumult.objects.implementations.ISOTEITranscript; /** @@ -173,6 +172,11 @@ private void getSpeakerMetadataHTML(HttpServletRequest request, HttpServletRespo try { BackendInterface backend = BackendInterfaceFactory.newBackendInterface(); String speakerID = request.getParameter("speakerID"); + String transcriptID = request.getParameter("transcriptID"); + if (transcriptID!=null){ + // i.e. speakerID is a transcript sigle, not the corpus ID + speakerID = backend.getTranscript(transcriptID).getSpeakerIDBySpeakerInitials(speakerID); + } if (speakerID!=null){ Speaker speaker = backend.getSpeaker(speakerID); String speakerXML = speaker.toXML(); @@ -206,6 +210,12 @@ private void getEventMetadataHTML(HttpServletRequest request, HttpServletRespons BackendInterface backend = BackendInterfaceFactory.newBackendInterface(); // this does not really make sense : we want event metadata, so why are we passing speechEventID as parameter? String speechEventID = request.getParameter("speechEventID"); + if (speechEventID==null){ + String transcriptID = request.getParameter("transcriptID"); + if (transcriptID!=null){ + speechEventID = backend.getSpeechEvent4Transcript(transcriptID); + } + } if (speechEventID!=null){ // changed for issue #175 //Event event = backend.getEvent(eventID.substring(0,12)); diff --git a/src/main/resources/resources/MessageBundle.properties b/src/main/resources/resources/MessageBundle.properties index a974e23..13968b7 100644 --- a/src/main/resources/resources/MessageBundle.properties +++ b/src/main/resources/resources/MessageBundle.properties @@ -71,12 +71,12 @@ SearchOptions=Search Options SearchVocabularyLists=Search by lemma and query lists SelectOne=select one ShortDescription=short description -ShowEventMetadataInDGD=Show event metadata in DGD +ShowEventMetadataIn=Show event metadata ShowExcerptInDGD=Show excerpt in DGD ShowExcerptInZuMult=Show excerpt in ZuViel ShowMore=show more ShowLess=show less -ShowSpeakerMetadataInDGD=Show speaker metadata in DGD +ShowSpeakerMetadata=Show speaker metadata SortBy=Sort by SortedBy=Sorted by Tokens=tokens diff --git a/src/main/resources/resources/MessageBundle_de_DE.properties b/src/main/resources/resources/MessageBundle_de_DE.properties index 08fd33a..d4c3205 100644 --- a/src/main/resources/resources/MessageBundle_de_DE.properties +++ b/src/main/resources/resources/MessageBundle_de_DE.properties @@ -45,8 +45,8 @@ ForRelevantTopicsInGFLDidactics=f\u00fcr relevante Themen in der DaF-Didaktik SearchInputFieldPlaceholder=Ihr CQP-Suchausdruck ... HitsPerPage=Treffer pro Seite HoldCTRLToSelectAndDeselectMoreThanOne=Halten Sie die Strg-Taste gedr\u00fcckt um mehr als eine Option zu markieren -ShowSpeakerMetadataInDGD=Klicken, um Sprecherdokumentation in der DGD anzuzeigen -ShowEventMetadataInDGD=Klicken, um Ereignisdokumentation in der DGD anzuzeigen +ShowSpeakerMetadata=Sprecherdokumentation anzeigen +ShowEventMetadata=Ereignisdokumentation anzeigen ShowMore=mehr zeigen ShowLess=weniger zeigen SearchByIndividualSpeakers=Sprecher-basierte Suche diff --git a/web/WEB-INF/jspf/metadataModal.jspf b/web/WEB-INF/jspf/metadataModal.jspf index 2ccda48..babf32e 100644 --- a/web/WEB-INF/jspf/metadataModal.jspf +++ b/web/WEB-INF/jspf/metadataModal.jspf @@ -13,8 +13,6 @@
- Transkript anzeigen - Transkript in DGD
diff --git a/web/WEB-INF/jspf/zuRechtContextOptions.jspf b/web/WEB-INF/jspf/zuRechtContextOptions.jspf index 90d899c..b271cf1 100644 --- a/web/WEB-INF/jspf/zuRechtContextOptions.jspf +++ b/web/WEB-INF/jspf/zuRechtContextOptions.jspf @@ -4,13 +4,13 @@
- +
- +
diff --git a/web/css/query.css b/web/css/query.css index 17114b3..652332c 100644 --- a/web/css/query.css +++ b/web/css/query.css @@ -111,6 +111,13 @@ td.numberOfAbsAndRelHits {text-align: center; width: 100px;} th {text-align: center; background-color: #d9edf7; color: #337AB7;white-space:nowrap;} th.numbering {text-align: left;} +td.left-context{text-align: right; min-width: 250px; margin-left: 30px;} +td.hit{text-align: center;} +td.right-context{text-align: left; min-width: 250px; margin-right: 30px;} + +td.metadatakey {text-align: right; font-weight:bold;} +td.metadatavalue {text-align: left; font-weight:normal;} + /************** collapsible elements ******/ .content {display: none;} .collapsible {cursor: pointer; border: none; text-align: right; text-decoration: underline; color: blue; margin: 10px; color: #337AB7;} diff --git a/web/jsp/zuAnn.jsp b/web/jsp/zuAnn.jsp index 1839b68..d38cb0c 100644 --- a/web/jsp/zuAnn.jsp +++ b/web/jsp/zuAnn.jsp @@ -61,6 +61,11 @@ } String vttURL = Configuration.getWebAppBaseURL() + "/ZumultDataServlet?command=getVTT&transcriptID=" + transcriptID; + + int height = 400; + if (videoIDs.isEmpty()){ + height+=320; + } %> @@ -69,7 +74,7 @@ - + @@ -165,7 +170,7 @@
-
+
<%= html %>
diff --git a/web/jsp/zuRecht.jsp b/web/jsp/zuRecht.jsp index 910f7dc..8a61aa5 100644 --- a/web/jsp/zuRecht.jsp +++ b/web/jsp/zuRecht.jsp @@ -86,6 +86,8 @@ String annotationTagSetXML = annotationTagSetString.replace("\"", "\\\"").replac + + @@ -144,10 +146,12 @@ String annotationTagSetXML = annotationTagSetString.replace("\"", "\\\"").replac
+ <%@include file="../WEB-INF/jspf/metadataModal.jspf" %> <%@include file="../WEB-INF/jspf/zuRechtConstants.jspf" %>