diff --git a/app/static/images/manual/query_builder/delete.gif b/app/static/images/manual/query_builder/delete.gif index a5dc39b3..af4f50ee 100644 Binary files a/app/static/images/manual/query_builder/delete.gif and b/app/static/images/manual/query_builder/delete.gif differ diff --git a/app/static/images/manual/query_builder/drag_and_drop.gif b/app/static/images/manual/query_builder/drag_and_drop.gif index 1c80fa8a..df87671a 100644 Binary files a/app/static/images/manual/query_builder/drag_and_drop.gif and b/app/static/images/manual/query_builder/drag_and_drop.gif differ diff --git a/app/static/images/manual/query_builder/editing_chips.gif b/app/static/images/manual/query_builder/editing_chips.gif new file mode 100644 index 00000000..28823f45 Binary files /dev/null and b/app/static/images/manual/query_builder/editing_chips.gif differ diff --git a/app/static/images/manual/query_builder/entity.gif b/app/static/images/manual/query_builder/entity.gif index c496c01d..80d52937 100644 Binary files a/app/static/images/manual/query_builder/entity.gif and b/app/static/images/manual/query_builder/entity.gif differ diff --git a/app/static/images/manual/query_builder/expert_mode.gif b/app/static/images/manual/query_builder/expert_mode.gif new file mode 100644 index 00000000..19e9fef6 Binary files /dev/null and b/app/static/images/manual/query_builder/expert_mode.gif differ diff --git a/app/static/images/manual/query_builder/incidence_modifier.gif b/app/static/images/manual/query_builder/incidence_modifier.gif new file mode 100644 index 00000000..8b817b0d Binary files /dev/null and b/app/static/images/manual/query_builder/incidence_modifier.gif differ diff --git a/app/static/images/manual/query_builder/option_group.gif b/app/static/images/manual/query_builder/option_group.gif index e27d5116..45616d5e 100644 Binary files a/app/static/images/manual/query_builder/option_group.gif and b/app/static/images/manual/query_builder/option_group.gif differ diff --git a/app/static/images/manual/query_builder/or_and.gif b/app/static/images/manual/query_builder/or_and.gif index c24499a2..66e093c1 100644 Binary files a/app/static/images/manual/query_builder/or_and.gif and b/app/static/images/manual/query_builder/or_and.gif differ diff --git a/app/static/images/manual/query_builder/pos.gif b/app/static/images/manual/query_builder/pos.gif index 79367d55..863eecfa 100644 Binary files a/app/static/images/manual/query_builder/pos.gif and b/app/static/images/manual/query_builder/pos.gif differ diff --git a/app/static/images/manual/query_builder/word_lemma.gif b/app/static/images/manual/query_builder/word_lemma.gif index 63ab9b0b..d406eda3 100644 Binary files a/app/static/images/manual/query_builder/word_lemma.gif and b/app/static/images/manual/query_builder/word_lemma.gif differ diff --git a/app/static/js/app.js b/app/static/js/app.js index 27b675f4..57dd7ca1 100644 --- a/app/static/js/app.js +++ b/app/static/js/app.js @@ -168,6 +168,14 @@ nopaque.App = class App { let manualModalTocElement = document.querySelector('#manual-modal-toc'); let manualModalToc = M.Tabs.getInstance(manualModalTocElement); manualModalToc.select(modalTriggerElement.dataset.manualModalChapter); + // TODO: Make this work. + // if ('manualModalChapterAnchor' in modalTriggerElement.dataset) { + // let manualModalChapterAnchor = document.querySelector(`#${modalTriggerElement.dataset.manualModalChapterAnchor}`); + // let xCoord = manualModalChapterAnchor.getBoundingClientRect().left; + // let yCoord = manualModalChapterAnchor.getBoundingClientRect().top; + // let modalContentElement = modalElement.querySelector('.modal-content'); + // modalContentElement.scroll(xCoord, yCoord); + // } } } } diff --git a/app/templates/_base/_modals/_manual/09_query_builder.html.j2 b/app/templates/_base/_modals/_manual/09_query_builder.html.j2 index be36748c..31f46f52 100644 --- a/app/templates/_base/_modals/_manual/09_query_builder.html.j2 +++ b/app/templates/_base/_modals/_manual/09_query_builder.html.j2 @@ -11,9 +11,9 @@ adjective, etc.). In addition, you can also search for structural attributes, or specify your query for a token (word, lemma, pos) via entity typing. And of course, the different text parameters can be combined.

Tokens and structural attributes can be added by clicking on the "+" button -(the "input marker") in the input field. Elements added are shown as chips. These can -be reorganized using drag and drop. The input marker can also be moved in this way. -Its position shows where new elements will be added.
+(the "input marker") in the input field or the labeled buttons below it. Elements +added are shown as chips. These can be reorganized using drag and drop. The input +marker can also be moved in this way. Its position shows where new elements will be added.
A "translation" of your query into Corpus Query Language (CQL) is shown below.

Advanced users can make direct use of the Corpus Query Language (CQL) by switching to "expert mode" via the toggle button.

The entire input field can be cleared using the red trash icon on the right.

@@ -22,9 +22,9 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.
Content
    -
  1. Add new token to your query
    2. -
  2. Options to edit your query
    3. -
  3. Add structural Attributes to your query
    4. +
  4. Add a new token to your query
    5. +
  5. Options for editing your query
    6. +
  6. Add structural attributes to your query
  7. General options
@@ -38,7 +38,7 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.If you are only looking for a specific token, you can click on the left button and select the type of token you are looking for from the drop-down menu. By default "Word" is selected.

- +
Word and Lemma

If you want to search for a specific word or lemma and the respective category is selected in the drop-down menu, you can type in the word or lemma @@ -54,13 +54,13 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below. part-of-speech-tag explanation +

Empty Token
-

Here you can search for an empty token. This selection should never stand - alone and should always be extended with an incidence modifier or stand in a +

Here you can search for a token with unspecified attributes (also called wildcard token). This + selection should never stand alone and should always be extended with an incidence modifier or stand in a larger query, because otherwise all possible tokens would be searched for and the program would crash.

-


@@ -69,8 +69,8 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.


-

Options to edit your token

-

You have the possibility to extend or specify your searched token with +

Options for editing your query

+

You have the possibility to extend or specify the token you are searching for with certain factors. For this the query builder offers some fixed options. You can find more information about the options in the Corpus Query Language Tutorial.


@@ -84,7 +84,6 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below. option group explanation -


Incidence Modifiers
@@ -93,7 +92,7 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below. [word = "is"] [word="it"] [word="your"] [word="litte"]? [word = "dog"]
Here the word "little" should occur either once or not at all. With - [word="dogs?"] the search is for "dog "or "dogs".

+ [word="dogs?"] the search is for "dog "or "dogs".


Ignore Case
@@ -111,7 +110,8 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.

Tokens that have already been added can also be modified by clicking on the corresponding pen icon. Click on the "ignore case" box, for example, and the query builder will - not differentiate between upper- and lower- case letters for that respective token.

+ not differentiate between upper- and lower- case letters for that respective token. + New conditions added apply to the most recent token information.


@@ -130,26 +130,33 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.). For example, you can search for sentences that contain only a noun, verb, and adjective.
- After clicking on Sentence you will see a
Sentence Start
. - When you are done with your query or the content - between the Sentence tags, you have to click the Sentence button one more time - to close it. The corresponding button is called -
Sentence End
.
+ Click on Sentence to add the sentence chips:
Sentence Start
+ and
Sentence End
. + These mark where the sentence starts and ends. Use drag-and-drop to place them accordingly. When + the Sentence attribute is added, the input marker will automatically be + moved between the sentence chips. Use drag-and-drop as needed to continue your query + at a different position.
Entities
-

