git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Very primitive, but working, RSS feeds.
[cocanwiki.git]
/
scripts
/
page.ml
diff --git
a/scripts/page.ml
b/scripts/page.ml
index
70c25b3
..
9378107
100644
(file)
--- a/
scripts/page.ml
+++ b/
scripts/page.ml
@@
-1,7
+1,7
@@
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: page.ml,v 1.1
2 2004/09/17 15:24:54
rich Exp $
+ * $Id: page.ml,v 1.1
5 2004/09/20 15:34:36
rich Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-94,14
+94,23
@@
let run r (q : cgi) (dbh : Dbi.connection) hostid {edit_anon=edit_anon} user =
let sections =
sth#map
let sections =
sth#map
- (function [`Int ordering; `String sectionname; `String content;
+ (function [`Int ordering;
+ (`Null | `String _) as sectionname;
+ `String content;
(`Null | `String _) as divname] ->
let divname, has_divname =
match divname with
`Null -> "", false
| `String divname -> divname, true in
(`Null | `String _) as divname] ->
let divname, has_divname =
match divname with
`Null -> "", false
| `String divname -> divname, true in
+ let sectionname, has_sectionname =
+ match sectionname with
+ `Null -> "", false
+ | `String sectionname -> sectionname, true in
+ let linkname = linkname_of_sectionname sectionname in
[ "ordering", Template.VarString (string_of_int ordering);
[ "ordering", Template.VarString (string_of_int ordering);
+ "has_sectionname", Template.VarConditional has_sectionname;
"sectionname", Template.VarString sectionname;
"sectionname", Template.VarString sectionname;
+ "linkname", Template.VarString linkname;
"content",
Template.VarString
(Wikilib.xhtml_of_content dbh hostid content);
"content",
Template.VarString
(Wikilib.xhtml_of_content dbh hostid content);