building search index from js

3 files changed, 18 insertions, 15 deletions

diff --git a/bucky/search/middleware.js b/bucky/search/middleware.js
index 64ddd28..b9487b1 100644
--- a/bucky/search/middleware.js
+++ b/bucky/search/middleware.js
@@ -5,8 +5,9 @@ var db = require('../db')
 module.exports = {
   
   search: function (req, res, next) {
-    var results = search.search(req.body.query, req.body.start, req.body.limit)
-    res.search = results
+    res.search = search.search(req.query.query, req.query.start, req.query.limit)
+    console.log(res.search)
+
     next()
   },
   
@@ -39,6 +40,6 @@ module.exports = {
 
   success: function(req, res, next){
     res.send(res.search)
-  }
+  },
 
 }
diff --git a/bucky/search/search.js b/bucky/search/search.js
index d6dd8f5..1d06aea 100644
--- a/bucky/search/search.js
+++ b/bucky/search/search.js
@@ -1,10 +1,7 @@
 var db = require('../db')
+var bdb = require('./bdb')
 var STOPWORDS = require('./stopwords')
 
-var bdb_lib = require('berkeleydb')
-var bdb = new bdb_lib.Db()
-bdb.open('./search.db')
-
 var wordRegexp = new RegExp("(\W+)");
 var wordBoundaryRegexp = new RegExp("\W");
 function parse_terms (s) {
@@ -18,9 +15,14 @@ function parse_terms (s) {
 function cmp (a,b){ return (a<b)?a:(a===b)?0:1 }
 
 function find_term(term) {
-  var matches = bdb.get(term).split(",").map((s) => {
+  var res = bdb.get(term).toString()
+  console.log(res)
+  if (! res.length) return []
+  var matches = res.split(",").map((s) => {
+    if (! s.length) return;
+    console.log(s)
     var partz = s.split(" ")
-    var match = {
+    return {
       thread: s[0],
       comment: s[1],
       file: s[2],
@@ -35,7 +37,7 @@ function search (query, start, limit) {
 	start = start || 0;
 	limit = limit || 10;
 	var scores = {};
-	var terms = parse_terms($query);
+	var terms = parse_terms(query);
   var i = 0
   var total
   var to_display = limit
@@ -83,7 +85,7 @@ function search (query, start, limit) {
     results: results,
 		thread_ids: thread_ids,
 		comment_ids: comment_ids,
-		file_ids: $file_ids,
+		file_ids: file_ids,
 		terms: terms,
   };
 }
diff --git a/search/bin/build-index b/search/bin/build-index
index 02866d1..b7fa2fc 100755
--- a/search/bin/build-index
+++ b/search/bin/build-index
@@ -50,10 +50,10 @@ my $file = $bucky->index_filename;
 
 print_timer($timer, "Dumped $file");
 
-system("/bin/mv", "search.db", "search.db.1");
-system("/bin/mv", "$file", "search.db");
-print "OLD: " ; system("/bin/ls", "-l", "./search.db.1");
-print "NEW: " ; system("/bin/ls", "-l", "./search.db");
+system("/bin/mv", "./search/db/search.db", "./search/db/search.db.1");
+system("/bin/mv", "$file", "./search/db/search.db");
+print "OLD: " ; system("/bin/ls", "-l", "./search/db/search.db.1");
+print "NEW: " ; system("/bin/ls", "-l", "./search/db/search.db");
 # system("/usr/bin/perl", "./build-autocomplete");
 exit;