summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--bucky/app/index.js2
-rw-r--r--bucky/app/router.js10
-rw-r--r--bucky/search/search.js2
-rw-r--r--package-lock.json37
-rwxr-xr-xsearch/bin/build-index12
-rwxr-xr-xsearch/bin/poetaster33
-rw-r--r--search/lib/Bucky/DB.pm4
-rw-r--r--search/lib/Bucky/Search.pm2
9 files changed, 57 insertions, 49 deletions
diff --git a/.gitignore b/.gitignore
index dc9b0e0..94b4c80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ dist
*.sql
.env
public/data
+.my.cnf
+search.db
+search.db.1
+
diff --git a/bucky/app/index.js b/bucky/app/index.js
index 03c5593..1231914 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -27,7 +27,7 @@ site.init = function(){
app.set('views', path.join(__dirname, '../../views'))
app.use(express.static(path.join(__dirname, '../../public')))
- app.use(favicon(__dirname + '../../public/favicon.ico'))
+ app.use(favicon(__dirname + '../../../public/favicon.ico'))
app.use(bodyParser.json())
app.use(bodyParser.urlencoded({ extended: false }))
app.use( multer({ dest:'./uploads/' }).single("file") )
diff --git a/bucky/app/router.js b/bucky/app/router.js
index a87e1ec..fde4278 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -1,9 +1,9 @@
-var auth = require('./auth')
-var middleware = require('./middleware')
-var fortune = require('./fortune')
+var auth = require('../util/auth')
+var middleware = require('../util/middleware')
+var fortune = require('../db/fortune')
var bucky = require('./bucky')
-var db = require('./db')
-var util = require('./util')
+var db = require('../db')
+var util = require('../util/util')
var search = require('../search/middleware')
module.exports = function(app){
diff --git a/bucky/search/search.js b/bucky/search/search.js
index afa9609..d6dd8f5 100644
--- a/bucky/search/search.js
+++ b/bucky/search/search.js
@@ -3,7 +3,7 @@ var STOPWORDS = require('./stopwords')
var bdb_lib = require('berkeleydb')
var bdb = new bdb_lib.Db()
-bdb.open('search.db')
+bdb.open('./search.db')
var wordRegexp = new RegExp("(\W+)");
var wordBoundaryRegexp = new RegExp("\W");
diff --git a/package-lock.json b/package-lock.json
index f0a494e..f72a252 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -372,6 +372,11 @@
"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.3.3.tgz",
"integrity": "sha1-prq7Z4FdcZBpSvS6gv4GXlbV8Oc="
},
+ "etag": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+ },
"express": {
"version": "4.13.3",
"resolved": "https://registry.npmjs.org/express/-/express-4.13.3.tgz",
@@ -777,6 +782,11 @@
}
}
},
+ "fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+ },
"knex": {
"version": "0.8.6",
"resolved": "https://registry.npmjs.org/knex/-/knex-0.8.6.tgz",
@@ -1212,6 +1222,11 @@
}
}
},
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ },
"multer": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/multer/-/multer-1.0.3.tgz",
@@ -1544,6 +1559,11 @@
"resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
"integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
},
+ "parseurl": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+ "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+ },
"passport": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/passport/-/passport-0.3.0.tgz",
@@ -1580,6 +1600,23 @@
}
}
},
+ "safe-buffer": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+ },
+ "serve-favicon": {
+ "version": "2.4.5",
+ "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz",
+ "integrity": "sha512-s7F8h2NrslMkG50KxvlGdj+ApSwaLex0vexuJ9iFf3GLTIp1ph/l1qZvRe9T9TJEYZgmq72ZwJ2VYiAEtChknw==",
+ "requires": {
+ "etag": "1.8.1",
+ "fresh": "0.5.2",
+ "ms": "2.0.0",
+ "parseurl": "1.3.2",
+ "safe-buffer": "5.1.1"
+ }
+ },
"sessionstore": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/sessionstore/-/sessionstore-1.2.5.tgz",
diff --git a/search/bin/build-index b/search/bin/build-index
index b838924..02866d1 100755
--- a/search/bin/build-index
+++ b/search/bin/build-index
@@ -1,6 +1,6 @@
#!/usr/bin/perl
use strict;
-use lib "../lib";
+use lib "./search/lib";
use Bucky;
use DB_File;
#require Time::Stopwatch;
@@ -50,11 +50,11 @@ my $file = $bucky->index_filename;
print_timer($timer, "Dumped $file");
-print "NEW: " ; system("/bin/ls", "-l", "./$file");
-print "OLD: " ; system("/bin/ls", "-l", "../cgi-bin/$file");
-system("/bin/mv", "../cgi-bin/$file", "../cgi-bin/$file.1");
-system("/bin/cp", "./$file", "../cgi-bin/$file");
-system("/usr/bin/perl", "./build-autocomplete");
+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("/usr/bin/perl", "./build-autocomplete");
exit;
sub parse_terms
diff --git a/search/bin/poetaster b/search/bin/poetaster
deleted file mode 100755
index fe973a5..0000000
--- a/search/bin/poetaster
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/perl
-use lib "../lib";
-use Rest;
-use CGI;
-use Poetaster;
-
-my $file = $ARGV[0] || "twain";
-my $data = load_data($file);
-$data =~ s/<[^>]+>//g;
-$data =~ s/\r\n/ /g;
-$data =~ s/\s+/ /g;
-$data =~ s/\. \. \. /... /g;
-my $self = new Poetaster;
-my $poem = $self->poem($data);
-print $poem;
-
-sub load_data
- {
- my ($file) = @_;
- my $data = '';
- if ($file =~ /^http/)
- {
- $data = Rest->new->rest_get_raw($file);
- }
- else
- {
- local $/;
- open F, $file;
- $data = <F>;
- close F;
- }
- return $data;
- }
diff --git a/search/lib/Bucky/DB.pm b/search/lib/Bucky/DB.pm
index 1e33b32..1f0f99e 100644
--- a/search/lib/Bucky/DB.pm
+++ b/search/lib/Bucky/DB.pm
@@ -166,10 +166,10 @@ sub dsn
return $self->{_dsn};
}
sub db_name
- { 'bucky' }
+ { 'bucky3' }
sub db_host
{ 'localhost' }
sub my_cnf
- { '/var/www/vhosts/carbonpictures.com/.my.cnf' }
+ { './.my.cnf' }
1;
diff --git a/search/lib/Bucky/Search.pm b/search/lib/Bucky/Search.pm
index e01d55a..c3516a1 100644
--- a/search/lib/Bucky/Search.pm
+++ b/search/lib/Bucky/Search.pm
@@ -32,7 +32,7 @@ sub index_close
untie %$index;
}
sub index_filename
- { "gross.db" }
+ { "search_init.db" }
sub auto_index
{
my ($self, $auto_index) = @_;
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 07:37:54 +0000