users

change to users/Edward_Betts on ikiwiki

2008-09-05T07:44:13Z

Changed pages: users/Edward Betts
Changed by: edward [myopenid.com]
Commit type: web
Date: 03:44:13 09/05/08

also watch discussion

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 9ed438e..0d4483f 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,7 @@
 My watchlist:
 
-[[!inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text todo/structured_page_data" archive="yes" sort="mtime" atom="yes"]]
+[[!inline archive="yes" sort="mtime" atom="yes" pages="
+todo/allow_wiki_syntax_in_commit_messages*
+todo/shortcut_with_different_link_text*
+todo/structured_page_data* "]]

change to users/Edward_Betts on ikiwiki

2008-09-05T07:41:22Z

Changed pages: users/Edward Betts
Changed by: edward [myopenid.com]
Commit type: web
Date: 03:41:22 09/05/08

add todo/structured_page_data

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 69ca043..9ed438e 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,4 @@
 My watchlist:
 
-[[!inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]]
+[[!inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text todo/structured_page_data" archive="yes" sort="mtime" atom="yes"]]

change to todo/structured_page_data/discussion on ikiwiki

2008-09-05T07:36:02Z

Changed pages: todo/structured page data/discussion
Changed by: edward [myopenid.com]
Commit type: web
Date: 03:36:02 09/05/08

How about using JSON?

diff --git a/doc/todo/structured_page_data/discussion.mdwn b/doc/todo/structured_page_data/discussion.mdwn
new file mode 100644
index 0000000..bc7f392
--- /dev/null
+++ b/doc/todo/structured_page_data/discussion.mdwn
@@ -0,0 +1 @@
+How about using JSON? YAML is popular in the Perl world, but the Web 2.0 world seems more excited about using JSON for data serialization. I find it easier to edit JSON by hand than YAML. -- [[Edward|/users/Edward_Betts]]

change to todo/structured_page_data on ikiwiki

2008-09-04T22:32:56Z

Changed pages: todo/structured page data
Changed by: JoshTriplett
Commit type: web
Date: 18:32:56 09/04/08

Expand acronym.

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index 3db7507..16d51f9 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -1,6 +1,6 @@
 This is an idea from [[JoshTriplett]].  --[[Joey]]
 
-Some uses of ikiwiki, such as for a BTS, move a bit away from the wiki end
+Some uses of ikiwiki, such as for a bug-tracking system (BTS), move a bit away from the wiki end
 of the spectrum, and toward storing structured data about a page or instead
 of a page.

change to todo/structured_page_data on ikiwiki

2008-09-04T19:50:23Z

Changed pages: todo/structured page data
Changed by: joey
Commit type: git
Date: 15:50:23 09/04/08

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

change to todo/structured_page_data on ikiwiki

2008-09-04T19:48:56Z

Changed pages: todo/structured page data
Changed by: joey
Commit type: git
Date: 15:48:56 09/04/08

update

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index 7723dab..524bdb8 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -55,3 +55,13 @@ It would be nice if the type implementation code could just use
 FormBuilder, since its automatic form generation, and nice field validation
 model is a perfect match for structured data. But this problem with
 editpage.tmpl would have to be sorted out to allow that.
+
+Additional tie-ins:
+
+* Pagespecs that can select pages with a field with a given value, etc.
+* The search plugin could allow searching for specific fields with specific
+  content. (xapian term search is a good fit).
+
+See also:
+
+[[tracking_bugs_with_dependencies]]

change to todo/structured_page_data on ikiwiki

2008-09-04T19:48:03Z

Changed pages: todo/structured page data
Changed by: JoshTriplett
Commit type: web
Date: 15:48:03 09/04/08

Distinguish between strings and wiki markup.

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index 7723dab..5975615 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -33,7 +33,7 @@ Information about data types would be encoded elsewhere, probably on a
 parent page (using a separate directive). That way, all child pages could
 be forced to have the same fields.
 
-There would be some simple types like select, boolean, multiselect, string.
+There would be some simple types like select, boolean, multiselect, string, wiki markup.
 Probably lists of these (ie, list of strings). Possibly more complex data
 structures.

change to plugins/table/discussion on ikiwiki

2008-09-04T18:48:40Z

Changed pages: plugins/table/discussion
Changed by: joey
Commit type: git
Date: 14:48:40 09/04/08

response

diff --git a/doc/plugins/table/discussion.mdwn b/doc/plugins/table/discussion.mdwn
index 05cdd5f..334acf0 100644
--- a/doc/plugins/table/discussion.mdwn
+++ b/doc/plugins/table/discussion.mdwn
@@ -44,3 +44,12 @@ For centering cell content I need to type `| foo |`. Please note that I used
 only one space for all examples, but in DokuWiki I can use many spaces.
 
 Do you like it? Can you implement the same in Ikiwiki? :) --[[Paweł|ptecza]]
+
+> Multimarkdown has [table support](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/#tables)
+> that includes alignment. (Using colons to control it.) So you can turn on
+> `multimarkdown` in setup to use that.
+> 
+> I'd not mind if someone adds alignment to this plugin. Although the
+> universe of possible table formatting stuff is nearly endless, and at
+> some point it becomes clearer and simpler to just write the table in
+> html.. --[[Joey]]

change to todo/structured_page_data on ikiwiki

2008-09-04T18:35:35Z

Changed pages: todo/structured page data
Changed by: joey
Commit type: git
Date: 14:35:35 09/04/08

idea from josh

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
new file mode 100644
index 0000000..7723dab
--- /dev/null
+++ b/doc/todo/structured_page_data.mdwn
@@ -0,0 +1,57 @@
+This is an idea from [[JoshTriplett]].  --[[Joey]]
+
+Some uses of ikiwiki, such as for a BTS, move a bit away from the wiki end
+of the spectrum, and toward storing structured data about a page or instead
+of a page. 
+
+For example, in a bug report you might want to choose a severity from a
+list, enter a version number, and have a bug submitter or owner recorded,
+etc. When editing online, it would be nice if these were separate fields on
+the form, rather than the data being edited in the big edit form.
+
+There's a tension here between remaining a wiki with human-editable source
+files, containing freeform markup, and more structured data storage. I
+think that it would be best to include the structured data in the page,
+using a directive. Something like:
+
+	part of page content
+	[[data yaml="<arbitrary yaml here>"]]
+	rest of page content 
+
+As long as the position of the directive is not significant, it could be
+stripped out when web editing, the yaml used to generate/populate form fields, 
+and then on save, the directive regenerated and inserted at top/bottom of
+the page.
+
+Josh thinks that yaml is probably a good choice, but the source could be a
+`.yaml` file that contains no directives, and just yaml. An addition
+complication in this scenario is, if the yaml included wiki page formatted content,
+ikiwiki would have to guess or be told what markup language it used.
+
+Either way, the yaml on the page would encode fields and their current content.
+Information about data types would be encoded elsewhere, probably on a
+parent page (using a separate directive). That way, all child pages could
+be forced to have the same fields.
+
+There would be some simple types like select, boolean, multiselect, string.
+Probably lists of these (ie, list of strings). Possibly more complex data
+structures.
+
+It should also be possible for plugins to define new types, and the type
+definitions should include validation of entered data, and how to prompt
+the user for the data.
+
+This seems conceptually straightforward, if possibly quite internally
+complex to handle the more complicated types and validation.
+
+One implementation wrinkle is how to build the html form. The editpage.tmpl
+currently overrides the standard [[cpan CGI::FormBuilder]] generated form,
+which was done to make the edit page be laid out in a nice way. This,
+however, means that new fields cannot be easily added to it using
+[[cpan CGI::FormBuilder]]. The attachment plugin uses the hack of bouilding
+up html by hand and dumping it into the form via a template variable. 
+
+It would be nice if the type implementation code could just use
+FormBuilder, since its automatic form generation, and nice field validation
+model is a perfect match for structured data. But this problem with
+editpage.tmpl would have to be sorted out to allow that.

change to bugs/Filenames_with_colons_cause_problems_for_Windows_users on ikiwiki

2008-09-04T18:13:10Z

Changed pages: bugs/Filenames with colons cause problems for Windows users
Changed by: joey
Commit type: git
Date: 14:13:10 09/04/08

For fine control over what characters are allowed, unescaped in source filenames, the wiki_file_chars setting is added. For example, set to "-[:alnum:]+/._" to disable colons from being used in source files (which can cause trouble om Windows).

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 64ef658..7553ae3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -312,9 +312,15 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 1,
 	},
+	wiki_file_chars => {
+		type => "string",
+		description => "specifies the characters that are allowed in source filenames",
+		default => "-[:alnum:]+/.:_",
+		safe => 0,
+		rebuild => 1,
+	},
 	wiki_file_regexp => {
 		type => "internal",
-		default => qr/(^[-[:alnum:]_.:\/+]+$)/,
 		description => "regexp of legal source files",
 		safe => 0,
 		rebuild => 1,
@@ -413,6 +419,10 @@ sub checkconfig () { #{{{
 			$gettext_obj=undef;
 		}
 	}
+		
+	if (! defined $config{wiki_file_regexp}) {
+		$config{wiki_file_regexp}=qr/(^[$config{wiki_file_chars}]+$)/;
+	}
 
 	if (ref $config{ENV} eq 'HASH') {
 		foreach my $val (keys %{$config{ENV}}) {
@@ -770,7 +780,7 @@ sub bestlink ($$) { #{{{
 		elsif (exists $pagecase{lc $l}) {
 			return $pagecase{lc $l};
 		}
-	} while $cwd=~s!/?[^/]+$!!;
+	} while $cwd=~s{/?[^/]+$}{};
 
 	if (length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
@@ -808,13 +818,16 @@ sub pagetitle ($;$) { #{{{
 
 sub titlepage ($) { #{{{
 	my $title=shift;
-	$title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
+	# support use w/o %config set
+	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
+	$title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
 sub linkpage ($) { #{{{
 	my $link=shift;
-	$link=~s/([^-[:alnum:]:+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
+	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
+	$link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $link;
 } #}}}
 
diff --git a/debian/changelog b/debian/changelog
index 590e066..6565d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ ikiwiki (2.63) UNRELEASED; urgency=low
     if no mime type is detected.
   * table: Support header=column to make the table header be the first
     column of the data. (AlexandreDupas)
+  * For fine control over what characters are allowed, unescaped in source filenames,
+    the wiki_file_chars setting is added. For example, set to "-[:alnum:]+/._" to
+    disable colons from being used in source files (which can cause trouble
+    om Windows).
 
  -- Joey Hess <joeyh@debian.org>  Thu, 28 Aug 2008 16:08:18 -0400
 
diff --git a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
index 8460f0c..0fccd1d 100644
--- a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
+++ b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
@@ -60,6 +60,11 @@ Windows does not support filenames containing any of these characters: `/ \ * :
 >>> source on windows systems is desired, you'd have to remember to turn
 >>> that on when setting up a wiki, even if the wiki was hosted on unix.
 >>>
+>>> Ok, `wiki_file_chars` config option added, set to 
+>>> `"-[:alnum:]+/._"` to exclude colons from filenames read or written by
+>>> ikiwiki. [[done]]
+>>> 
 >>> BTW, I suspect there are lots of other problems with actually running
 >>> ikiwiki on windows, including its assumption that the directory
->>> separator is "/". --[[Joey]]
+>>> separator is "/". Windows will be supported when someone sends me a
+>>> comprehansive and not ugly or performance impacting patch. :-) --[[Joey]]
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 15eab39..cf19ba4 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-28 13:05-0400\n"
+"POT-Creation-Date: 2008-09-04 14:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,62 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../IkiWiki/CGI.pm:139
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:171
+#: ../IkiWiki/CGI.pm:172
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189 ../IkiWiki/CGI.pm:538
+#: ../IkiWiki/CGI.pm:190 ../IkiWiki/CGI.pm:539
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:210
+#: ../IkiWiki/CGI.pm:211
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:211
+#: ../IkiWiki/CGI.pm:212
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:212
+#: ../IkiWiki/CGI.pm:213
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:279
+#: ../IkiWiki/CGI.pm:280
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:338
+#: ../IkiWiki/CGI.pm:339
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:449 ../IkiWiki/Plugin/brokenlinks.pm:33
+#: ../IkiWiki/CGI.pm:450 ../IkiWiki/Plugin/brokenlinks.pm:33
 #: ../IkiWiki/Plugin/inline.pm:310 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:78
 #: ../IkiWiki/Render.pm:148
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:505
+#: ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:523 ../IkiWiki/CGI.pm:551 ../IkiWiki/CGI.pm:561
-#: ../IkiWiki/CGI.pm:596 ../IkiWiki/CGI.pm:641
+#: ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:552 ../IkiWiki/CGI.pm:562
+#: ../IkiWiki/CGI.pm:597 ../IkiWiki/CGI.pm:642
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:666
+#: ../IkiWiki/CGI.pm:667
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:783 ../IkiWiki/CGI.pm:784 ../IkiWiki.pm:1117
+#: ../IkiWiki/CGI.pm:784 ../IkiWiki/CGI.pm:785 ../IkiWiki.pm:1132
 msgid "Error"
 msgstr ""
 
@@ -673,11 +673,11 @@ msgstr ""
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:101
+#: ../IkiWiki/Plugin/table.pm:100
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:135
+#: ../IkiWiki/Plugin/table.pm:134
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
@@ -865,20 +865,20 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 

(Diff truncated)