Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-23 Thread Sjur Moshagen

Den 19. jun. 2006 kl. 10.03 skrev Sjur N. Moshagen (JIRA):


 [ http://issues.apache.org/jira/browse/FOR-680?page=all ]

Sjur N. Moshagen updated FOR-680:
-

Attachment: updated-wiki-patch.txt

Here's a patch that actually work as intended. I did 'svn up'  
before creating the patch - still, my previous patch applied by  
Ross did not show up. The patch therefore patches the code as it  
was *before* my first patch.


Does anyone of the committers have the time to apply this patch? I'm  
using the corrected XML output from the Wiki plugin to extract iCal  
TODO items, and would like to deploy that feature throughout our  
project organisation. But most of them are not confident installing a  
patch. Thus I would be very happy if the patch could be applied, then  
I can just ask the others to update their svn copy.


I am using the patched code daily, and have seen no problems so far.  
Our lists can be quite complex (within the limits of wiki lists),  
which means that the code has now been tested thoroughly both  
systematically before I sent in the updated patch, and through daily  
use. I'm thus quite confident it works as it should.


I just updated my local copy of HEAD, and the previous patch does not  
seem to be applied. If so, it should be straightforward to apply the  
new patch.


Best regards and thanks for all the good work,
Sjur



Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-23 Thread Ross Gardler

Sjur Moshagen wrote:

Den 19. jun. 2006 kl. 10.03 skrev Sjur N. Moshagen (JIRA):


 [ http://issues.apache.org/jira/browse/FOR-680?page=all ]

Sjur N. Moshagen updated FOR-680:
-

Attachment: updated-wiki-patch.txt

Here's a patch that actually work as intended. I did 'svn up'  before 
creating the patch - still, my previous patch applied by  Ross did not 
show up. The patch therefore patches the code as it  was *before* my 
first patch.



Does anyone of the committers have the time to apply this patch?


Done.

I'm  
using the corrected XML output from the Wiki plugin to extract iCal  
TODO items


This sounds like a really good use case. Any chance of a sample or a 
plugin for this?


Ross


iCal TODO from Wiki documents (was: Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid)

2006-06-23 Thread Sjur Moshagen

Den 23. jun. 2006 kl. 14.18 skrev Ross Gardler:


Does anyone of the committers have the time to apply this patch?


Done.


Thanks!

I'm  using the corrected XML output from the Wiki plugin to  
extract iCal  TODO items


This sounds like a really good use case. Any chance of a sample or  
a plugin for this?


I thought about it, but I was a little reluctant. Not because of any  
licensing issues, but because it presupposes a certain document  
structure. I'll outline the required document structure, and then you  
can comment upon whether it is useful or not.


The document we are creating is a (collaborative) meeting memo, where  
all tasks are collected and added to the end of the document.  
Presently we are collecting the tasks manually from each issue  
discussed during the meeting, but I'm trying to enforce a certain  
style that would allow me to extract and collect all tasks with a  
perl script.


The basic jspwiki structure is:

--- start jspwiki document --
!!!Meeting

!!!Main issue X

text about the issue

!!Subissue

text about the subissue

... all other issues ...

!!!Task Summary

!!Person N

* task 1
* task 2
** subitems/additional info
* task 3

!!Person M

* task 1
...

--- end of jspwiki document --

The resulting XML (Forrest xDoc v. 1.3) will have the following  
structure (tree outline):


--- start xml document --
/document/body/section
   section (each section is a main issue)
   ...
   section
  /title/Task Summary
  /subsection
 /title/Person N
 /ul/li/task 1
/li/task 2
/ul/li/subitems/additional info
--- end of xml document --

For each person in the last section, I'm extracting the tasks and  
creating an iCal calendar with all TODO items.


The last part of my setup is the filename conventions, which I use to  
get the meeting date (from which I calculate the due date:-) and the  
person for which I'm extracting the calendar for:


the meeting file:
Meeting_2006-19-06.jspwiki

the link to the ical file:
Tasks_2006-19-06_Sjur.ics

The link is added to the jspwiki document as a real link within [],  
and the final memo in Forrest will allow single-click download of  
calendar todo-items, with due-date. It even works with non-ASCII  
chars in person names, as long as they are escaped in the link:-)


Known bug:
the ical format requires Windows line endings. I'm on Unix (MacOS),  
and i have no idea how to enforce such line endings in the output/ 
download file from Forrest. Thus, it might be that the resulting  
calendar file is regarded invalid on some systems. It works without  
flaws on MacOS X, though:-)


If you find any of this useful or generalisable in any way, please  
let me know. I would be happy to contribute to the Forrest project!


Best regards,
Sjur



Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-19 Thread Sjur Moshagen

Den 16. jun. 2006 kl. 17.13 skrev Ross Gardler:

Don't be sorry, we all make mistakes. As I did in testing your  
patch before applying it. We value your contribution even if not  
100% correct.


Thanks:-)

I'll leave it as is for now since you say you are working on a  
solution, however, I will reopen the issue so that you can attach  
patches there. If you get distracted with something else let us  
know and we will roll back the commit until you have more time.


