Sven/GoWiki
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Volltextsuche via blevesearch hinzugefügt

Browse Source
This commit is contained in:
Sven Schmalle
2019-12-17 16:52:54 +01:00
parent e9a1b087b8
commit 5412c07c57
4 changed files with 122 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -16,7 +16,8 @@ Eine `config.json` könnte z.B. wie folgt aussehen:
{
"Host":"http://127.0.0.1",
"Port":"8000",
"DataPath":"./data"
"DataPath":"./data",
"DataPathFTS":"./FTSData"
}
```
@@ -24,7 +25,9 @@ Eine `config.json` könnte z.B. wie folgt aussehen:
Zum kompilieren folgende Go-Abhängigkeiten installieren:
- `go get github.com/gorilla/mux`
- `go get gopkg.in/src-d/go-git.v4`
- 'go get github.com/mandolyte/mdtopdf'
- `go get github.com/mandolyte/mdtopdf`
- `go get github.com/blevesearch/bleve`
Die Build-Scripte liegen im Unterordner `build`

3
config.json
View File

@@ -1,5 +1,6 @@
{
"Host":"http://127.0.0.1",
"Port":"8000",
"DataPath":"./data"
"DataPath":"./data",
"DataPathFTS":"./FTSData"
}

86
main.go
View File

@@ -14,6 +14,7 @@ import (
"strings"
"time"
"github.com/blevesearch/bleve"
"github.com/gorilla/mux"
"github.com/mandolyte/mdtopdf"
"gopkg.in/src-d/go-git.v4"
@@ -23,9 +24,10 @@ import (
var config = readConfig("")
type Configuration struct {
Host string
Port string
DataPath string
Host string
Port string
DataPath string
DataPathFTS string
}
// our main function
@@ -35,6 +37,7 @@ func main() {
fmt.Println("Host: " + config.Host)
fmt.Println("Post: " + config.Port)
fmt.Println("DataPath: " + config.DataPath)
fmt.Println("DataPathFTS: " + config.DataPathFTS)
// DataPath-Verzeichnis anlegen, wenn es noch nicht existiert
if !directoryExists(config.DataPath) {
@@ -64,9 +67,42 @@ func main() {
GitCommit("Initial Wiki Commit")
}
// Volltextsuche
if config.DataPathFTS != "" {
if strings.HasPrefix(config.DataPathFTS, config.DataPath) {
fmt.Println("FTS disabled (Please don´t put the DataPathFTS inside the DataPath)")
} else {
fmt.Println("FTS enabled")
if !directoryExists(config.DataPathFTS) {
fmt.Println("Create new FTS Data in " + config.DataPathFTS)
mapping := bleve.NewIndexMapping()
index, err := bleve.New(config.DataPathFTS, mapping)
check(err)
filepath.Walk(config.DataPath, func(filepath string, info os.FileInfo, err error) error {
tmpPath := strings.Replace(filepath, "\\", "/", -1)
tmpPath = strings.Replace(tmpPath, "data/", "", -1)
if !info.IsDir() && !strings.HasPrefix(tmpPath, ".git") {
b, err := ioutil.ReadFile(path.Join(config.DataPath, tmpPath))
check(err)
err = index.Index(tmpPath, string(b))
check(err)
fmt.Println("Indexed: " + info.Name())
}
return nil
})
index.Close()
}
}
}
router := mux.NewRouter()
router.HandleFunc("/_api/md/{pagename:.*}", getRawPage).Methods("GET")
router.HandleFunc("/_api/pdf/{pagename:.*}", getPDFPage).Methods("GET")
router.HandleFunc("/_api/fts/{searchterm:.*}", getFTS).Methods("GET")
router.HandleFunc("/{pagename:.*}", getHTMLPage).Methods("GET")
router.HandleFunc("/{pagename:.*}", postHTMLPage).Methods("POST")
@@ -202,11 +238,37 @@ func postHTMLPage(w http.ResponseWriter, r *http.Request) {
// Git Commit
GitCommit("Auto-Commit Page: " + pPageName)
// FTS Index
BleveIndex(pPageName)
json.NewEncoder(w).Encode("OK")
}
func getFTS(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
pSearchterm := params["searchterm"]
if config.DataPathFTS != "" {
if directoryExists(config.DataPathFTS) {
index, err := bleve.Open(config.DataPathFTS)
check(err)
query := bleve.NewQueryStringQuery(pSearchterm)
search := bleve.NewSearchRequest(query)
search.Highlight = bleve.NewHighlight()
search.Size = 30
searchResults, err := index.Search(search)
index.Close()
//fmt.Println("SR: " + searchResults.String())
json.NewEncoder(w).Encode(searchResults.Hits)
}
}
}
//--------------------------------------------------------------------------
// Typen
//--------------------------------------------------------------------------
@@ -249,7 +311,7 @@ func directoryExists(filename string) bool {
func readConfig(filename string) *Configuration {
// initialize conf with default values.
conf := &Configuration{Host: "http://127.0.0.1", Port: "8000", DataPath: "./data"}
conf := &Configuration{Host: "http://127.0.0.1", Port: "8000", DataPath: "./data", DataPathFTS: ""}
b, err := ioutil.ReadFile("./config.json")
if err != nil {
@@ -295,3 +357,19 @@ func GitCommit(CommitText string) {
//check(err)
//fmt.Println(obj)
}
func BleveIndex(PageName string) {
if config.DataPathFTS != "" {
if directoryExists(config.DataPathFTS) {
index, err := bleve.Open(config.DataPathFTS)
check(err)
b, err := ioutil.ReadFile(path.Join(config.DataPath, PageName))
check(err)
err = index.Index(PageName, string(b))
check(err)
index.Close()
}
}
}

34
web/index.html
View File

@@ -120,6 +120,11 @@
<li id="btnSavepage"><a href="#" onclick="SavePage()">Save</a></li>
<li id="btnPDFgen"><a href="#" onclick="PDFGen()">PDF</a></li>
</ul>
<form class="navbar-form nav navbar-nav navbar-right" role="search">
<div class="input-group">
<input type="text" class="form-control" placeholder="Search" name="srch-term" id="srch-term">
</div>
</form>
</div><!--/.nav-collapse -->
</div>
</nav>
@@ -224,7 +229,34 @@
}
});
$('#srch-term').keypress(function (e) {
if (e.which == 13) {
//alert($('#srch-term').val());
$.ajax({
method: "GET",
contentType:'application/json; charset=utf-8',
url: '/_api/fts/'+$('#srch-term').val(),
dataType: "json",
data: "",
success: function(content){
html = "<h2> Suche</h2>Der Suchbegriff <b>\""+$('#srch-term').val()+"\"</b> wurde <b>"+content.length +"</b> mal in folgenden Seiten gefunden:<hr>"
//html = MD2HTMLConverter.makeHtml(content+$("#outputsidebar").html());
//console.log(content);
$("#outputdiv").html(html);
$("#outputdiv").show();
content.forEach(function (item, index) {
console.log(item.id);
var page = item.id.replace(/.md/, '');
$("#outputdiv").append("<a href='/"+page+"'>/"+page+"</a><br>");
});
}
});
return false;
}
});
});
function EditPage() {