Use libcollocatordb 1.3.0 with changed measure names in json
Change-Id: I31eee5c88c51f334cc90f93d1906694300d53be3
diff --git a/derekovecs-server.pl b/derekovecs-server.pl
index c24e32d..7df39d0 100755
--- a/derekovecs-server.pl
+++ b/derekovecs-server.pl
@@ -1,5 +1,5 @@
#!/usr/local/bin/perl
-use Inline C => "./derekovecs-server.c" => CLEAN_AFTER_BUILD => 0, BUILD_NOISY => 1, ccflags => $Config{ccflags} . "-Wall -O4", libs => "-L. -shared -lpthread -lcollocatordb -lrt -lsnappy -lz -lbz2 -llz4 -lzstd -lrocksdb -lgomp";
+use Inline C => "./derekovecs-server.c" => CLEAN_AFTER_BUILD => 0, BUILD_NOISY => 1, ccflags => $Config{ccflags} . "-Wall -fno-rtti -O4 -I/usr/local/kl/include", libs => "-L/usr/local/kl/lib64 -l:libcollocatordb.so.1.3.0";
#use Inline C => Config => BUILD_NOISY => 1, CFLAGS => $Config{cflags}." -O4 -mtune k9";
#use Inline C => Config => CLEAN_AFTER_BUILD => 0, ccflags => $Config{ccflags}." -Ofast -march k8 -mtune k8 ";
use Mojolicious::Lite;
diff --git a/js/derekovecs.js b/js/derekovecs.js
index 4e114bc..14792ff 100644
--- a/js/derekovecs.js
+++ b/js/derekovecs.js
@@ -144,13 +144,13 @@
{ "data": "npmi", render: function ( data, type, row ) {return toFixed(data, 3) }},
{ "data": "dice", render: function ( data, type, row ) {return toExponential(data, 2) }},
{ "data": "ld", render: function ( data, type, row ) {return toFixed(data, 2) }},
- { "data": "af", render: function ( data, type, row ) {return toFixed(data, 2) }},
+ { "data": "ldaf", render: function ( data, type, row ) {return toFixed(data, 2) }},
{ "data": "delta", render: function ( data, type, row ) {return toFixed(data, 2) }},
{ "data": "afwin", width: "auto", sClass: "dt-center mono compact", render: function ( data, type, row ) {return bitmask2window(data, row.win) }},
- { "data": "lncount", render: function ( data, type, row ) {return toFixed(data, 1) }},
- { "data": "rncount", render: function ( data, type, row ) {return toFixed(data, 1) }},
- { "data": "lnpmi", render: function ( data, type, row ) {return toFixed(data, 2) }},
- { "data": "rnpmi", render: function ( data, type, row ) {return toFixed(data, 2) }},
+ { "data": "ln_count", render: function ( data, type, row ) {return toFixed(data, 1) }},
+ { "data": "rn_count", render: function ( data, type, row ) {return toFixed(data, 1) }},
+ { "data": "ln_pmi", render: function ( data, type, row ) {return toFixed(data, 2) }},
+ { "data": "rn_pmi", render: function ( data, type, row ) {return toFixed(data, 2) }},
{ "data": "f" },
{ "data": "word", sClass: "collocator" }
],