I fixed it - and I have tested it extensively and systematically this  
time:-)


The working solution required a slightly different angle than my  
original patch: instead of targeting the wanted element, I needed to  
target the next sibling, and filtering out the unwanted ones (i.e.  
the regular list items on the same level). See the patch for details.


I have also included an updated status.xml in the patch.

The patch will soon arrive in JIRA.

Sjur



[jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-19 Thread Sjur N. Moshagen (JIRA)
 [ http://issues.apache.org/jira/browse/FOR-680?page=all ]

Sjur N. Moshagen updated FOR-680:
-

Attachment: updated-wiki-patch.txt

Here's a patch that actually work as intended. I did 'svn up' before creating 
the patch - still, my previous patch applied by Ross did not show up. The patch 
therefore patches the code as it was *before* my first patch.

I have also added an entry to the plugin's status.xml file. Please change as 
needed/wanted.

The problem with the first patch did not show up with the simple test cases 
found in the example documentation. The following are more complex lists 
(jspwiki fragments) that will display the problem if it ever arises again:

Bulleted list:

* 1 - text = make a bulleted list item with ''1 - text''
* 2 - first level, second item
** 2.1 - next level, first item
** 2.2 - next level - use the numbering to track the level and item nesting
** 2.3 - test
** 2.4 - test
* 3 - test
* 4 - test
** 4.1 - test
** 4.2 - test
*** 4.2.1 - third and final level, first item
*** 4.2.2 - test
*** 4.2.3 - test
*** 4.2.4 - test
** 4.3 - test
* 5 - test

Numbered list:

# 1 - text = make a numbered list item with ''1 - text''
# 2 - first level, second item
## 2.1 - next level, first item
## 2.2 - next level - use the numbering to track the level and item nesting
## 2.3 - test
## 2.4 - test
# 3 - test
# 4 - test
## 4.1 - test
## 4.2 - test
### 4.2.1 - third and final level, first item
### 4.2.2 - test
### 4.2.3 - test
### 4.2.4 - test
## 4.3 - test
# 5 - test


 The jspwiki parser renders nested lists invalid
 ---

  Key: FOR-680
  URL: http://issues.apache.org/jira/browse/FOR-680
  Project: Forrest
 Type: Bug

   Components: Plugin: input.wiki
 Versions: 0.7
  Environment: MacOS X 10.4.2, Java 1.4.2
 Reporter: Sjur N. Moshagen
  Attachments: updated-wiki-patch.txt, wiki-update-diff.txt

 Lists within lists are parsed into an invalid structure. The following input:
 !!!Test title
 Test list:
 * li1
 * li2
 ** li2a
 ** li2b
 ** li2c
 * li3
 comes out as the following xml:
 ?xml version=1.0 encoding=ISO-8859-1?
 !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.1//EN 
 document-v11.dtd
 document
 header
 titletest/title
 /header
 body
 section
 titleTest title/title
 pTest list: /p
   ul
 lili1 /li
 lili2 /li
   ul
 lili2a /li
 lili2b /li
 lili2c /li
   /ul
 lili3 /li
   /ul
 /section
 /body
 /document
 Note that the inner ul is not within the preceding li as required by the 
 dtd, but inserted between to lis.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira



[jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-19 Thread Sjur N. Moshagen (JIRA)
 [ http://issues.apache.org/jira/browse/FOR-680?page=all ]

Sjur N. Moshagen updated FOR-680:
-

Other Info: [Patch available]
   Version: 0.8-dev

 The jspwiki parser renders nested lists invalid
 ---

  Key: FOR-680
  URL: http://issues.apache.org/jira/browse/FOR-680
  Project: Forrest
 Type: Bug

   Components: Plugin: input.wiki
 Versions: 0.7, 0.8-dev
  Environment: MacOS X 10.4.2, Java 1.4.2
 Reporter: Sjur N. Moshagen
  Attachments: updated-wiki-patch.txt, wiki-update-diff.txt

 Lists within lists are parsed into an invalid structure. The following input:
 !!!Test title
 Test list:
 * li1
 * li2
 ** li2a
 ** li2b
 ** li2c
 * li3
 comes out as the following xml:
 ?xml version=1.0 encoding=ISO-8859-1?
 !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.1//EN 
 document-v11.dtd
 document
 header
 titletest/title
 /header
 body
 section
 titleTest title/title
 pTest list: /p
   ul
 lili1 /li
 lili2 /li
   ul
 lili2a /li
 lili2b /li
 lili2c /li
   /ul
 lili3 /li
   /ul
 /section
 /body
 /document
 Note that the inner ul is not within the preceding li as required by the 
 dtd, but inserted between to lis.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira



Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-16 Thread Sjur Moshagen

Den 16. jun. 2006 kl. 01.49 skrev Gav:

Gavin was on the right track with his last comment. Here's a patch  
that

fixes the issue - all nested lists are now correctly nested.


Cool! Good solution, apologies I never got back to this one.


No problem.

Unfortunately, I was happy too early. It turns out that my solution  
isn't working. Although lists are now nested properly inside each  
other the way they should, some list items are repeated several  
times. I'm sorry I didn't test my solution properly before sending in  
the patch - I'm working on a correction now, but I don't know when  
I'm able to finish it.


You may consider rolling back my patch, since the previous, non- 
conformant structure behaved well in all other respects.


Best,
Sjur



Re: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-16 Thread Ross Gardler

Sjur Moshagen wrote:

Den 16. jun. 2006 kl. 01.49 skrev Gav:


...

Unfortunately, I was happy too early. It turns out that my solution  
isn't working. Although lists are now nested properly inside each  other 
the way they should, some list items are repeated several  times. I'm 
sorry I didn't test my solution properly before sending in  the patch - 
I'm working on a correction now, but I don't know when  I'm able to 
finish it.


Don't be sorry, we all make mistakes. As I did in testing your patch 
before applying it. We value your contribution even if not 100% correct.


You may consider rolling back my patch, since the previous, non- 
conformant structure behaved well in all other respects.


I'll leave it as is for now since you say you are working on a solution, 
however, I will reopen the issue so that you can attach patches there. 
If you get distracted with something else let us know and we will roll 
back the commit until you have more time.


Ross


[jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-15 Thread Sjur N. Moshagen (JIRA)
 [ http://issues.apache.org/jira/browse/FOR-680?page=all ]

Sjur N. Moshagen updated FOR-680:
-

Attachment: wiki-update-diff.txt

Gavin was on the right track with his last comment. Here's a patch that fixes 
the issue - all nested lists are now correctly nested.

It also replaces the horisontal bar () with a real hr/ (it used to be a 
long line of dashes).

 The jspwiki parser renders nested lists invalid
 ---

  Key: FOR-680
  URL: http://issues.apache.org/jira/browse/FOR-680
  Project: Forrest
 Type: Bug

   Components: Plugin: input.wiki
 Versions: 0.7
  Environment: MacOS X 10.4.2, Java 1.4.2
 Reporter: Sjur N. Moshagen
  Attachments: wiki-update-diff.txt

 Lists within lists are parsed into an invalid structure. The following input:
 !!!Test title
 Test list:
 * li1
 * li2
 ** li2a
 ** li2b
 ** li2c
 * li3
 comes out as the following xml:
 ?xml version=1.0 encoding=ISO-8859-1?
 !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.1//EN 
 document-v11.dtd
 document
 header
 titletest/title
 /header
 body
 section
 titleTest title/title
 pTest list: /p
   ul
 lili1 /li
 lili2 /li
   ul
 lili2a /li
 lili2b /li
 lili2c /li
   /ul
 lili3 /li
   /ul
 /section
 /body
 /document
 Note that the inner ul is not within the preceding li as required by the 
 dtd, but inserted between to lis.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira



RE: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists invalid

2006-06-15 Thread Gav....


 -Original Message-
 From: Sjur N. Moshagen (JIRA) [mailto:[EMAIL PROTECTED]
 Sent: Thursday, 15 June 2006 11:13 PM
 To: dev@forrest.apache.org
 Subject: [jira] Updated: (FOR-680) The jspwiki parser renders nested lists
 invalid
 
  [ http://issues.apache.org/jira/browse/FOR-680?page=all ]
 
 Sjur N. Moshagen updated FOR-680:
 -
 
 Attachment: wiki-update-diff.txt
 
 Gavin was on the right track with his last comment. Here's a patch that
 fixes the issue - all nested lists are now correctly nested.

Cool! Good solution, apologies I never got back to this one.

Gav...

 
 It also replaces the horisontal bar () with a real hr/ (it used to
 be a long line of dashes).
 
  The jspwiki parser renders nested lists invalid
  ---
 
   Key: FOR-680
   URL: http://issues.apache.org/jira/browse/FOR-680
   Project: Forrest
  Type: Bug
 
Components: Plugin: input.wiki
  Versions: 0.7
   Environment: MacOS X 10.4.2, Java 1.4.2
  Reporter: Sjur N. Moshagen
   Attachments: wiki-update-diff.txt
 
  Lists within lists are parsed into an invalid structure. The following
 input:
  !!!Test title
  Test list:
  * li1
  * li2
  ** li2a
  ** li2b
  ** li2c
  * li3
  comes out as the following xml:
  ?xml version=1.0 encoding=ISO-8859-1?
  !DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.1//EN
 document-v11.dtd
  document
  header
  titletest/title
  /header
  body
  section
  titleTest title/title
  pTest list: /p
ul
  lili1 /li
  lili2 /li
ul
  lili2a /li
  lili2b /li
  lili2c /li
/ul
  lili3 /li
/ul
  /section
  /body
  /document
  Note that the inner ul is not within the preceding li as required by
 the dtd, but inserted between to lis.
 
 --
 This message is automatically generated by JIRA.
 -
 If you think it was sent incorrectly contact one of the administrators:
http://issues.apache.org/jira/secure/Administrators.jspa
 -
 For more information on JIRA, see:
http://www.atlassian.com/software/jira
 
 
 
 --
 No virus found in this incoming message.
 Checked by AVG Free Edition.
 Version: 7.1.394 / Virus Database: 268.9.0/366 - Release Date: 6/15/2006