next.

[hmh/wiki.git] / lib-wikifunc.ml

diff --git a/lib-wikifunc.ml b/lib-wikifunc.ml
index 7d13ca3..ba9309e 100644 (file)
--- a/lib-wikifunc.ml
+++ b/lib-wikifunc.ml
@@ -92,36 +92,41 @@
 )
 
 (defun-wiki-command PageIndex (vpage vtitle)
-       (wiki-page-index nil (wikivar vpage) (wikivar vtitle))
+       ($sqlite3 'database
+               (wiki-page-index nil (wikivar vpage) (wikivar vtitle))
+       )
 )
 
 (defun-wiki-command PageIndexCategory (cat vpage vtitle)
-       (wiki-page-index cat (wikivar vpage) (wikivar vtitle))
+       ($sqlite3 'database
+               (wiki-page-index cat (wikivar vpage) (wikivar vtitle))
+       )
 )
 
 (defun-wiki-command PageIndexSpecial (vpage vtitle)
-       (wiki-page-index-special (wikivar vpage) (wikivar vtitle))
+       ($sqlite3 'database
+               (wiki-page-index-special (wikivar vpage) (wikivar vtitle))
+       )
 )
 
 (defun-wiki-command CategoryIndex (vname)
-       (wiki-category-index (wikivar vname))
+       ($sqlite3 'database
+               (wiki-category-index (wikivar vname))
+       )
 )
 
 (defun-wiki-command AddCategory (cat)
        (if Writer
-                       (wiki-add-category cat)
+                       ($sqlite3 'database
+                               (wiki-add-category cat)
+                       )
        )
 )
 
 (defun-wiki-command DelCategory (cat)
        (if Writer
                ($sqlite3 'database
-                       (sql "begin")
-                       (sql "delete from WikiCategory where CID in (select CID from CategoryList where PID=:pid and CName=:cat)"
-                               :bind ':pid PID ':cat cat)
-                       (sql "delete from CategoryList where PID=:pid and CName=:cat"
-                               :bind ':pid PID ':cat cat)
-                       (sql "end")
+                       (wiki-delete-category cat)
                )
        )
 )