diff --git a/F_openannis_wide.php b/F_openannis_wide.php
index ce632747339b715fc8cfad8e5c191c29f44791a8..0612e1b4d9082518e7904a3362d949e02f196daf 100644
--- a/F_openannis_wide.php
+++ b/F_openannis_wide.php
@@ -170,7 +170,7 @@ function process_post(){
// no fine selection
if(preg_match("/all_.*/", $_POST['lfeat1_2'])){
if($_POST['lfeat1_1']=='grammar'){
- $elements .= 'EA_category=/G_.*/';
+ $elements .= 'EA_category=/G_.*/'; // used to be ' & EA_category=/G_.*/';
}
else if($_POST['lfeat1_1']=='orthog'){
$elements .= 'EA_category=/O_.*/';
diff --git a/cz/data.php b/cz/data.php
index fb4e09bab42535c89274676fcd41cb3feb477591..051ee28eb11bbefab60a50ee49593299312b523a 100644
--- a/cz/data.php
+++ b/cz/data.php
@@ -9,7 +9,19 @@ require('F_mainsidebar.php');
<!--INSERT-->
<h1 style="background-color: white;">Stáhnout MERLIN korpus</h1>
<p style="background-color: white;">MERLIN nabÃzà vÅ¡echny texty obsažené v korpusu ke staženà zdarma.</p>
-<p style="background-color: white;"> </p>
+<p> </p>
+<p>Download all <strong>metadata</strong> and learner texts as <strong>plain text</strong>:</p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>metadata</p></td>
+ <td width="152"><p><a href="docs/metadata_ratings_indicators.csv">.csv file <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>plain learner texts</p></td>
+ <td width="152"><p><a href="docs/MERLIN-plain_text.zip">zipped .txt files <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+</table>
+<p> </p>
<p style="background-color: white;">StáhnÄ›te si vÅ¡echny žákovské texty vÄetnÄ› <strong>metadat</strong> (informace o autorovi textu, testu a hodnocenÃ):</p>
<p style="background-color: white;"> </p>
<table style="background-color: white;" border="0" cellpadding="0" cellspacing="1">
@@ -50,6 +62,27 @@ require('F_mainsidebar.php');
</tr>
</tbody></table>
<p> </p>
+<p>Download all learner texts with <strong>annotations</strong> in the formats: <strong>EXMARaLDA</strong>, <strong>PAULA</strong>, <strong>relANNIS</strong> or <strong>SOLR</strong>:</p>
+<p> </p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>EXMARaLDA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-exmaralda.zip">zipped .exb files</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>PAULA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-paula.zip">zipped .xml files</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>relANNIS</p></td>
+ <td width="152"><p><a href="docs/MERLIN-relannis.zip">zipped .tab files</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>SOLR</p></td>
+ <td width="152"><p><a href="docs/MERLIN-solr.zip">zipped .xml files</a></p></td>
+ </tr>
+</table>
+<p> </p>
<p>V pÅ™ÃpadÄ›, že máte zájem vytvoÅ™it si vlastnà soubor žákovských textů (subkorpus), použijte možnost <span class="reference"><strong><em>vytvoÅ™it subkorpus</em></strong><em></em></span>. Zde si můžete uložit vzorek nebo vÅ¡echny texty subkorpusu jako jeden soubor ve formátu PDF nebo TXT s vÃce stránkami.</p>
<!--INSERT END-->
</div>
diff --git a/de/data.php b/de/data.php
index 0afa72c7cb38f7359b6ad0791ea7c82df8d83016..695a6df1ea8c5fae87760824533e351313686a09 100644
--- a/de/data.php
+++ b/de/data.php
@@ -10,24 +10,36 @@ require('F_mainsidebar.php');
<h1>Das MERLIN-Korpus herunterladen</h1>
<p>MERLIN bietet alle im Korpus enthaltenen Lernertexte zum freien Download an.</p>
<p> </p>
+<p>Laden Sie alle <strong>Metadaten</strong> und Lernertexte im <strong>einfachen Textformat</strong> herunter:</p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>Metadaten</p></td>
+ <td width="152"><p><a href="docs/metadata_ratings_indicators.csv">.csv Datei <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>Lernertexte (einfacher Text)</p></td>
+ <td width="152"><p><a href="docs/MERLIN-plain_text.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+</table>
+<p> </p>
<!--p style="color:red;">(work in progress: to come soon)</p-->
<p>Laden Sie alle Lernertexte einschließlich der <strong>Metadaten</strong> (Information zum Lerner, zum Test und den Bewertungen) herunter:</p>
<p> </p>
<table border="0" cellspacing="1" cellpadding="0">
<tr>
<td><p>TSCHECHISCH</p></td>
- <td><p><a href="docs/CZ_ltext_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/CZ_ltext_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/CZ_ltext_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/CZ_ltext_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
<tr>
<td><p>DEUTSCH</p></td>
- <td><p><a href="docs/DE_ltext_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/DE_ltext_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/DE_ltext_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/DE_ltext_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
<tr>
<td><p>ITALIENISCH</p></td>
- <td><p><a href="docs/IT_ltext_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/IT_ltext_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/IT_ltext_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/IT_ltext_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
</table>
<p> </p>
@@ -36,21 +48,42 @@ require('F_mainsidebar.php');
<table border="0" cellspacing="1" cellpadding="0">
<tr>
<td><p>TSCHECHISCH</p></td>
- <td><p><a href="docs/CZ_meta_THs_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/CZ_meta_THs_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/CZ_meta_THs_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/CZ_meta_THs_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
<tr>
<td><p>DEUTSCH</p></td>
- <td><p><a href="docs/DE_meta_THs_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/DE_meta_THs_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/DE_meta_THs_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/DE_meta_THs_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
<tr>
<td><p>ITALIENISCH</p></td>
- <td><p><a href="docs/IT_meta_THs_pdf.zip">gezippte PDF-Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
- <td><p><a href="docs/IT_meta_THs_txt.zip">gezippte TXT-Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ <td><p><a href="docs/IT_meta_THs_pdf.zip">gezippte .pdf Dateien <img src="img/document-pdf.png" width="16" height="16" alt="pdf"></a></p></td>
+ <td><p><a href="docs/IT_meta_THs_txt.zip">gezippte .txt Dateien <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
</tr>
</table>
<p> </p>
+<p>Laden Sie alle Lernertexte einschließlich der <strong>Annotationen</strong> in folgenden Formaten herunter: <strong>EXMARaLDA</strong>, <strong>PAULA</strong>, <strong>relANNIS</strong> oder <strong>SOLR</strong>:</p>
+<p> </p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>EXMARaLDA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-exmaralda.zip">gezippte .exb Dateien</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>PAULA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-paula.zip">gezippte .xml Dateien</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>relANNIS</p></td>
+ <td width="152"><p><a href="docs/MERLIN-relannis.zip">gezippte .tab Dateien</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>SOLR</p></td>
+ <td width="152"><p><a href="docs/MERLIN-solr.zip">gezippte .xml Dateien</a></p></td>
+ </tr>
+</table>
+<p> </p>
<p>Bitte beachten Sie: Wenn Sie Ihr eigenes Subkorpus von Lernertexten definieren wollen, gehen Sie zu <span class="reference"><strong><em>Subkorpus definieren</em></strong></span>. Dort können Sie entweder einen Ausschnitt Ihrer Textsammlung oder das ganze Subkorpus als eine einzelne TXT- oder PDF-Datei (mit mehreren Seiten) herunterladen.</p>
<!--INSERT END-->
</div>
diff --git a/en/data.php b/en/data.php
index d4e290169e1bed1d642d232473123110a4ff7cbc..acd7343d0b506f2deb8b21cafaaca6bc67663833 100644
--- a/en/data.php
+++ b/en/data.php
@@ -22,7 +22,7 @@ require('F_mainsidebar.php');
</tr>
</table>
<p> </p>
-<p>Download all learner texts including <strong>metadata</strong> (information about the learner, the test, and ratings):</p>
+<p>Download all learner texts including <strong>metadata</strong> (information about the learner, the test, and ratings):</p>
<p> </p>
<table width="369" border="0" cellspacing="1" cellpadding="0">
<tr>
diff --git a/it/data.php b/it/data.php
index fdc2e0d47932e63c6f1a8107b219997bed1ccfd6..d539afd9b85f53add5529e2cd0232c7cdd10e458 100644
--- a/it/data.php
+++ b/it/data.php
@@ -10,23 +10,35 @@ require('F_mainsidebar.php');
<h1>Scarica il corpus MERLIN</h1>
<p>MERLIN offre il download gratuito di tutti i testi degli apprendenti inclusi nel corpus.</p>
<p> </p>
+<p>Scarica i <strong>metadati</strong> ed i testi degli apprendenti in formato <strong>testo semplice</strong>:</p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>metadati</p></td>
+ <td width="152"><p><a href="docs/metadata_ratings_indicators.csv">file .csv <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>testi degli apprendenti (testo semplice)</p></td>
+ <td width="152"><p><a href="docs/MERLIN-plain_text.zip">file .txt compressi <img src="img/icon_txt.png" width="16" height="16" alt="txt"></a></p></td>
+ </tr>
+</table>
+<p> </p>
<p>Scarica tutti i testi degli apprendenti, comprensivi di <strong>metadati</strong> (informazioni sull'apprendente, sul test e sulle valutazioni):</p>
<p> </p>
<table style="width: 388px; height: 103px;" border="0" cellpadding="0" cellspacing="1">
<tbody><tr>
<td width="76"><p>CECO</p></td>
- <td width="157"><p><a href="docs/CZ_ltext_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td width="152"><p><a href="docs/CZ_ltext_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td width="157"><p><a href="docs/CZ_ltext_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td width="152"><p><a href="docs/CZ_ltext_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
<tr>
<td><p>TEDESCO</p></td>
- <td><p><a href="docs/DE_ltext_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td><p><a href="docs/DE_ltext_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/DE_ltext_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/DE_ltext_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
<tr>
<td><p>ITALIANO</p></td>
- <td><p><a href="docs/IT_ltext_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td><p><a href="docs/IT_ltext_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/IT_ltext_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/IT_ltext_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
</tbody></table>
<p> </p>
@@ -35,21 +47,42 @@ require('F_mainsidebar.php');
<table style="width: 388px; height: 104px;" border="0" cellpadding="0" cellspacing="1">
<tbody><tr>
<td width="76"><p>CECO</p></td>
- <td width="157"><p><a href="docs/CZ_meta_THs_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td width="152"><p><a href="docs/CZ_meta_THs_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td width="157"><p><a href="docs/CZ_meta_THs_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td width="152"><p><a href="docs/CZ_meta_THs_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
<tr>
<td><p>TEDESCO</p></td>
- <td><p><a href="docs/DE_meta_THs_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td><p><a href="docs/DE_meta_THs_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/DE_meta_THs_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/DE_meta_THs_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
<tr>
<td><p>ITALIANO</p></td>
- <td><p><a href="docs/IT_meta_THs_pdf.zip">file PDF compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
- <td><p><a href="docs/IT_meta_THs_txt.zip">file TXT compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/IT_meta_THs_pdf.zip">file .pdf compressi <img src="img/document-pdf.png" alt="pdf" height="16" width="16"></a></p></td>
+ <td><p><a href="docs/IT_meta_THs_txt.zip">file .txt compressi <img src="img/icon_txt.png" alt="txt" height="16" width="16"></a></p></td>
</tr>
</tbody></table>
<p> </p>
+<p>Scarica tutti i testi degli apprendenti, comprensivi di <strong>annotationi</strong> nei seguenti formati: <strong>EXMARaLDA</strong>, <strong>PAULA</strong>, <strong>relANNIS</strong> o <strong>SOLR</strong>:</p>
+<p> </p>
+<table width="369" border="0" cellspacing="1" cellpadding="0">
+ <tr>
+ <td width="76"><p>EXMARaLDA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-exmaralda.zip">file .exb compressi</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>PAULA</p></td>
+ <td width="152"><p><a href="docs/MERLIN-paula.zip">file .xml compressi</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>relANNIS</p></td>
+ <td width="152"><p><a href="docs/MERLIN-relannis.zip">file .tab compressi</a></p></td>
+ </tr>
+ <tr>
+ <td width="76"><p>SOLR</p></td>
+ <td width="152"><p><a href="docs/MERLIN-solr.zip">file .xml compressi</a></p></td>
+ </tr>
+</table>
+<p> </p>
<p>Attenzione: Se vuoi creare il tuo sottoinsieme di testi (sottocorpus), vai su <span class="reference"><strong><em>Crea un sottocorpus</em></strong></span>. Da lì, puoi scaricare un campione o tutti i testi dal tuo sottocorpus in un singolo file di più pagine (TXT o PDF).</p>
<!--INSERT END-->
</div>