Skip to content

Commit dac0239

Browse files
thomaskrausethomaskrause
authored
Merge pull request #900 from korpling/update-graphannis
Update graphannis to 4.0.1
2 parents 5637d41 + 159da4d commit dac0239

35 files changed

+2686
-1790
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
55

66
## [Unreleased]
77

8+
### Fixed
9+
10+
- Update to graphANNIS 4.0.1 that fixes performance issues with `@*` queries and has improved
11+
timeout support for frequency queries (which otherwise could use all the resources of the server).
12+
813
## [4.15.0] - 2025-05-22
914

1015
### Added

‎docs/user-guide/src/aql/operators.md‎

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<vaadin.version>8.14.3</vaadin.version>
4040
<vaadin.productionMode>true</vaadin.productionMode>
4141
<start-class>org.corpus_tools.annis.gui.AnnisUiApplication</start-class>
42-
<graphannis.version>3.8.1</graphannis.version>
42+
<graphannis.version>4.0.1</graphannis.version>
4343
<antlr4.version>4.7.2</antlr4.version>
4444
<spring.profiles.active>server</spring.profiles.active>
4545
<swagger-core-version>1.5.24</swagger-core-version>
@@ -261,7 +261,7 @@
261261
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-unknown-linux-gnu.tar.xz</url>
262262
<outputDirectory>
263263
${project.build.directory}/native/</outputDirectory>
264-
<sha256>e8e27646d9a0f8b9a60ca52e574f524695d153e3c9b1addd050841b16fd78aef</sha256>
264+
<sha256>bbd0a6456f24c1b6594e569267302f54a142775b86ff63d2d9e4ea3b12f835de</sha256>
265265
<unpack>true</unpack>
266266
</configuration>
267267
</execution>
@@ -276,7 +276,7 @@
276276
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-pc-windows-msvc.zip</url>
277277
<outputDirectory>
278278
${project.build.directory}/native/win32-x86-64/</outputDirectory>
279-
<sha256>e6c6e3131d7a644f11c1ef39e1507e87f04800ec9ef4c3bad784526c16fabdfa</sha256>
279+
<sha256>3d553737863c3dabf9fc80cbdec3aa3b909b42616ca75baa93547b24e79672df</sha256>
280280
<unpack>true</unpack>
281281
</configuration>
282282
</execution>
@@ -291,7 +291,7 @@
291291
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-aarch64-apple-darwin.tar.xz</url>
292292
<outputDirectory>
293293
${project.build.directory}/native/</outputDirectory>
294-
<sha256>77357117a813fd4a19e255520f083d40584f14dc443bdee5350ec2090ee45ebc</sha256>
294+
<sha256>9c7a7bb65b3467a77330fa04856bc1169213b0c34584db6bd52ef9bc4f12d990</sha256>
295295
<unpack>true</unpack>
296296
</configuration>
297297
</execution>
@@ -306,7 +306,7 @@
306306
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz</url>
307307
<outputDirectory>
308308
${project.build.directory}/native/</outputDirectory>
309-
<sha256>9e63429d031b2d3ff1ecc0a901f0748a6540ea0964c6b34d768f9f6bd4383489</sha256>
309+
<sha256>659258a57a8c175910e1c3120211e732d5909a1e1cd57e822289c0535be20d9f</sha256>
310310
<unpack>true</unpack>
311311
</configuration>
312312
</execution>

‎src/main/webapp/VAADIN/help/404.html‎

Lines changed: 62 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE HTML>
2-
<html lang="en" class="sidebar-visible no-js light">
2+
<html lang="en" class="light sidebar-visible" dir="ltr">
33
<head>
44
<!-- Book generated using mdBook -->
55
<meta charset="UTF-8">
@@ -8,10 +8,10 @@
88

99

1010
<!-- Custom HTML head -->
11-
11+
1212
<meta name="description" content="">
1313
<meta name="viewport" content="width=device-width, initial-scale=1">
14-
<meta name="theme-color" content="#ffffff" />
14+
<meta name="theme-color" content="#ffffff">
1515

1616
<link rel="icon" href="favicon.svg">
1717
<link rel="shortcut icon" href="favicon.png">
@@ -25,26 +25,41 @@
2525
<link rel="stylesheet" href="fonts/fonts.css">
2626

