derekovecs: add corpus name(s) to heading and page title
diff --git a/css/derekovecs.css b/css/derekovecs.css
index 5f4015e..1ca24ab 100644
--- a/css/derekovecs.css
+++ b/css/derekovecs.css
@@ -12,7 +12,7 @@
right: 0; */
}
-h1, h2, h3 {
+h1 {
margin: 5px 10px 0 0;
color: rgb(246,168,0);
font-family: "Univers LT Std 47 Cn Lt", "Univers LT Std 67 Cn Lt", "Roboto Condensed", "Univers LT Std 67 Cn Bold", "UniversLTStd-BoldCn", "Times", 'League Gothic', Impact, sans-serif;
@@ -24,6 +24,19 @@
word-wrap: break-word;
}
+h2 {
+ color: grey;
+ font-family: "Univers LT Std 47 Cn Lt", "Univers LT Std 67 Cn Lt", "Roboto Condensed", "Univers LT Std 67 Cn Bold", "UniversLTStd-BoldCn", "Times", 'League Gothic', Impact, sans-serif;
+ font-weight: bold;
+ letter-spacing: normal;
+ text-transform: uppercase;
+ text-shadow: none;
+ word-wrap: break-word;
+ font-size: 12pt;
+ margin-top: 0pt;
+ margin-bottom: 0pt;
+ margin-letf: 2pt;
+}
showoptions, #SEARCH {
margin-left: 10px;
@@ -68,6 +81,11 @@
fill: green;
}
+.merged {
+ color: green;
+ fill: green;
+}
+
#first a, .paradigmator a {
text-decoration: none;
}
diff --git a/templates/index.html.ep b/templates/index.html.ep
index 981d5a1..76cc8c3 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
<head>
- <title>DeReKo-Word-Vector-Distances: <%= $word %></title>
+ <% my $plain_title = $title; $plain_title=~s/<[^>]+>//g; %>
+ <title><%= $plain_title %>:<%= $word %> DeReKo-Word-Vector-Distances</title>
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<link href="https://fonts.googleapis.com/css?family=Lato|Roboto+Condensed" rel="stylesheet">
<script src="http://code.jquery.com/jquery-latest.min.js"></script>
@@ -712,7 +713,8 @@
<div style="display:none;" id="npmi_ttt">Normalized pointwise mutual information: $$\frac{log_2\frac{p(w_1,w_2)}{p(w_1)p(w_2)}}{-log_2(p(w_1,w_2))}$$<p class="citation">Bouma, Gerlof (2009): <a href="https://svn.spraakdata.gu.se/repos/gerlof/pub/www/Docs/npmi-pfd.pdf">Normalized (pointwise) mutual information in collocation extraction</a>. In Proceedings of GSCL.</p></div>
<div id="header">
<div id="pagetitle">
- <h1>DeReKo-Vectors</h1>
+ <h1>DeReKoVecs</h1>
+ <h2><%== $title %></h2>
</div>
<div id="options" class="widget">
<form id="queryform">
diff --git a/w2v-server.pl b/w2v-server.pl
index 8701f90..2c57554 100755
--- a/w2v-server.pl
+++ b/w2v-server.pl
@@ -28,6 +28,7 @@
our $opt_G;
my %marked;
+my $title="";
my $training_args="";
my $mergedEnd=0;
my %cache;
@@ -56,12 +57,14 @@
$training_args = <FILE>;
}
close(FILE);
+ $title = fname2corpusname($ARGV[0]);
}
my $have_sprofiles = load_sprofiles($ARGV[0]);
if($opt_m) {
$mergedEnd = mergeVectors($opt_m);
+ $title = "<span class=\"merged\">" . $title . "</span> vs. " . fname2corpusname($opt_m);
}
@@ -101,6 +104,13 @@
$c->reply->static($url);
};
+sub fname2corpusname {
+ ($_) = @_;
+ s@.*/@@;
+ s@\..*@@;
+ return $_;
+}
+
sub getClassicCollocatorsCached {
my ($c, $word) = @_;
if(!$cccache{$word}) {
@@ -220,7 +230,7 @@
$csv_data .= "\n";
return $c->render(text=>$csv_data);
} else {
- $c->render(template=>"index", word=>$word, cutoff=>$cutoff, no_nbs=>$no_nbs, no_iterations => $no_iterations, epsilon=> $epsilon, perplexity=> $perplexity, show_som=>$som, searchBaseVocabFirst=>$searchBaseVocabFirst, sort=>$sort, training_args=>$training_args, mergedEnd=> $mergedEnd, haveSProfiles=> $have_sprofiles, dedupe=> $dedupe, marked=>\%marked, lists=> \@lists, collocators=> $res->{syntagmatic});
+ $c->render(template=>"index", title=>$title, word=>$word, cutoff=>$cutoff, no_nbs=>$no_nbs, no_iterations => $no_iterations, epsilon=> $epsilon, perplexity=> $perplexity, show_som=>$som, searchBaseVocabFirst=>$searchBaseVocabFirst, sort=>$sort, training_args=>$training_args, mergedEnd=> $mergedEnd, haveSProfiles=> $have_sprofiles, dedupe=> $dedupe, marked=>\%marked, lists=> \@lists, collocators=> $res->{syntagmatic});
}
};