With entities, i.e. units of meaning, you search for text sections that - follow a certain code. For example, persons, dates, certain events. You can - select the codes using the drop-down menus. You can find an explanation of - the respective abbreviations under the tab "Tagsets".
+

With entities, i.e. units of meaning, you can search for text sections that + contain more specific information, for example, persons, dates, or events. The + codes for these categories can be selected using the drop-down menus. You can find an explanation of + these abbreviations under the tab "Tagsets".
You can also search for unspecified entities by selecting "Add entity of any type".

- To close the entity query you started, you have to click the entity button one more time. This will make the
Entity End
element appear in your query. + Click on the Entity button to add the entity chips
Entity Type=
and
Entity End
. +

The entity type can be changed by clicking on the pen symbol on the chip. When + the Entity attribute is added, the input marker will automatically be + moved between the entity chips. Use drag-and-drop as needed to continue your query + at a different position.

entity explanation


-
Meta Data
-

With the meta data you can annotate your text and add specific conditions. +

Meta Data (currently unavailable)
+

The meta data function is being worked on and cannot currently be used! +
+ With the meta data you can annotate your text and add specific conditions. You can select a category on the left and enter your desired value on the right. The selected metadata will apply to your entire request and will be added at the end.

meta data explanation @@ -165,14 +172,39 @@ A "translation" of your query into Corpus Query Language (CQL) is shown below.

General Options of the query builder

You have several options to edit your query after adding it to the preview.

+
+ +
Editing the elements
+

You can edit your query chips by clicking on the pen icon.

+ editing explanation +
Deleting the elements

You can delete the added elements from the query by clicking the X behind the respective content.

delete explanation +
Move the elements of your query

You can drag and drop elements to customize your query.

Drag&Drop explanation +
+ +
Setting an incidence modifier
+

With the incidence modifier option, you can specify the amount of + times a token should appear in your query. This is particularly relevant for empty + tokens (tokens with unspecified attributes). Click on a token (blue chip) and + select the desired option from the list to add an incidence modifier. To + close the list without adding anything, click on the token again.

+ incidence modifier explanation +
+ +
Switching between Query Builder and Expert mode
+

To work with the plain Corpus Query Language instead of using the Query Builder, click on the "expert mode" + switch. Your query can be entered into the input field. All elements previously added will be carried over + into expert mode. Click on the switch again to switch back to the Query Builder if desired. All recognized elements + will be parsed into chips; those not recognized will be deleted from the query.

+ expert mode explanation + diff --git a/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2 b/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2 index 6baecdda..3e8a8318 100644 --- a/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2 +++ b/app/templates/corpora/_analysis/query_builder/_query_builder.html.j2 @@ -40,6 +40,7 @@ Add new token to your query Add structural attributes to your query incidence modifiers + help_outline
@@ -66,7 +67,7 @@