2727
<!-- Highlight.js Stylesheets -->
28-
<link rel="stylesheet" href="highlight.css">
29-
<link rel="stylesheet" href="tomorrow-night.css">
30-
<link rel="stylesheet" href="ayu-highlight.css">
28+
<link rel="stylesheet" id="highlight-css" href="highlight.css">
29+
<link rel="stylesheet" id="tomorrow-night-css" href="tomorrow-night.css">
30+
<link rel="stylesheet" id="ayu-highlight-css" href="ayu-highlight.css">
3131

3232
<!-- Custom theme stylesheets -->
3333

34+
35+
<!-- Provide site root and default themes to javascript -->
36+
<script>
37+
const path_to_root = "";
38+
const default_light_theme = "light";
39+
const default_dark_theme = "navy";
40+
window.path_to_searchindex_js = "searchindex.js";
41+
</script>
42+
<!-- Start loading toc.js asap -->
43+
<script src="toc.js"></script>
3444
</head>
3545
<body>
46+
<div id="mdbook-help-container">
47+
<div id="mdbook-help-popup">
48+
<h2 class="mdbook-help-title">Keyboard shortcuts</h2>
49+
<div>
50+
<p>Press <kbd>←</kbd> or <kbd>→</kbd> to navigate between chapters</p>
51+
<p>Press <kbd>S</kbd> or <kbd>/</kbd> to search in the book</p>
52+
<p>Press <kbd>?</kbd> to show this help</p>
53+
<p>Press <kbd>Esc</kbd> to hide this help</p>
54+
</div>
55+
</div>
56+
</div>
3657
<div id="body-container">
37-
<!-- Provide site root to javascript -->
38-
<script>
39-
var path_to_root = "";
40-
var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "navy" : "light";
41-
</script>
42-
4358
<!-- Work around some values being stored in localStorage wrapped in quotes -->
4459
<script>
4560
try {
46-
var theme = localStorage.getItem('mdbook-theme');
47-
var sidebar = localStorage.getItem('mdbook-sidebar');
61+
let theme = localStorage.getItem('mdbook-theme');
62+
let sidebar = localStorage.getItem('mdbook-sidebar');
4863

4964
if (theme.startsWith('"') && theme.endsWith('"')) {
5065
localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
@@ -58,79 +73,68 @@
5873

5974
<!-- Set the theme before any content is loaded, prevents flash -->
6075
<script>
61-
var theme;
76+
const default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? default_dark_theme : default_light_theme;
77+
let theme;
6278
try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
6379
if (theme === null || theme === undefined) { theme = default_theme; }
64-
var html = document.querySelector('html');
65-
html.classList.remove('no-js')
80+
const html = document.documentElement;
6681
html.classList.remove('light')
6782
html.classList.add(theme);
68-
html.classList.add('js');
83+
html.classList.add("js");
6984
</script>
7085

86+
<input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
87+
7188
<!-- Hide / unhide sidebar before it is displayed -->
7289
<script>
73-
var html = document.querySelector('html');
74-
var sidebar = null;
90+
let sidebar = null;
91+
const sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
7592
if (document.body.clientWidth >= 1080) {
7693
try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
7794
sidebar = sidebar || 'visible';
7895
} else {
7996
sidebar = 'hidden';
97+
sidebar_toggle.checked = false;
98+
}
99+
if (sidebar === 'visible') {
100+
sidebar_toggle.checked = true;
101+
} else {
102+
html.classList.remove('sidebar-visible');
80103
}
81-
html.classList.remove('sidebar-visible');
82-
html.classList.add("sidebar-" + sidebar);
83104
</script>
84105

85106
<nav id="sidebar" class="sidebar" aria-label="Table of contents">
86-
<div class="sidebar-scrollbox">
87-
<ol class="chapter"><li class="chapter-item expanded "><a href="index.html"><strong aria-hidden="true">1.</strong> Introduction</a></li><li class="chapter-item expanded "><a href="interface/index.html"><strong aria-hidden="true">2.</strong> Using the ANNIS interface</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="interface/search-form.html"><strong aria-hidden="true">2.1.</strong> Search Form</a></li><li class="chapter-item expanded "><a href="interface/result-window.html"><strong aria-hidden="true">2.2.</strong> Result Window</a></li><li class="chapter-item expanded "><a href="interface/query-builder.html"><strong aria-hidden="true">2.3.</strong> Query Builder</a></li></ol></li><li class="chapter-item expanded "><a href="aql/index.html"><strong aria-hidden="true">3.</strong> ANNIS Query Language (AQL)</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="aql/word-forms.html"><strong aria-hidden="true">3.1.</strong> Searching for Word Forms</a></li><li class="chapter-item expanded "><a href="aql/annotations.html"><strong aria-hidden="true">3.2.</strong> Searching for Annotations</a></li><li class="chapter-item expanded "><a href="aql/regex.html"><strong aria-hidden="true">3.3.</strong> Searching using Regular Expressions</a></li><li class="chapter-item expanded "><a href="aql/trees.html"><strong aria-hidden="true">3.4.</strong> Searching for Trees</a></li><li class="chapter-item expanded "><a href="aql/pointing.html"><strong aria-hidden="true">3.5.</strong> Searching for Pointing Relations</a></li><li class="chapter-item expanded "><a href="aql/negation.html"><strong aria-hidden="true">3.6.</strong> Operator Negation</a></li><li class="chapter-item expanded "><a href="aql/export.html"><strong aria-hidden="true">3.7.</strong> Exporting Results</a></li><li class="chapter-item expanded "><a href="aql/frequency.html"><strong aria-hidden="true">3.8.</strong> Frequency Analysis</a></li><li class="chapter-item expanded "><a href="aql/operators.html"><strong aria-hidden="true">3.9.</strong> Complete List of Operators</a></li><li class="chapter-item expanded "><a href="aql/compatibility-mode.html"><strong aria-hidden="true">3.10.</strong> Differences in Compatibility Mode</a></li></ol></li></ol>
107+
<!-- populated by js -->
108+
<mdbook-sidebar-scrollbox class="sidebar-scrollbox"></mdbook-sidebar-scrollbox>
109+
<noscript>
110+
<iframe class="sidebar-iframe-outer" src="toc.html"></iframe>
111+
</noscript>
112+
<div id="sidebar-resize-handle" class="sidebar-resize-handle">
113+
<div class="sidebar-resize-indicator"></div>
88114
</div>
89-
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
90115
</nav>
91116

92-
<!-- Track and set sidebar scroll position -->
93-
<script>
94-
var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
95-
sidebarScrollbox.addEventListener('click', function(e) {
96-
if (e.target.tagName === 'A') {
97-
sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
98-
}
99-
}, { passive: true });
100-
var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
101-
sessionStorage.removeItem('sidebar-scroll');
102-
if (sidebarScrollTop) {
103-
// preserve sidebar scroll position when navigating via links within sidebar
104-
sidebarScrollbox.scrollTop = sidebarScrollTop;
105-
} else {
106-
// scroll sidebar to current active section when navigating via "next/previous chapter" buttons
107-
var activeSection = document.querySelector('#sidebar .active');
108-
if (activeSection) {
109-
activeSection.scrollIntoView({ block: 'center' });
110-
}
111-
}
112-
</script>
113-
114117
<div id="page-wrapper" class="page-wrapper">
115118

116119
<div class="page">
117-
<div id="menu-bar-hover-placeholder"></div>
120+
<div id="menu-bar-hover-placeholder"></div>
118121
<div id="menu-bar" class="menu-bar sticky">
119122
<div class="left-buttons">
120-
<button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
123+
<label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
121124
<i class="fa fa-bars"></i>
122-
</button>
125+
</label>
123126
<button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
124127
<i class="fa fa-paint-brush"></i>
125128
</button>
126129
<ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
130+
<li role="none"><button role="menuitem" class="theme" id="default_theme">Auto</button></li>
127131
<li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
128132
<li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
129133
<li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
130134
<li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
131135
<li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
132136
</ul>
133-
<button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
137+
<button id="search-toggle" class="icon-button" type="button" title="Search (`/`)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="/ s" aria-controls="searchbar">
134138
<i class="fa fa-search"></i>
135139
</button>
136140
</div>
@@ -147,7 +151,12 @@ <h1 class="menu-title">ANNIS Help</h1>
147151

148152
<div id="search-wrapper" class="hidden">
149153
<form id="searchbar-outer" class="searchbar-outer">
150-
<input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
154+
<div class="search-wrapper">
155+
<input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
156+
<div class="spinner-wrapper">
157+
<i class="fa fa-spinner fa-spin"></i>
158+
</div>
159+
</div>
151160
</form>
152161
<div id="searchresults-outer" class="searchresults-outer hidden">
153162
<div id="searchresults-header" class="searchresults-header"></div>
@@ -206,6 +215,7 @@ <h1 id="document-not-found-404"><a class="header" href="#document-not-found-404"
206215
<!-- Custom JS scripts -->
207216

208217

218+
209219
</div>
210220
</body>
211221
</html>

0 commit comments

Comments
 (0)