Made chart responsive. Added conf script for index set up

davidlivingrooms · Jun 20, 2015 · 5e5e538 · 5e5e538
1 parent cb32ee6
commit 5e5e538
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/conf/create_indexes.sql b/conf/create_indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX article_gin
+  ON article
+  USING gin
+  (title COLLATE pg_catalog."default" gin_trgm_ops);
diff --git a/public/js/graph.js b/public/js/graph.js
@@ -73,7 +73,7 @@ function Graph() {
 function articlePromise(title) {
   return Promise.resolve(
     $.ajax({
-      url: 'http://localhost:3000/wikimaps/getArticleInfo',
+      url: 'http://wikigrapher.com/wikimaps/getArticleInfo',
       data: {title: title},
       dataType: 'json'
     }));

diff --git a/public/js/wikigraph.js b/public/js/wikigraph.js
@@ -8,7 +8,6 @@ var cola = require('cola');
 var Promise = require('bluebird');
 var Graph = require('./graph.js');
 var StringUtils = new (require('./string_utils.js'));
-var graph;
 
 module.exports = {
   initializeNewGraph: function(rootArticle) {
@@ -29,8 +28,8 @@ function WikiGraph(rootArticle)
       .size([width, height]);
 
     var outer = d3.select("#chart").append("svg")
-      .attr("width", width)
-      .attr("height", height)
+      .attr("viewBox", "0 0 " + width + " " + height )
+      .attr("preserveAspectRatio", "xMinYMin")
       .attr("pointer-events", "all");
 
     //Set up tooltip

diff --git a/public/js/wikisearch.js b/public/js/wikisearch.js
@@ -19,7 +19,7 @@ module.exports = {
       },
       queryTokenizer: Bloodhound.tokenizers.whitespace,
       remote: {
-        url: 'http://localhost:3000/wikimaps/findArticles?title=%QUERY',
+        url: 'http://wikigrapher.com/wikimaps/findArticles?title=%QUERY',
         filter: function (articles) {
           // Map the remote source JSsON array to a JavaScript array
           return $.map(articles, function (article) {

diff --git a/routes/wikimaps.js b/routes/wikimaps.js
@@ -33,15 +33,13 @@ router.get('/getArticleInfo', function(req, res) {
   var titleStr = req.query.title;
 
   pg.connect(connectionString, function (err, client, done) {
-    //var query = client.query("SELECT * FROM article WHERE LOWER(title) = LOWER($1)", [titleStr]);
     var query = client.query("SELECT * FROM article WHERE title = $1", [titleStr]);
     query.on('row', function (row) {
       results.push(row);
     });
 
     query.on('end', function () {
       client.end();
-      //var unknownThumbnail = 'http://upload.wikimedia.org/wikipedia/commons/3/37/No_person.jpg';
       var unknownThumbnail = 'https://upload.wikimedia.org/wikipedia/commons/a/ac/No_image_available.svg';
       var links = [];
       if (results[0] && results[0].links) {