git ssb

10+

Matt McKegg / patchwork



Commit 18d70710f5a43a94ceaf0b17b7cd2dd5000ab1bd

disable ssb-fulltext for now (initial index is too heavy)

Matt McKegg committed on 2/23/2017, 11:58:36 AM
Parent: ccc3aaf96c537fd8d4bd49c144ae90b913ee4cc8

Files changed

modules/page/html/render/search.jschanged
server-process.jschanged
modules/page/html/render/search.jsView
@@ -66,22 +66,32 @@
6666 pull.filter(matchesQuery),
6767 Scroller(container, content, renderMsg, true, false)
6868 )
6969
70 + // pull(
71 + // nextStepper(api.sbot.pull.search, {query: queryStr, reverse: true, limit: 500, live: false}),
72 + // fallback((err) => {
73 + // if (err === true) {
74 + // search.fulltext.isDone.set(true)
75 + // } else if (/^no source/.test(err.message)) {
76 + // search.isLinear.set(true)
77 + // return pull(
78 + // nextStepper(api.sbot.pull.log, {reverse: true, limit: 500, live: false}),
79 + // pull.through((msg) => search.linear.checked.set(search.linear.checked() + 1)),
80 + // pull.filter(matchesQuery)
81 + // )
82 + // }
83 + // }),
84 + // pull.through(() => search.matches.set(search.matches() + 1)),
85 + // Scroller(container, content, renderMsg, false, false)
86 + // )
87 +
88 + // disable full text for now
89 + search.isLinear.set(true)
7090 pull(
71- nextStepper(api.sbot.pull.search, {query: queryStr, reverse: true, limit: 500, live: false}),
72- fallback((err) => {
73- if (err === true) {
74- search.fulltext.isDone.set(true)
75- } else if (/^no source/.test(err.message)) {
76- search.isLinear.set(true)
77- return pull(
78- nextStepper(api.sbot.pull.log, {reverse: true, limit: 500, live: false}),
79- pull.through((msg) => search.linear.checked.set(search.linear.checked() + 1)),
80- pull.filter(matchesQuery)
81- )
82- }
83- }),
91 + nextStepper(api.sbot.pull.log, {reverse: true, limit: 500, live: false}),
92 + pull.through((msg) => search.linear.checked.set(search.linear.checked() + 1)),
93 + pull.filter(matchesQuery),
8494 pull.through(() => search.matches.set(search.matches() + 1)),
8595 Scroller(container, content, renderMsg, false, false)
8696 )
8797
server-process.jsView
@@ -15,9 +15,9 @@
1515 .use(require('scuttlebot/plugins/logging'))
1616 .use(require('scuttlebot/plugins/private'))
1717 .use(require('ssb-links'))
1818 .use(require('ssb-query'))
19- .use(require('ssb-fulltext'))
19 +//.use(require('ssb-fulltext')) // disabled for now
2020
2121 module.exports = function (ssbConfig) {
2222 var context = {
2323 sbot: createSbot(ssbConfig),

Built with git-ssb-web