mirror of
https://github.com/documize/community.git
synced 2025-07-19 13:19:43 +02:00
v3.3.0 release prep
This commit is contained in:
sauls8t
parent
5004e5a85e
commit
74300b009b
4 changed files with 1046 additions and 1211 deletions
|
|
@ -33,130 +33,22 @@ type StoreSQLServer struct {
|
|||
// IndexDocument adds search index entries for document inserting title, tags and attachments as
|
||||
// searchable items. Any existing document entries are removed.
|
||||
func (s StoreSQLServer) IndexDocument(ctx domain.RequestContext, doc doc.Document, a []attachment.Attachment) (err error) {
|
||||
// method := "search.IndexDocument"
|
||||
|
||||
// // remove previous search entries
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("DELETE FROM dmz_search WHERE c_orgid=? AND c_docid=? AND (c_itemtype='doc' OR c_itemtype='file' OR c_itemtype='tag')"),
|
||||
// ctx.OrgID, doc.RefID)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute delete document index entries")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// // insert doc title
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("INSERT INTO dmz_search (c_orgid, c_docid, c_itemid, c_itemtype, c_content) VALUES (?, ?, ?, ?, ?)"),
|
||||
// ctx.OrgID, doc.RefID, "", "doc", doc.Name)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute insert document title entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// // insert doc tags
|
||||
// tags := strings.Split(doc.Tags, "#")
|
||||
// for _, t := range tags {
|
||||
// t = strings.TrimSpace(t)
|
||||
// if len(t) == 0 {
|
||||
// continue
|
||||
// }
|
||||
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("INSERT INTO dmz_search (c_orgid, c_docid, c_itemid, c_itemtype, c_content) VALUES (?, ?, ?, ?, ?)"),
|
||||
// ctx.OrgID, doc.RefID, "", "tag", t)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute insert document tag entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
|
||||
// for _, file := range a {
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("INSERT INTO dmz_search (c_orgid, c_docid, c_itemid, c_itemtype, c_content) VALUES (?, ?, ?, ?, ?)"),
|
||||
// ctx.OrgID, doc.RefID, file.RefID, "file", file.Filename)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute insert document file entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeleteDocument removes all search entries for document.
|
||||
func (s StoreSQLServer) DeleteDocument(ctx domain.RequestContext, ID string) (err error) {
|
||||
// method := "search.DeleteDocument"
|
||||
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("DELETE FROM dmz_search WHERE c_orgid=? AND c_docid=?"),
|
||||
// ctx.OrgID, ID)
|
||||
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute delete document entries")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// }
|
||||
|
||||
return
|
||||
return nil
|
||||
}
|
||||
|
||||
// IndexContent adds search index entry for document context.
|
||||
// Any existing document entries are removed.
|
||||
func (s StoreSQLServer) IndexContent(ctx domain.RequestContext, p page.Page) (err error) {
|
||||
// method := "search.IndexContent"
|
||||
|
||||
// // remove previous search entries
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("DELETE FROM dmz_search WHERE c_orgid=? AND c_docid=? AND c_itemid=? AND c_itemtype='page'"),
|
||||
// ctx.OrgID, p.DocumentID, p.RefID)
|
||||
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute delete document content entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
// err = nil
|
||||
|
||||
// // prepare content
|
||||
// content, err := stringutil.HTML(p.Body).Text(false)
|
||||
// if err != nil {
|
||||
// err = errors.Wrap(err, "search strip HTML failed")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
// content = strings.TrimSpace(content)
|
||||
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("INSERT INTO dmz_search (c_orgid, c_docid, c_itemid, c_itemtype, c_content) VALUES (?, ?, ?, ?, ?)"),
|
||||
// ctx.OrgID, p.DocumentID, p.RefID, "page", content)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute insert section content entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
// err = nil
|
||||
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("INSERT INTO dmz_search (c_orgid, c_docid, c_itemid, c_itemtype, c_content) VALUES (?, ?, ?, ?, ?)"),
|
||||
// ctx.OrgID, p.DocumentID, p.RefID, "page", p.Name)
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute insert section title entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeleteContent removes all search entries for specific document content.
|
||||
func (s StoreSQLServer) DeleteContent(ctx domain.RequestContext, pageID string) (err error) {
|
||||
// method := "search.DeleteContent"
|
||||
|
||||
// // remove all search entries
|
||||
// _, err = ctx.Transaction.Exec(s.Bind("DELETE FROM dmz_search WHERE c_orgid=? AND c_itemid=? AND c_itemtype=?"),
|
||||
// ctx.OrgID, pageID, "page")
|
||||
|
||||
// if err != nil && err != sql.ErrNoRows {
|
||||
// err = errors.Wrap(err, "execute delete document content entry")
|
||||
// s.Runtime.Log.Error(method, err)
|
||||
// return
|
||||
// }
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -302,61 +194,4 @@ SELECT * FROM dmz_doc WHERE CONTAINS(c_name, 'release AND v2.0*');
|
|||
SELECT * FROM dmz_doc WHERE CONTAINS(c_name, 'release AND NOT v2.0*');
|
||||
SELECT * FROM dmz_section WHERE CONTAINS(c_name, 'User');
|
||||
SELECT * FROM dmz_section WHERE CONTAINS(c_body, 'authenticate AND NOT user');
|
||||
|
||||
func (s StoreSQLServer) match(ctx domain.RequestContext, keywords, itemType string) (r []search.QueryResult, err error) {
|
||||
// LIKE clause does not like quotes!
|
||||
keywords = strings.Replace(keywords, "'", "", -1)
|
||||
keywords = strings.Replace(keywords, "\"", "", -1)
|
||||
keywords = strings.Replace(keywords, "%", "", -1)
|
||||
keywords = fmt.Sprintf("%%%s%%", strings.ToLower(keywords))
|
||||
|
||||
// s.c_itemid AS itemid
|
||||
|
||||
sql1 := s.Bind(`SELECT
|
||||
s.id, s.c_orgid AS orgid, s.c_docid AS documentid, s.c_itemid AS itemid, s.c_itemtype AS itemtype,
|
||||
d.c_spaceid as spaceid, COALESCE(d.c_name,'Unknown') AS document, d.c_tags AS tags,
|
||||
d.c_desc AS excerpt, d.c_template AS template, d.c_versionid AS versionid,
|
||||
COALESCE(l.c_name,'Unknown') AS space, d.c_created AS created, d.c_revised AS revised
|
||||
FROM
|
||||
dmz_search s,
|
||||
dmz_doc d
|
||||
LEFT JOIN
|
||||
dmz_space l ON l.c_orgid=d.c_orgid AND l.c_refid = d.c_spaceid
|
||||
WHERE
|
||||
s.c_orgid = ?
|
||||
AND s.c_itemtype = ?
|
||||
AND s.c_docid = d.c_refid
|
||||
AND d.c_spaceid IN
|
||||
(
|
||||
SELECT c_refid FROM dmz_space WHERE c_orgid=? AND c_refid IN
|
||||
(
|
||||
SELECT c_refid from dmz_permission WHERE c_orgid=? AND c_who='user' AND (c_whoid=? OR c_whoid='0') AND c_location='space'
|
||||
UNION ALL
|
||||
SELECT p.c_refid from dmz_permission p LEFT JOIN dmz_group_member r ON p.c_whoid=r.c_groupid WHERE p.c_orgid=? AND p.c_who='role'
|
||||
AND p.c_location='space' AND (r.c_userid=? OR r.c_userid='0')
|
||||
)
|
||||
)
|
||||
AND LOWER(s.c_content) LIKE ?`)
|
||||
|
||||
err = s.Runtime.Db.Select(&r,
|
||||
sql1,
|
||||
ctx.OrgID,
|
||||
itemType,
|
||||
ctx.OrgID,
|
||||
ctx.OrgID,
|
||||
ctx.UserID,
|
||||
ctx.OrgID,
|
||||
ctx.UserID,
|
||||
keywords)
|
||||
|
||||
if err == sql.ErrNoRows {
|
||||
err = nil
|
||||
r = []search.QueryResult{}
|
||||
}
|
||||
if err != nil {
|
||||
err = errors.Wrap(err, "search document")
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@ func main() {
|
|||
// Specify the product edition.
|
||||
rt.Product = domain.Product{}
|
||||
rt.Product.Major = "3"
|
||||
rt.Product.Minor = "2"
|
||||
rt.Product.Minor = "3"
|
||||
rt.Product.Patch = "0"
|
||||
rt.Product.Revision = "190828125836"
|
||||
rt.Product.Revision = "190912103027"
|
||||
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
|
||||
rt.Product.Edition = domain.CommunityEdition
|
||||
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)
|
||||
|
|
|
|||
2084
embed/bindata.go
2084
embed/bindata.go
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "documize",
|
||||
"version": "3.2.0",
|
||||
"version": "3.3.0",
|
||||
"description": "Documize is the Integrated Document Environment (IDE)",
|
||||
"repository": "",
|
||||
"license": "AGPL",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue