do not need a full rebuild, in order to update any basewiki pages.
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
- fields => [qw(do rcsinfo subpage from page content comments)],
+ fields => [qw(do rcsinfo subpage from page editcontent comments)],
header => 1,
method => 'POST',
validate => {
header => 1,
method => 'POST',
validate => {
- required => [qw{content}],
+ required => [qw{editcontent}],
javascript => 0,
params => $q,
action => $config{cgiurl},
javascript => 0,
params => $q,
action => $config{cgiurl},
$form->field(name => "subpage", type => 'hidden');
$form->field(name => "page", value => "$page", force => 1);
$form->field(name => "comments", type => "text", size => 80);
$form->field(name => "subpage", type => 'hidden');
$form->field(name => "page", value => "$page", force => 1);
$form->field(name => "comments", type => "text", size => 80);
- $form->field(name => "content", type => "textarea", rows => 20,
+ $form->field(name => "editcontent", type => "textarea", rows => 20,
cols => 80);
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
cols => 80);
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
require IkiWiki::Render;
$form->tmpl_param("page_preview",
htmlize($config{default_pageext},
require IkiWiki::Render;
$form->tmpl_param("page_preview",
htmlize($config{default_pageext},
- linkify($page, $page, $form->field('content'))));
+ linkify($page, $page, $form->field('editcontent'))));
}
else {
$form->tmpl_param("page_preview", "");
}
else {
$form->tmpl_param("page_preview", "");
}
elsif ($form->field("do") eq "edit") {
page_locked($page, $session);
}
elsif ($form->field("do") eq "edit") {
page_locked($page, $session);
- if (! defined $form->field('content') ||
- ! length $form->field('content')) {
+ if (! defined $form->field('editcontent') ||
+ ! length $form->field('editcontent')) {
my $content="";
if (exists $pagesources{lc($page)}) {
$content=readfile(srcfile($pagesources{lc($page)}));
$content=~s/\n/\r\n/g;
}
my $content="";
if (exists $pagesources{lc($page)}) {
$content=readfile(srcfile($pagesources{lc($page)}));
$content=~s/\n/\r\n/g;
}
- $form->field(name => "content", value => $content,
+ $form->field(name => "editcontent", value => $content,
force => 1);
}
$form->tmpl_param("page_select", 0);
force => 1);
}
$form->tmpl_param("page_select", 0);
# save page
page_locked($page, $session);
# save page
page_locked($page, $session);
- my $content=$form->field('content');
+ my $content=$form->field('editcontent');
$content=~s/\r\n/\n/g;
$content=~s/\r/\n/g;
writefile($file, $config{srcdir}, $content);
$content=~s/\r\n/\n/g;
$content=~s/\r/\n/g;
writefile($file, $config{srcdir}, $content);
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
$form->tmpl_param("page_conflict", 1);
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
$form->tmpl_param("page_conflict", 1);
- $form->field("content", value => $conflict, force => 1);
+ $form->field("editcontent", value => $conflict, force => 1);
$form->field("do", "edit)");
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
$form->field("do", "edit)");
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
extra_clean:
rm -rf html doc/.ikiwiki
extra_clean:
rm -rf html doc/.ikiwiki
+ rm -f ikiwiki.man ikiwiki-mass-rebuild.man
extra_install:
install -d $(PREFIX)/share/ikiwiki/templates
extra_install:
install -d $(PREFIX)/share/ikiwiki/templates
border-bottom: 1px solid #000;
}
border-bottom: 1px solid #000;
}
(This was slightly complex to do as the link still has to be constructed
relative to the inlining page.)
* Make page edit textarea resize to fit browser window.
(This was slightly complex to do as the link still has to be constructed
relative to the inlining page.)
* Make page edit textarea resize to fit browser window.
+ * Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that
+ do not need a full rebuild, in order to update any basewiki pages.
- -- Joey Hess <joeyh@debian.org> Sat, 27 May 2006 14:28:19 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 27 May 2006 15:01:52 -0400
ikiwiki (1.3) unstable; urgency=low
ikiwiki (1.3) unstable; urgency=low
if [ "$1" = configure ] && \
dpkg --compare-versions "$2" lt "$firstcompat"; then
ikiwiki-mass-rebuild
if [ "$1" = configure ] && \
dpkg --compare-versions "$2" lt "$firstcompat"; then
ikiwiki-mass-rebuild
+else
+ ikiwiki-mass-rebuild -refresh
+# OPTIONS
+
+* -refresh
+
+ Rather than rebuilding all the wikis, just build any changed pages
+ (including pages inherited from the basewiki).
+
# AUTHOR
Joey Hess <joey@kitenet.net>
# AUTHOR
Joey Hess <joey@kitenet.net>
+action=""
+if [ -n "$1" ]; then
+ action="$1"
+fi
+
wikilist=/etc/ikiwiki/wikilist
processline () {
wikilist=/etc/ikiwiki/wikilist
processline () {
if [ ! -f "$setup" ]; then
echo "warning: $setup specified in /etc/ikiwiki/wikilist does not exist, skipping" >&2
else
if [ ! -f "$setup" ]; then
echo "warning: $setup specified in /etc/ikiwiki/wikilist does not exist, skipping" >&2
else
- echo "Rebuilding $setup as user $user ..."
- su "$user" -c "ikiwiki -setup $setup"
+ echo "Processing $setup as user $user ..."
+ su "$user" -c "ikiwiki -setup $setup $action"
<TMPL_VAR FIELD-FROM>
<TMPL_VAR FIELD-RCSINFO>
<TMPL_IF NAME="PAGE_SELECT">
<TMPL_VAR FIELD-FROM>
<TMPL_VAR FIELD-RCSINFO>
<TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE><br />
+Page location: <TMPL_VAR FIELD-PAGE>
<TMPL_VAR FIELD-PAGE>
</TMPL_IF>
<TMPL_VAR FIELD-PAGE>
</TMPL_IF>
-<TMPL_VAR FIELD-CONTENT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
<TMPL_IF NAME="CAN_COMMIT">
Optional comment about this change:<br />
<TMPL_VAR FIELD-COMMENTS><br />
<TMPL_IF NAME="CAN_COMMIT">
Optional comment about this change:<br />
<TMPL_VAR FIELD-COMMENTS><br />