Fixed IDs for Schreibgebrauch usage
diff --git a/Changes b/Changes
index d2de607..76a369c 100755
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.18 2015-02-13
+ - Support for dashes in identifiers.
+ - Minor changes to the layout.
+
0.17 2015-11-13
- Support a larger template cache.
- Minor style adjustments.
diff --git a/Gruntfile.js b/Gruntfile.js
index b75ca2f..12dd48b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -135,6 +135,7 @@
grunt.registerTask('default', ['requirejs']);
grunt.registerTask('img', ['imagemin','copy']);
+ grunt.registerTask('js', ['requirejs']);
grunt.registerTask('css', ['sass']);
grunt.registerTask(
'default',
diff --git a/dev/js/src/api.js b/dev/js/src/api.js
index 87073d6..eeddc58 100644
--- a/dev/js/src/api.js
+++ b/dev/js/src/api.js
@@ -67,8 +67,15 @@
4 - done
*/
if (this.readyState == 4) {
- if (this.status === 200)
- onload(JSON.parse(this.responseText));
+ if (this.status === 200) {
+ var json = JSON.parse(this.responseText);
+ if (json["errors"] !== null) {
+ for (var i in json["errors"]) {
+ KorAP.log(json["errors"][i][0], json["errors"][i][1]);
+ };
+ };
+ onload(json);
+ }
else
KorAP.log(this.status, this.statusText);
}
diff --git a/lib/Kalamar/API.pm b/lib/Kalamar/API.pm
index d2bc68c..07047de 100644
--- a/lib/Kalamar/API.pm
+++ b/lib/Kalamar/API.pm
@@ -517,7 +517,7 @@
# Cleanup single match
sub _map_match {
my $x = shift or return;
- $x->{matchID} =~ s/^match\-(?:[^!]+!|[^_]+_)[^-]+-//;
+ $x->{matchID} =~ s/^match\-(?:[^!]+!|[^_]+_)[^\.]+?\.[^-]+?-//;
(
$x->{corpusID},
@@ -534,7 +534,6 @@
$x;
};
-
# Build query url
sub _query_url {
my ($index, %param) = @_;
diff --git a/package.json b/package.json
index 6e62df0..471bdac 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Kalamar",
"description": "Mojolicious-based Frontend for KorAP",
- "version": "0.17.0",
+ "version": "0.18.0",
"repository" : {
"type": "git",
"url": "https://github.com/KorAP/Kalamar.git"