(\{\{\{ ?|\}\}\}))
***************
*** 232,235 ****

--- 233,244 ----
          else:
              return self.formatter.emphasis(self.is_em) + self.formatter.strong(self.is_b)
+ 
+ 
+     def _sup_repl(self, word):
+         """Handle superscript."""
+         self._check_p()
+         return self.formatter.sup(1) + \
+             self.highlight_text(word[1:-1]) + \
+             self.formatter.sup(0)
  
  




From jhermann at users.sourceforge.net  Thu Jan 24 14:31:20 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 14:31:20 2002
Subject: [Moin-devel] CVS: MoinMoin/parser wiki.py,1.69,1.70
Message-ID: 

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv18114

Modified Files:
	wiki.py 
Log Message:
Refactored some common regex strings to their own variables


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** wiki.py	2002/01/24 22:14:55	1.69
--- wiki.py	2002/01/24 22:30:44	1.70
***************
*** 29,35 ****
      """
  
!     ol_rule = r"^\s+[0-9aAiI]\.(?:#\d+)?\s"
!     dl_rule = r"^\s+.*?::\s"
  
      word_rule = r'(?:%(subpages)s[%(u)s][%(l)s]+){2,}' % {
          'u': config.upperletters,
--- 29,39 ----
      """
  
!     # some common strings
!     punct_pattern = re.escape('''"'}]|:,.)?!''')
!     url_pattern = ('http|https|ftp|nntp|news|mailto|telnet|wiki|file' +
!             '|attachment' + 
!             (config.url_schemas and '|' + string.join(config.url_schemas, '|') or ''))
  
+     # some common rules
      word_rule = r'(?:%(subpages)s[%(u)s][%(l)s]+){2,}' % {
          'u': config.upperletters,
***************
*** 37,41 ****
--- 41,54 ----
          'subpages': config.allow_subpages and '/?' or '',
      }
+     url_rule = r'%(url_guard)s(%(url)s)\:([^\s\<%(punct)s]|([%(punct)s][^\s\<%(punct)s]))+' % {
+         'url_guard': ('(^|(?'''''(?=[^']+'''))
  (?P'''''(?=[^']+''))
***************
*** 57,73 ****
  (?P%(word_rule)s)
  (?P\[(%(url)s)\:[^\s\]]+(\s[^\]]+)?\])
! (?P%(url_guard)s(%(url)s)\:([^\s\<%(punct)s]|([%(punct)s][^\s\<%(punct)s]))+)
  (?P[-\w._+]+\@[\w-]+\.[\w.-]+)
  (?P\s(%(smiley)s)\s)
  (?P^(%(smiley)s)\s)
  (?P[<>&])"""  % {
!         'url': 'http|https|ftp|nntp|news|mailto|telnet|wiki|file' +
!             '|attachment' + 
!             (config.url_schemas and '|' + string.join(config.url_schemas, '|') or ''),
!         'url_guard': ('(^|(?%(word_rule)s)
  (?P\[(%(url)s)\:[^\s\]]+(\s[^\]]+)?\])
! (?P%(url_rule)s)
  (?P[-\w._+]+\@[\w-]+\.[\w.-]+)
  (?P\s(%(smiley)s)\s)
  (?P^(%(smiley)s)\s)
  (?P[<>&])"""  % {
!         'url': url_pattern,
!         'punct': punct_pattern,
          'macronames': string.join(wikimacro.names, '|'),
          'ol_rule': ol_rule,
          'dl_rule': dl_rule,
+         'url_rule': url_rule,
          'word_rule': word_rule,
          'smiley': string.join(map(re.escape, wikiutil.smileys.keys()), '|')}




From jhermann at users.sourceforge.net  Thu Jan 24 15:11:11 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:11:11 2002
Subject: [Moin-devel] CVS: dist CHANGES,1.60,1.61
Message-ID: 

Update of /cvsroot/moin/dist
In directory usw-pr-cvs1:/tmp/cvs-serv30251

Modified Files:
	CHANGES 
Log Message:
FootNote macro


Index: CHANGES
===================================================================
RCS file: /cvsroot/moin/dist/CHANGES,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** CHANGES	2002/01/24 22:14:55	1.60
--- CHANGES	2002/01/24 23:10:47	1.61
***************
*** 103,106 ****
--- 103,107 ----
      * Subpages (config.allow_subpages, config.page_icons_up)
      * ^superscript^ markup
+     * `[[FootNote]]` macro
  
  Unfinished features:




From jhermann at users.sourceforge.net  Thu Jan 24 15:11:12 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:11:12 2002
Subject: [Moin-devel] CVS: MoinMoin wikimacro.py,1.30,1.31
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv30251/MoinMoin

Modified Files:
	wikimacro.py 
Log Message:
FootNote macro


Index: wikimacro.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** wikimacro.py	2002/01/14 23:33:20	1.30
--- wikimacro.py	2002/01/24 23:10:47	1.31
***************
*** 18,22 ****
  from MoinMoin import action, config, editlog, macro, user, util
  from MoinMoin import version, wikiutil, wikiaction
! from MoinMoin.Page import Page
  from MoinMoin.i18n import _
  
--- 18,22 ----
  from MoinMoin import action, config, editlog, macro, user, util
  from MoinMoin import version, wikiutil, wikiaction
! from MoinMoin.Page import Page, request
  from MoinMoin.i18n import _
  
***************
*** 70,73 ****
--- 70,74 ----
          self.formatter = self.parser.formatter
          self.form = self.parser.form
+         self.request = request
  
      def execute(self, macro_name, args):




From jhermann at users.sourceforge.net  Thu Jan 24 15:11:13 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:11:13 2002
Subject: [Moin-devel] CVS: MoinMoin/formatter base.py,1.17,1.18 text_html.py,1.33,1.34 text_plain.py,1.13,1.14 text_xml.py,1.21,1.22
Message-ID: 

Update of /cvsroot/moin/MoinMoin/formatter
In directory usw-pr-cvs1:/tmp/cvs-serv30251/MoinMoin/formatter

Modified Files:
	base.py text_html.py text_plain.py text_xml.py 
Log Message:
FootNote macro


Index: base.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/base.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** base.py	2002/01/24 22:14:55	1.17
--- base.py	2002/01/24 23:10:47	1.18
***************
*** 24,27 ****
--- 24,29 ----
      """
  
+     hardspace = ' '
+ 
      def __init__(self, **kw):
          self._store_pagelinks = kw.get('store_pagelinks', 0)

Index: text_html.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_html.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** text_html.py	2002/01/24 22:14:55	1.33
--- text_html.py	2002/01/24 23:10:47	1.34
***************
*** 26,29 ****
--- 26,31 ----
      """
  
+     hardspace = ' '
+ 
      _allowed_table_attrs = {
          'table': ['border', 'cellspacing', 'cellpadding', 'width', 'bgcolor', ],

Index: text_plain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_plain.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** text_plain.py	2002/01/24 22:14:55	1.13
--- text_plain.py	2002/01/24 23:10:47	1.14
***************
*** 22,25 ****
--- 22,27 ----
      """
  
+     hardspace = ' '
+ 
      def __init__(self, **kw):
          apply(FormatterBase.__init__, (self,), kw)

Index: text_xml.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_xml.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** text_xml.py	2002/01/24 22:14:55	1.21
--- text_xml.py	2002/01/24 23:10:47	1.22
***************
*** 29,32 ****
--- 29,34 ----
      """
  
+     hardspace = ' '
+ 
      def __init__(self, **kw):
          apply(FormatterBase.__init__, (self,), kw)




From jhermann at users.sourceforge.net  Thu Jan 24 15:11:15 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:11:15 2002
Subject: [Moin-devel] CVS: MoinMoin/macro FootNote.py,NONE,1.1
Message-ID: 

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv30251/MoinMoin/macro

Added Files:
	FootNote.py 
Log Message:
FootNote macro


--- NEW FILE: FootNote.py ---
"""
    MoinMoin - FootNote Macro

    Copyright (c) 2002 by J?rgen Hermann 
    All rights reserved, see COPYING for details.

    Collect and emit footnotes. Note that currently footnote
    text cannot contain wiki markup.

    $Id: FootNote.py,v 1.1 2002/01/24 23:10:48 jhermann Exp $
"""

# Imports
import string
#from MoinMoin.i18n import _


def execute(macro, args):
    # create storage for footnotes
    if not hasattr(macro.request, 'footnotes'):
        macro.request.footnotes = []


    def anchordef(self, name):
        return '' % name

    def anchorlink(self, name, text):
        return '%s' % (name, cgi.escape(text))

    
    if not args:
        # emit collected footnotes
        if macro.request.footnotes:
            result = ['____']
            for idx in range(len(macro.request.footnotes)):
                result.append(macro.formatter.linebreak(0))
                result.append(macro.formatter.anchordef('moin_footnote%d' % (idx+1)))
                result.append(macro.formatter.code(1))
                result.append(macro.formatter.sup(1))
                result.append(string.replace('%4d ' % (idx+1), ' ', macro.formatter.hardspace))
                result.append(macro.formatter.sup(0))
                result.append(macro.formatter.code(0))
                result.append(macro.request.footnotes[idx])
            macro.request.footnotes = []
            return string.join(result, '')
    else:
        # store footnote and emit number
        macro.request.footnotes.append(args)
        idx = str(len(macro.request.footnotes))
        return "%s%s%s" % (
            macro.formatter.sup(1),
            macro.formatter.anchorlink('moin_footnote' + idx, idx),
            macro.formatter.sup(0),)

    # nothing to do or emit
    return ''





From jhermann at users.sourceforge.net  Thu Jan 24 15:26:03 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:26:03 2002
Subject: [Moin-devel] CVS: MoinMoin Page.py,1.95,1.96
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv2102

Modified Files:
	Page.py 
Log Message:
Auto-emit pending footnotes when page ends


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** Page.py	2002/01/16 22:00:58	1.95
--- Page.py	2002/01/24 23:25:22	1.96
***************
*** 379,382 ****
--- 379,388 ----
              Parser(body).format(self.formatter, form)
  
+             # check for pending footnotes
+             if getattr(request, 'footnotes', None):
+                 from MoinMoin.macro.FootNote import emit_footnotes
+                 print self.formatter.linebreak(0)
+                 print emit_footnotes(request, self.formatter)
+ 
          # end document output
          doc_trailer = self.formatter.endDocument()




From jhermann at users.sourceforge.net  Thu Jan 24 15:26:03 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 24 15:26:03 2002
Subject: [Moin-devel] CVS: MoinMoin/macro FootNote.py,1.1,1.2
Message-ID: 

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv2102/macro

Modified Files:
	FootNote.py 
Log Message:
Auto-emit pending footnotes when page ends


Index: FootNote.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/FootNote.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FootNote.py	2002/01/24 23:10:48	1.1
--- FootNote.py	2002/01/24 23:25:22	1.2
***************
*** 20,47 ****
      if not hasattr(macro.request, 'footnotes'):
          macro.request.footnotes = []
- 
- 
-     def anchordef(self, name):
-         return '' % name
- 
-     def anchorlink(self, name, text):
-         return '%s' % (name, cgi.escape(text))
- 
      
      if not args:
!         # emit collected footnotes
!         if macro.request.footnotes:
!             result = ['____']
!             for idx in range(len(macro.request.footnotes)):
!                 result.append(macro.formatter.linebreak(0))
!                 result.append(macro.formatter.anchordef('moin_footnote%d' % (idx+1)))
!                 result.append(macro.formatter.code(1))
!                 result.append(macro.formatter.sup(1))
!                 result.append(string.replace('%4d ' % (idx+1), ' ', macro.formatter.hardspace))
!                 result.append(macro.formatter.sup(0))
!                 result.append(macro.formatter.code(0))
!                 result.append(macro.request.footnotes[idx])
!             macro.request.footnotes = []
!             return string.join(result, '')
      else:
          # store footnote and emit number
--- 20,26 ----
      if not hasattr(macro.request, 'footnotes'):
          macro.request.footnotes = []
      
      if not args:
!         return emit_footnotes(macro.request, macro.formatter)
      else:
          # store footnote and emit number
***************
*** 54,57 ****
--- 33,55 ----
  
      # nothing to do or emit
+     return ''
+ 
+ 
+ def emit_footnotes(request, formatter):
+     # emit collected footnotes
+     if request.footnotes:
+         result = ['____']
+         for idx in range(len(request.footnotes)):
+             result.append(formatter.linebreak(0))
+             result.append(formatter.anchordef('moin_footnote%d' % (idx+1)))
+             result.append(formatter.code(1))
+             result.append(formatter.sup(1))
+             result.append(string.replace('%4d ' % (idx+1), ' ', formatter.hardspace))
+             result.append(formatter.sup(0))
+             result.append(formatter.code(0))
+             result.append(request.footnotes[idx])
+         request.footnotes = []
+         return string.join(result, '')
+ 
      return ''
  




From jhermann at users.sourceforge.net  Fri Jan 25 02:52:05 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Fri Jan 25 02:52:05 2002
Subject: [Moin-devel] CVS: MoinMoin cgimain.py,1.40,1.41
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv24212/MoinMoin

Modified Files:
	cgimain.py 
Log Message:
Bugfix for subpages and config.allow_extended_names=0


Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** cgimain.py	2002/01/11 20:37:38	1.40
--- cgimain.py	2002/01/25 10:51:53	1.41
***************
*** 169,176 ****
                  Page(query).send_page(request.form, count_hit=1)
              else:
                  import re
!                 word_re_str = r"([%s][%s]+){2,}" % (
!                     config.upperletters, config.lowerletters)
!                 word_match = re.match(word_re_str, query)
                  if word_match:
                      word = word_match.group(0)
--- 169,175 ----
                  Page(query).send_page(request.form, count_hit=1)
              else:
+                 from MoinMoin.parser.wiki import Parser
                  import re
!                 word_match = re.match(Parser.word_rule, query)
                  if word_match:
                      word = word_match.group(0)




From jh at web.de  Fri Jan 25 02:54:02 2002
From: jh at web.de (Juergen Hermann)
Date: Fri Jan 25 02:54:02 2002
Subject: [Moin-devel] CVS msgs
Message-ID: 

Hi!

When someone doesn't want to see the CVS msgs, I can open a special 
list for them.



Ciao, J?rgen

--
J?rgen Hermann, Developer (jhe at webde-ag.de)
WEB.DE AG, http://webde-ag.de/





From brian at dorseys.org  Fri Jan 25 08:30:04 2002
From: brian at dorseys.org (Brian Dorsey)
Date: Fri Jan 25 08:30:04 2002
Subject: [Moin-devel] CVS msgs
In-Reply-To: ; from jh@web.de on Fri, Jan 25, 2002 at 11:53:14AM +0100
References: 
Message-ID: <20020125082954.B16737@dorseys.org>

On Fri, Jan 25, 2002 at 11:53:14AM +0100, Juergen Hermann wrote:
> Hi!
> 
> When someone doesn't want to see the CVS msgs, I can open a special 
> list for them.

I'm enjoying them!

-Brian



From jhermann at users.sourceforge.net  Fri Jan 25 11:05:08 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Fri Jan 25 11:05:08 2002
Subject: [Moin-devel] CVS: MoinMoin/parser wiki.py,1.70,1.71
Message-ID: 

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv7354/parser

Modified Files:
	wiki.py 
Log Message:
Tweaked word rule (Camel/Case is not a valid WikiName)


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** wiki.py	2002/01/24 22:30:44	1.70
--- wiki.py	2002/01/25 19:04:39	1.71
***************
*** 36,40 ****
  
      # some common rules
!     word_rule = r'(?:%(subpages)s[%(u)s][%(l)s]+){2,}' % {
          'u': config.upperletters,
          'l': config.lowerletters,
--- 36,40 ----
  
      # some common rules
!     word_rule = r'(?:%(subpages)s(?:[%(u)s][%(l)s]+){2,})+' % {
          'u': config.upperletters,
          'l': config.lowerletters,




From jhermann at users.sourceforge.net  Sat Jan 26 06:20:03 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Sat Jan 26 06:20:03 2002
Subject: [Moin-devel] CVS: MoinMoin cgimain.py,1.41,1.42
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv22257

Modified Files:
	cgimain.py 
Log Message:
Bug reported by Joo-won Jung 


Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** cgimain.py	2002/01/25 10:51:53	1.41
--- cgimain.py	2002/01/26 14:18:59	1.42
***************
*** 139,143 ****
          # check for non-URI characters and then handle them according to
          # http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.2.1
!         if pagename and sys.prefix[:2] != '1.':
              try:
                  dummy = unicode(pagename, 'ASCII')
--- 139,143 ----
          # check for non-URI characters and then handle them according to
          # http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.2.1
!         if pagename and sys.version[:2] != '1.':
              try:
                  dummy = unicode(pagename, 'ASCII')




From sanori at sanori.net  Sun Jan 27 13:54:02 2002
From: sanori at sanori.net (Joo-won Jung)
Date: Sun Jan 27 13:54:02 2002
Subject: [Moin-devel] MoinMoin on mod_python?
Message-ID: <20020127215253.GA10945@ns.sanori.net>

Hello,

I have made a note to run MoinMoin on mod_python (cgihandler) environment.
	http://www.sanori.net/wiki/moin.py/MoinMoinOnModPython

But, there is some strange pheomenon. (written in that memo)
Does anyone give me a hint to solve those problems?

And, if you try to port MoinMoin on mod_python native(?) environment,
what advantages do you get against cgihandler environment? If you
want to do, do you make a new module in webapi directory?

Thanks in advance.

-Sanori




From knaas at netjets.com  Mon Jan 28 09:53:04 2002
From: knaas at netjets.com (Keith Naas)
Date: Mon Jan 28 09:53:04 2002
Subject: [Moin-devel] CVS: MoinMoin cgimain.py,1.41,1.42
Message-ID: 

If you delete a page and go to the RecentChanges to see the page, then update your bookmark timestamp.  The deleted page will show up with a diff link.  By following the link you will get an exception.  Since the page no longer exists, the diff link should not be there.  Changing to the code below removes the link.  

Bug in RecentChanges.py @line 105

execute(...)
        if not page.exists():
            # indicate page was deleted
            if hilite:
                html_link = '' % (
                    config.url_prefix)






From knaas at netjets.com  Mon Jan 28 09:54:04 2002
From: knaas at netjets.com (Keith Naas)
Date: Mon Jan 28 09:54:04 2002
Subject: [Moin-devel] Problem with RecentChanges & diff link
Message-ID: 

If you delete a page and go to the RecentChanges to see the page, then update your bookmark timestamp.  The deleted page will show up with a diff link.  By following the link you will get an exception.  Since the page no longer exists, the diff link should not be there.  Changing to the code below removes the link.  

Bug in RecentChanges.py @line 105

execute(...)
        if not page.exists():
            # indicate page was deleted
            if hilite:
                html_link = '' % (
                    config.url_prefix)






From jhermann at users.sourceforge.net  Mon Jan 28 12:30:02 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Mon Jan 28 12:30:02 2002
Subject: [Moin-devel] CVS: MoinMoin/macro RecentChanges.py,1.46,1.47
Message-ID: 

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv6400/macro

Modified Files:
	RecentChanges.py 
Log Message:
Don't show diff link for deleted pages


Index: RecentChanges.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/RecentChanges.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** RecentChanges.py	2001/12/10 01:01:51	1.46
--- RecentChanges.py	2002/01/28 20:29:00	1.47
***************
*** 103,107 ****
  
          html_link = ''
!         if hilite and not page.exists():
              # indicate page was deleted
              html_link = '' % (
--- 103,107 ----
  
          html_link = ''
!         if not page.exists():
              # indicate page was deleted
              html_link = '' % (




From jhermann at users.sourceforge.net  Mon Jan 28 12:59:02 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Mon Jan 28 12:59:02 2002
Subject: [Moin-devel] CVS: MoinMoin/parser wiki.py,1.71,1.72
Message-ID: 

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv16199/parser

Modified Files:
	wiki.py 
Log Message:
Handle bracketed page links via _word_repl (unified behaviour)


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** wiki.py	2002/01/25 19:04:39	1.71
--- wiki.py	2002/01/28 20:58:07	1.72
***************
*** 298,304 ****
      def _wikiname_bracket_repl(self, word):
          """Handle special-char wikinames."""
!         self._check_p()
!         wikiname = word[2:-2]
!         return self.formatter.pagelink(wikiname)
  
  
--- 298,302 ----
      def _wikiname_bracket_repl(self, word):
          """Handle special-char wikinames."""
!         return self._word_repl(word[2:-2])
  
  




From jhermann at users.sourceforge.net  Tue Jan 29 12:32:04 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Tue Jan 29 12:32:04 2002
Subject: [Moin-devel] CVS: dist/wiki/data intermap.txt,1.4,1.5
Message-ID: 

Update of /cvsroot/moin/dist/wiki/data
In directory usw-pr-cvs1:/tmp/cvs-serv27743/wiki/data

Modified Files:
	intermap.txt 
Log Message:
SeaPig: changed url


Index: intermap.txt
===================================================================
RCS file: /cvsroot/moin/dist/wiki/data/intermap.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** intermap.txt	2001/12/18 21:03:12	1.4
--- intermap.txt	2002/01/29 20:31:44	1.5
***************
*** 8,12 ****
  OpenWiki http://openwiki.com/?
  PythonFaq http://www.python.org/cgi-bin/faqw.py?req=show&file=faq$PAGE.htp
! SeaPig http://www.zipcon.net/~showell/cgi-bin/MoinMoin/moin.py/
  
  Wiki http://c2.com/cgi/wiki?
--- 8,12 ----
  OpenWiki http://openwiki.com/?
  PythonFaq http://www.python.org/cgi-bin/faqw.py?req=show&file=faq$PAGE.htp
! SeaPig http://www.zipcon.net/~adamf/cgi-bin/MoinMoin/moin.py/
  
  Wiki http://c2.com/cgi/wiki?




From jhermann at users.sourceforge.net  Tue Jan 29 15:36:01 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Tue Jan 29 15:36:01 2002
Subject: [Moin-devel] CVS: MoinMoin editlog.py,1.12,1.13
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv18899

Modified Files:
	editlog.py 
Log Message:
Action-Type in editlog


Index: editlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/editlog.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** editlog.py	2001/12/10 00:54:39	1.12
--- editlog.py	2002/01/29 23:35:57	1.13
***************
*** 62,66 ****
              return "The edit log '%s' is not writable!" % (self.filename,)
  
!     def addEntry(self, pagename, host, mtime, comment):
          """ Add an entry to the editlog """
          import socket
--- 62,66 ----
              return "The edit log '%s' is not writable!" % (self.filename,)
  
!     def addEntry(self, pagename, host, mtime, comment, action="SAVE"):
          """ Add an entry to the editlog """
          import socket
***************
*** 76,80 ****
          logfile = open(self.filename, 'a+')
          entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`,
!                              hostname, user.User().id, comment), "\t") + "\n"
          try:
              # fcntl.flock(logfile.fileno(), fcntl.LOCK_EX)
--- 76,80 ----
          logfile = open(self.filename, 'a+')
          entry = string.join((wikiutil.quoteFilename(pagename), host, `mtime`,
!                              hostname, user.User().id, comment, action), "\t") + "\n"
          try:
              # fcntl.flock(logfile.fileno(), fcntl.LOCK_EX)
***************
*** 117,121 ****
      """
  
!     _NUM_FIELDS = 6
  
      def __init__(self, **kw):
--- 117,121 ----
      """
  
!     _NUM_FIELDS = 7
  
      def __init__(self, **kw):
***************
*** 253,261 ****
  
          self.pagename, self.addr, self.ed_time, self.hostname, \
!             self.userid, self.comment = fields[:self._NUM_FIELDS]
          if not self.hostname:
              self.hostname = self.addr
          self.pagename = wikiutil.unquoteFilename(self.pagename)
          self.ed_time = float(self.ed_time or "0")
  
  
--- 253,263 ----
  
          self.pagename, self.addr, self.ed_time, self.hostname, \
!             self.userid, self.comment, self.action = fields[:self._NUM_FIELDS]
          if not self.hostname:
              self.hostname = self.addr
          self.pagename = wikiutil.unquoteFilename(self.pagename)
          self.ed_time = float(self.ed_time or "0")
+         if not self.action:
+             self.action = 'SAVE'
  
  




From jhermann at users.sourceforge.net  Tue Jan 29 15:36:02 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Tue Jan 29 15:36:02 2002
Subject: [Moin-devel] CVS: MoinMoin/macro RecentChanges.py,1.47,1.48
Message-ID: 

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv18899/macro

Modified Files:
	RecentChanges.py 
Log Message:
Action-Type in editlog


Index: RecentChanges.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/RecentChanges.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** RecentChanges.py	2002/01/28 20:29:00	1.47
--- RecentChanges.py	2002/01/29 23:35:57	1.48
***************
*** 263,266 ****
--- 263,267 ----
          while log.getNextChange():
              if log.dayChanged() and log.daycount > _max_days: break
+             if log.action != 'SAVE': continue
              logdata.append(new.instance(Bag, {
                  'time': log.time_tuple,




From jhermann at users.sourceforge.net  Wed Jan 30 11:28:02 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 11:28:02 2002
Subject: [Moin-devel] CVS: MoinMoin config.py,1.48,1.49 wikiutil.py,1.71,1.72
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv6109

Modified Files:
	config.py wikiutil.py 
Log Message:
Moved  to config.page_footer1


Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** config.py	2002/01/24 21:10:13	1.48
--- config.py	2002/01/30 19:27:03	1.49
***************
*** 135,139 ****
      'page_word_index': 'WordIndex',
  
!     'page_footer1': """""" % (url_prefix,),
--- 135,139 ----
      'page_word_index': 'WordIndex',
  
!     'page_footer1': """
""" % (url_prefix,),

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** wikiutil.py	2002/01/24 21:10:13	1.71
--- wikiutil.py	2002/01/30 19:27:03	1.72
***************
*** 518,522 ****
      import cgi
  
!     print ''
      if config.page_footer1: print config.page_footer1
  
--- 518,522 ----
      import cgi
  
!     print ''
      if config.page_footer1: print config.page_footer1
  




From jhermann at users.sourceforge.net  Wed Jan 30 14:05:03 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 14:05:03 2002
Subject: [Moin-devel] CVS: dist CHANGES,1.61,1.62
Message-ID: 

Update of /cvsroot/moin/dist
In directory usw-pr-cvs1:/tmp/cvs-serv29784

Modified Files:
	CHANGES 
Log Message:
Anchor links


Index: CHANGES
===================================================================
RCS file: /cvsroot/moin/dist/CHANGES,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** CHANGES	2002/01/24 23:10:47	1.61
--- CHANGES	2002/01/30 22:04:11	1.62
***************
*** 75,79 ****
        Chang)
      * New SystemAdmin macro
!     * `[[Anchor(name)]]` macro to insert anchors into a page
      * User option to open editor view via a double-click
      * Added commentary field to editor, recent changes and page info
--- 75,80 ----
        Chang)
      * New SystemAdmin macro
!     * `[[Anchor(anchorname)]]` macro to insert anchors into a page,
!       and [#anchorname Anchor Links].
      * User option to open editor view via a double-click
      * Added commentary field to editor, recent changes and page info




From jhermann at users.sourceforge.net  Wed Jan 30 14:05:04 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 14:05:04 2002
Subject: [Moin-devel] CVS: MoinMoin/parser wiki.py,1.72,1.73
Message-ID: 

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv29784/MoinMoin/parser

Modified Files:
	wiki.py 
Log Message:
Anchor links


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** wiki.py	2002/01/28 20:58:07	1.72
--- wiki.py	2002/01/30 22:04:13	1.73
***************
*** 69,73 ****
  (?P[A-Z][a-zA-Z]+\:[^\s'\"\:\<]([^\s%(punct)s]|([%(punct)s][^\s%(punct)s]))+)
  (?P%(word_rule)s)
! (?P\[(%(url)s)\:[^\s\]]+(\s[^\]]+)?\])
  (?P%(url_rule)s)
  (?P[-\w._+]+\@[\w-]+\.[\w.-]+)
--- 69,73 ----
  (?P[A-Z][a-zA-Z]+\:[^\s'\"\:\<]([^\s%(punct)s]|([%(punct)s][^\s%(punct)s]))+)
  (?P%(word_rule)s)
! (?P\[((%(url)s)\:|#)[^\s\]]+(\s[^\]]+)?\])
  (?P%(url_rule)s)
  (?P[-\w._+]+\@[\w-]+\.[\w.-]+)
***************
*** 306,311 ****
          words = string.split(word[1:-1], None, 1)
          if len(words) == 1: words = words * 2
-         scheme = string.split(words[0], ":", 1)[0]
  
          if scheme == "wiki": return self.interwiki(words, pretty_url=1)
          if scheme == "attachment": return self.attachment(words, pretty_url=1)
--- 306,315 ----
          words = string.split(word[1:-1], None, 1)
          if len(words) == 1: words = words * 2
  
+         if words[0][0] == '#':
+             # anchor link
+             return self.formatter.url(words[0], self.highlight_text(words[1]))
+ 
+         scheme = string.split(words[0], ":", 1)[0]
          if scheme == "wiki": return self.interwiki(words, pretty_url=1)
          if scheme == "attachment": return self.attachment(words, pretty_url=1)
***************
*** 703,707 ****
          eol_re = re.compile(r'\r?\n')
  
!         # get text and replaces TABs
          rawtext = string.expandtabs(self.raw)
  
--- 707,711 ----
          eol_re = re.compile(r'\r?\n')
  
!         # get text and replace TABs
          rawtext = string.expandtabs(self.raw)
  




From jhermann at users.sourceforge.net  Wed Jan 30 14:16:07 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 14:16:07 2002
Subject: [Moin-devel] CVS: MoinMoin Page.py,1.96,1.97
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv2215

Modified Files:
	Page.py 
Log Message:
Fix for titlesearch on subpages


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** Page.py	2002/01/24 23:25:22	1.96
--- Page.py	2002/01/30 22:15:36	1.97
***************
*** 284,291 ****
              # send the page header
              if self.default_formatter:
                  link = '%s/%s?action=fullsearch&value=%s&literal=1' % (
                      webapi.getScriptname(),
                      wikiutil.quoteWikiname(self.page_name),
!                     urllib.quote_plus(self.page_name, ''))
                  title = self.split_title()
                  if self.prev_date:
--- 284,294 ----
              # send the page header
              if self.default_formatter:
+                 page_needle = self.page_name
+                 if config.allow_subpages:
+                     page_needle = '/' + string.split(page_needle, '/')[-1]
                  link = '%s/%s?action=fullsearch&value=%s&literal=1' % (
                      webapi.getScriptname(),
                      wikiutil.quoteWikiname(self.page_name),
!                     urllib.quote_plus(page_needle, ''))
                  title = self.split_title()
                  if self.prev_date:




From jhermann at users.sourceforge.net  Wed Jan 30 15:46:08 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 15:46:08 2002
Subject: [Moin-devel] CVS: MoinMoin/formatter text_html.py,1.34,1.35
Message-ID: 

Update of /cvsroot/moin/MoinMoin/formatter
In directory usw-pr-cvs1:/tmp/cvs-serv8916/formatter

Modified Files:
	text_html.py 
Log Message:
Replace spaces by hardspaces in inline code sections


Index: text_html.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/formatter/text_html.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** text_html.py	2002/01/24 23:10:47	1.34
--- text_html.py	2002/01/30 23:45:42	1.35
***************
*** 43,46 ****
--- 43,47 ----
          apply(FormatterBase.__init__, (self,), kw)
          self._in_li = 0
+         self._in_code = 0
          self._hd_counters = []
          self._base_depth = 0
***************
*** 77,80 ****
--- 78,83 ----
  
      def text(self, text):
+         if self._in_code:
+             return string.replace(cgi.escape(text), ' ', self.hardspace)
          return cgi.escape(text)
  
***************
*** 114,117 ****
--- 117,121 ----
  
      def code(self, on):
+         self._in_code = on
          return ['', ''][not on]
  




From jhermann at users.sourceforge.net  Wed Jan 30 18:10:03 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Wed Jan 30 18:10:03 2002
Subject: [Moin-devel] CVS: dist/wiki/data/text HelpOnInstalling_2fApacheOnUnix,NONE,1.1 HelpOnInstalling,1.3,1.4
Message-ID: 

Update of /cvsroot/moin/dist/wiki/data/text
In directory usw-pr-cvs1:/tmp/cvs-serv3111

Modified Files:
	HelpOnInstalling 
Added Files:
	HelpOnInstalling_2fApacheOnUnix 
Log Message:
New install docs


--- NEW FILE: HelpOnInstalling_2fApacheOnUnix ---
## `jh at localhost:~ > `'''`...`'''[[BR]]
## `...`[[BR]]

'''Index'''
[[TableOfContents]]


== Installation into your home directory ==

Installation into your shell account's home directory is typically used on a host shared by many users and where you are ''not'' the root user. This usually implies that you cannot change the `httpd.conf` file, and also you cannot copy files into the machine's `cgi-bin` and `htdocs` directories. For this situation, Apache includes the `UserDir` directive, which maps all URLs that start with "`/~username`" to a directory in your home directory, where you have write permissions and thus can install MoinMoin.


=== Making sure /~username URLs work ===

This kind of setup can only work if your webmaster has configured the host's Apache server so that the `UserDir` mechanism works. Here's how to check for this: 

 `jh at localhost:~ > `'''`ls -ld public_html`'''[[BR]]
 `drwxr-xr-x   2 jh       users          35 Jan 31 00:29 public_html`[[BR]]

If this does not show a listing like above, then you might need to create the `public_html`directory. Note that this directory must be readable (`r-x`) by the web server.

 `jh at localhost:~ > `'''`lynx -error_file=/dev/stderr -dump http://localhost/~jh/ >/dev/null`'''[[BR]]
 `   URL=http://localhost/~jh/ (GET)`[[BR]]
 `STATUS=HTTP/1.1 200 OK`[[BR]]

You see here that we get a "`200 OK`" status response, which means that you can access your `public_html` area.
If it does not work, you will probably get a "`403 Forbidden`" or a "`404 Not Found`" response. The first one normally indicates that you need to fix the permissions of your home directory (`~`) or your `~/public_html`. But we also need to be able to execute CGI scripts, so we test that, too.

 `jh at localhost:~ > `'''`cat >~/public_html/test.cgi`'''[[BR]]
 '''`#!/bin/sh`'''[[BR]]
 '''`echo Content-Type: text/plain`'''[[BR]]
 '''`echo`'''[[BR]]
 '''`echo IT WORKS`'''[[BR]]
 '''``'''[[BR]]
 `jh at localhost:~ > `'''`chmod a+rx ~/public_html/test.cgi`'''[[BR]]
 `jh at localhost:~ > `'''`lynx -dump http://localhost/~jh/test.cgi`'''[[BR]]
 `IT WORKS`[[BR]]

If you see anything else than "`IT WORKS`", then you are not allowed to execute CGI scripts. How you get that to work is not in the scope of this description, ask your webmaster!

A working Python installation, and a working `diff` command is also assumed.

 `jh at localhost:~ > `'''`python -V`'''[[BR]]
 `Python 2.1`[[BR]]
 `jh at localhost:~ > `'''`diff --version`'''[[BR]]
 `diff - GNU diffutils version 2.7`[[BR]]

(!) The command line examples show your input in '''`bold typewriter`''', and the sample output in `plain typewriter`. The examples use "`jh`" as the user's name, which means you have to replace your own one whereever "`jh`" appears. The same is true for version numbers (`0.11`) and download URLs.


=== Getting the distribution archive and doing the basic installation ===

The following commands will fetch and install the ''nightly CVS tarball'', i.e. the current development version. To get the official distribution version, use an appropriate URL.

 {{{
mkdir ~/tmp
cd ~/tmp
wget http://moin.sf.net/files/moin-0.11.tar.gz
tar xfz moin-0.11.tar.gz
cd moin-0.11
python setup.py --quiet install --home=$HOME --record=install.log
}}}

This will install the MoinMoin software into the directories 
"`~/lib/python/MoinMoin`",
"`~/bin`",
and "`~/share/moin`". You'll find a detailed file list in "`install.log`".


=== Setting up a wiki instance ===

The next step is to create a copy of the wiki data and the config file.
 {{{
mkdir ~/wiki
cd ~/wiki
cp ~/share/moin/cgi-bin/moin_config.py .
cp -r ~/share/moin/data .
chmod -R o+rwX data
vi moin_config.py
}}}

The last command starts the editor, you need to at least change the "`data_dir`" and "`url_prefix`" config values, as you can see in the following diff:
 {{{
@@ -28,4 +28,4 @@
 interwikiname = None
-data_dir = './data/'
-url_prefix = '/wiki'
+data_dir = '/home/jh/wiki/data/'
+url_prefix = '/~jh/wiki'
 logo_url = url_prefix + '/img/moinmoin.gif'
}}}


=== Setting up public_html and testing the installation ===

Now we create the public part of the wiki, which is directly accessible by the web browser. 
 {{{
cd ~/public_html
cp -r ~/share/moin/htdocs wiki
cp ~/share/moin/cgi-bin/*.cgi .
chmod a+rx *.cgi
}}}

To be able to execute the CGI scripts in your home directory, you need to extend Python's path within those scripts, and possibly adapt the ''bang path'' (that is the first line of the script). So, change "`test.cgi`" similarly to this diff:
 {{{
@@ -1,2 +1,2 @@
-#! /usr/bin/env python
+#! /usr/local/bin/python2.1

@@ -12,2 +12,3 @@
 import sys, cgi
+sys.path.extend(['/home/jh/wiki', '/home/jh/lib/python'])
}}}

Finally, you can test your wiki installation by running the ''Moin``Moin CGI Diagnosis'':
 {{{
lynx -dump http://localhost/~jh/test.cgi
}}}

If that test works, adapt your "`moin.cgi`" just like you did for " `test.cgi`":
 {{{
@@ -1,2 +1,2 @@
-#! /usr/bin/env python
+#! /usr/local/bin/python2.1

@@ -11,3 +11,4 @@

-#import sys
+import sys
+sys.path.extend(['/home/jh/wiki', '/home/jh/lib/python'])
 #sys.path.append('/usr/local/home/USERNAME/lib/python')
}}}

And now, your wiki should work and is available at the URL "`http://localhost/~jh/moin.cgi`". Conclude your tests by editing and saving the `FrontPage` and checking out `RecentChanges`, which should reflect that edit.

Index: HelpOnInstalling
===================================================================
RCS file: /cvsroot/moin/dist/wiki/data/text/HelpOnInstalling,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** HelpOnInstalling	2001/12/09 14:33:45	1.3
--- HelpOnInstalling	2002/01/31 02:09:49	1.4
***************
*** 1,115 ****
! HelpContents > HelpOnAdministration > HelpOnInstalling
! 
! == How to install your own MoinMoin wiki ==
! MoinMoin installation instructions can be found in the file '{{{INSTALL}}}' in the directory "{{{moin-}}}''version''" after unpacking the distribution archive. In the web, you can find this file [http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/moin/dist/INSTALL?rev=HEAD&content-type=text/vnd.viewcvs-markup here]. For Windows systems running IIS or PWS, consult [http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/moin/dist/INSTALL.IIS?rev=HEAD&content-type=text/vnd.viewcvs-markup INSTALL.IIS].
! 
!   The INSTALL files describe the installation procedure ''before'' distutils support was added. Below you find new information describing that, but INSTALL still contains old information.
! 
! Also, consult the HelpOnConfiguration and HelpOnUpdating pages for additional information regarding wiki setup and maintenance. MoinMoin:MoinMoinWinCvs describes how to run your wiki using the current development version from the MoinMoin:SourceForge CVS repository.
! 
! (!) The '{{{INSTALL}}}' file suggests making a '''"sane installation"'''. I wrote up my idea of a sane installation in MoinMoin:SaneInstallation  -- Jeff Kunce
! 
! === Basic installation ===
! 
! Before you can integrate MoinMoin into your web environment,
! you have to do the basic installation using the standard Python
! ''distutils'' mechanism. We'll explain the usual steps you need to
! take to do this. For more details on the distutils installation
! process, consult the [http://www.python.org/doc/current/inst/inst.html Installing Python Modules] document of your
! Python manual.
! 
! The first step is to unpack the distribution archive, which you
! have done already when you loaded this instructions from your disk.
! If you read this on the web, the distribution comes in a versioned
! ZIP or TAR archive, which you can unpack in the usual ways, into a
! temporary directory (`/tmp` on UNIX, `C:\TEMP` on Windows). The
! distribution archive will always unpack into a directory named
! `moin-`, for example `moin-0.11`.
! 
! After unpacking, to install into a specific directory (`C:\moin`
! in our example), call `setup.py` after changing your current
! directory to the distribution directory. The following commands
! can be used to complete theses steps:
!     {{{
!     unzip moin-0.11.zip
!     cd moin-0.11
!     python setup.py --quiet install --prefix=C:\moin
! }}}
! 
! This creates the following directories in "C:\moin" (note
! that on a UNIX system, the directory layout will be slightly
! different):
!     {{{
!     MoinMoin
!     MoinMoin/action
!     MoinMoin/formatter
!     MoinMoin/i18n
!     MoinMoin/macro
!     MoinMoin/parser
!     MoinMoin/py15
!     MoinMoin/scripts
!     MoinMoin/support
!     MoinMoin/twisted
!     MoinMoin/webapi
!     Scripts
!     share
!     share/moin
!     share/moin/cgi-bin
!     share/moin/data
!     share/moin/data/backup
!     share/moin/data/cache
!     share/moin/data/pages
!     share/moin/data/plugin
!     share/moin/data/plugin/action
!     share/moin/data/plugin/macro
!     share/moin/data/text
!     share/moin/data/user
!     share/moin/htdocs
!     share/moin/htdocs/css
!     share/moin/htdocs/img
! }}}
! 
! You will likely see the following warning:
! 
!     warning: install: modules installed to 'C:\moin\', which
!     is not in Python's module search path (sys.path) -- you'll
!     have to change the search path yourself 
! 
! This means exactly what it says, you need to add your install
! directory to the search path of Python. There are several ways
! to do this:
! 
!     Environment variable:: Change `PYTHONPATH` in a way that is
!     persistent (`/etc/profile.d` on UNIX, `AUTOEXEC.BAT` on W9x,
!     the `Properties` item in the context menu of `My Computer` on NT4 and
!     W2K)
! 
!     Apache "httpd.conf":: Use the `SetEnv` directive to set
!     `PYTHONPATH` to a suitable value, for example: {{{
!     SetEnv PYTHONPATH "C:\moin"
! }}}
! 
!     "moin.cgi":: Directly add your installation directory to
!     the CGI driver script, like this: {{{
!     import sys
!     sys.path.append('C:/moin')
! }}}
! 
! If you use the following default installation command, MoinMoin
! will be installed to the Python directory:
!     {{{
!     python setup.py --quiet install
! }}}
! 
! You won't need to change your `PYTHONPATH` then, but depending
! on your system environment you might not be able to use that
! command, especially when you are not the root user on a UNIX
! system. If you don't know where your Python directory is, this
! command will tell you:
!     {{{
!     python -c "import sys; print sys.prefix"
! }}}
! 
! The directory structure we showed above will then be created
! in that directory. If you're interested in the exact list of
! files that are installed, use the `--record` option of distutils.
--- 1,139 ----
! HelpContents > HelpOnAdministration > HelpOnInstalling
! 
! [[TableOfContents]]
! 
! == How to install your own MoinMoin wiki ==
! MoinMoin installation instructions of previous versions can be found in the file '{{{INSTALL}}}' in the directory "{{{moin-}}}''version''" after unpacking the distribution archive. In the web, you can find this file [http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/moin/dist/INSTALL?rev=HEAD&content-type=text/vnd.viewcvs-markup here]. For Windows systems running IIS or PWS, consult [http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/moin/dist/INSTALL.IIS?rev=HEAD&content-type=text/vnd.viewcvs-markup INSTALL.IIS]. These INSTALL files describe the installation procedure ''before'' distutils support was added. Below you find new information applying to version 0.11 and up, but INSTALL still contains possibly valuable information.
! 
! Also, consult the HelpOnConfiguration and HelpOnUpdating pages for additional information regarding wiki setup and maintenance. MoinMoin:MoinMoinWinCvs describes how to run your wiki using the current development version from the MoinMoin:SourceForge CVS repository.
! 
! In the next section, there is a list of real-world [#installscenarios Installation Scenarios] that help you to understand how to apply the instructions in different environments.
! 
! Further down the page, [#installbasics Basic Installation] explains the "`setup.py`" step of the installation in more detail. This applies equally too all scenarios, and you should read it before trying a live installation.
! 
! After a successful installation, you might want to read more about configuration and other options that you, as the wiki administrator, can set up. HelpOnAdministration contains links to pages that cover these topics.
! 
! 
! [[Anchor(installscenarios)]]
! === Sample Installation Scenarios ===
! 
! The following subpages will show you concrete examples of installation sessions, showing the commands used and explaining what they do. It is highly recommended that you ''first'' read the general information on installing (especially the next section of this page) before choosing an installation scenario that best fits your intended use of MoinMoin.
! 
! UNIX:
!  * /ApacheOnUnix
! 
! Windows:
!  * /ApacheOnWin32
!  * /InternetInformationServer
! 
! Macintosh:
!  * /ApacheOnMacOsx
! 
! 
! [[Anchor(installbasics)]]
! === Basic Installation ===
! 
! Before you can integrate MoinMoin into your web environment,
! you have to do the basic installation using the standard Python
! ''distutils'' mechanism. We'll explain the usual steps you need to
! take to do this. For more details on the distutils installation
! process, consult the [http://www.python.org/doc/current/inst/inst.html Installing Python Modules] document of your
! Python manual.
! 
! NOTE: You will need the Python Development package installed on unix systems for distutils to work right.
! 
! The first step is to unpack the distribution archive, which you
! have done already when you loaded this instructions from your disk.
! If you read this on the web, the distribution comes in a versioned
! ZIP or TAR archive, which you can unpack in the usual ways, into a
! temporary directory (`/tmp` on UNIX, `C:\TEMP` on Windows). The
! distribution archive will always unpack into a directory named
! `moin-`, for example `moin-0.11`.
! 
! After unpacking, to install into a specific directory (`C:\moin`
! in our example), call `setup.py` after changing your current
! directory to the distribution directory. The following commands
! can be used to complete theses steps:
!     {{{
!     unzip moin-0.11.zip
!     cd moin-0.11
!     python setup.py --quiet install --prefix=C:\moin
! }}}
! 
! This creates the following directories in "C:\moin" (note
! that on a UNIX system, the directory layout will be slightly
! different):
!     {{{
!     MoinMoin
!     MoinMoin/action
!     MoinMoin/formatter
!     MoinMoin/i18n
!     MoinMoin/macro
!     MoinMoin/parser
!     MoinMoin/py15
!     MoinMoin/scripts
!     MoinMoin/support
!     MoinMoin/twisted
!     MoinMoin/webapi
!     Scripts
!     share
!     share/moin
!     share/moin/cgi-bin
!     share/moin/data
!     share/moin/data/backup
!     share/moin/data/cache
!     share/moin/data/pages
!     share/moin/data/plugin
!     share/moin/data/plugin/action
!     share/moin/data/plugin/macro
!     share/moin/data/text
!     share/moin/data/user
!     share/moin/htdocs
!     share/moin/htdocs/css
!     share/moin/htdocs/img
! }}}
! 
! You will likely see the following warning:
! 
!     warning: install: modules installed to 'C:\moin\', which
!     is not in Python's module search path (sys.path) -- you'll
!     have to change the search path yourself 
! 
! This means exactly what it says, you need to add your install
! directory to the search path of Python. There are several ways
! to do this:
! 
!     Environment variable:: Change `PYTHONPATH` in a way that is
!     persistent (`/etc/profile.d` on UNIX, `AUTOEXEC.BAT` on W9x,
!     the `Properties` item in the context menu of `My Computer` on NT4 and
!     W2K)
! 
!     Apache "httpd.conf":: Use the `SetEnv` directive to set
!     `PYTHONPATH` to a suitable value, for example: {{{
!     SetEnv PYTHONPATH "C:\moin"
! }}}
! 
!     "moin.cgi":: Directly add your installation directory to
!     the CGI driver script, like this: {{{
!     import sys
!     sys.path.append('C:/moin')
! }}}
! 
! If you use the following default installation command, MoinMoin
! will be installed to the Python directory:
!     {{{
!     python setup.py --quiet install
! }}}
! 
! You won't need to change your `PYTHONPATH` then, but depending
! on your system environment you might not be able to use that
! command, especially when you are not the root user on a UNIX
! system. If you don't know where your Python directory is, this
! command will tell you:
!     {{{
!     python -c "import sys; print sys.prefix"
! }}}
! 
! The directory structure we showed above will then be created
! in that directory. If you're interested in the exact list of
! files that are installed, use the `--record` option of distutils.




From jhermann at users.sourceforge.net  Thu Jan 31 13:32:05 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 31 13:32:05 2002
Subject: [Moin-devel] CVS: MoinMoin util.py,1.33,1.34
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv13157

Modified Files:
	util.py 
Log Message:
Bugfix for rangelist()


Index: util.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/util.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** util.py	2002/01/31 21:05:27	1.33
--- util.py	2002/01/31 21:31:22	1.34
***************
*** 102,106 ****
          '1,2-5,7'.
      """
-     result = ''
      numbers = numbers[:]
      numbers.sort()
--- 102,105 ----
***************
*** 114,118 ****
          elif numbers[i]+1 != numbers[i+1]:
              pattern = pattern + str(numbers[i]) + ','
!     return result + pattern[1:-1]
  
  
--- 113,120 ----
          elif numbers[i]+1 != numbers[i+1]:
              pattern = pattern + str(numbers[i]) + ','
! 
!     if pattern[-1] in ',-':
!         return pattern[1:-1]
!     return pattern[1:]
  
  




From jhermann at users.sourceforge.net  Thu Jan 31 13:32:30 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 31 13:32:30 2002
Subject: [Moin-devel] CVS: MoinMoin/macro RecentChanges.py,1.49,1.50
Message-ID: 

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv13702/macro

Modified Files:
	RecentChanges.py 
Log Message:
Show editors sorted by their most recent edit


Index: RecentChanges.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/RecentChanges.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** RecentChanges.py	2002/01/31 21:08:33	1.49
--- RecentChanges.py	2002/01/31 21:31:54	1.50
***************
*** 153,159 ****
                      if not counters.has_key(name): counters[name] = []
                      counters[name].append(idx+1)
                  ##buf.write(repr(counters.items()))
!                 for name, positions in counters.items():
!                     buf.write("%s[%s] " % (name, util.rangelist(positions)))
              else:
                  buf.write(log.getEditor())
--- 153,164 ----
                      if not counters.has_key(name): counters[name] = []
                      counters[name].append(idx+1)
+                 poslist = map(None,  counters.values(), counters.keys())
+                 poslist.sort()
                  ##buf.write(repr(counters.items()))
!                 hardspace = ''
!                 for positions, name in poslist:
!                     buf.write("%s%s[%s]
" % (
!                         hardspace, name, util.rangelist(positions)))
!                     hardspace = ' '
              else:
                  buf.write(log.getEditor())




From jeff at corrt.com  Thu Jan 31 14:34:02 2002
From: jeff at corrt.com (Jeff Kunce)
Date: Thu Jan 31 14:34:02 2002
Subject: [Moin-devel] patch for configurable directories
Message-ID: <3.0.2.32.20020131163343.009dcc98@corrt.com>

Here's a little patch to config.py that allows
configurable locations of data subdirectories.


cvs diff config.py (in directory F:\Scratch\moin\MoinMoin\)
Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.49
diff -r1.49 config.py
208,212c208,211
< text_dir = os.path.join(data_dir, 'text')
< user_dir = os.path.join(data_dir, 'user')
< cache_dir = os.path.join(data_dir, 'cache')
< backup_dir = os.path.join(data_dir, 'backup')
< plugin_dir = os.path.join(data_dir, 'plugin')
---
> for dirname in ('text','user','cache','backup','plugin'):
>     varname = dirname + '_dir'
>     if not vars().has_key(varname):
>         vars()[varname] = os.path.join(data_dir, dirname)





From jhermann at users.sourceforge.net  Thu Jan 31 15:08:05 2002
From: jhermann at users.sourceforge.net (J?rgen Hermann)
Date: Thu Jan 31 15:08:05 2002
Subject: [Moin-devel] CVS: MoinMoin config.py,1.49,1.50
Message-ID: 

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv17904

Modified Files:
	config.py 
Log Message:
Allow configurable locations of data subdirectories


Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** config.py	2002/01/30 19:27:03	1.49
--- config.py	2002/01/31 23:07:18	1.50
***************
*** 206,215 ****
  import os
  data_dir = os.path.normpath(data_dir)
- text_dir = os.path.join(data_dir, 'text')
- user_dir = os.path.join(data_dir, 'user')
- cache_dir = os.path.join(data_dir, 'cache')
- backup_dir = os.path.join(data_dir, 'backup')
- plugin_dir = os.path.join(data_dir, 'plugin')
  moinmoin_dir = os.path.abspath(os.path.dirname(__file__))
! del os
  
--- 206,216 ----
  import os
  data_dir = os.path.normpath(data_dir)
  moinmoin_dir = os.path.abspath(os.path.dirname(__file__))
! 
! for _dirname in ('text', 'user', 'cache', 'backup', 'plugin'):
!     _varname = _dirname + '_dir'
!     if not vars().has_key(_varname):
!         vars()[_varname] = os.path.join(data_dir, _dirname)
! 
! del os, _dirname, _varname
  




From jeff at corrt.com  Thu Jan 31 15:22:02 2002
From: jeff at corrt.com (Jeff Kunce)
Date: Thu Jan 31 15:22:02 2002
Subject: [Moin-devel] patch for configurable directories
Message-ID: <3.0.2.32.20020131172112.009dcdd8@corrt.com>

Wow! You were fast on that last patch. Thanks.

Here's another tiny patch. It may need some explanation.
I have some special purpose markups I use on a wiki, so
I need a modified parser. This patch would let me set
a different default parser, so I don't have to put
a #format PI at the top of every page.


cvs diff Page.py config.py (in directory F:\Scratch\moin\MoinMoin\)
Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.97
diff -r1.97 Page.py
191,192c191
<         # default is wiki markup
<         pi_format = "wiki"
---
>         pi_format = config.pi_format_default
Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.50
diff -r1.50 config.py
153a154
>     'pi_format_default': 'wiki',  # default is wiki markup





From kopecjc at att.net  Thu Jan 31 19:35:02 2002
From: kopecjc at att.net (Joseph C. Kopec)
Date: Thu Jan 31 19:35:02 2002
Subject: [Moin-devel] Adding Footnotes to Otherwise Non-Editable Text
Message-ID: <3C5A0B53.1010908@att.net>

Hello.  I am a recent user of MoinMoin and am interested in using it for 
a project in which a core set of documents should be able to be 
footnoted (that is, links should be able to be inserted into them), but 
that should otherwise not be able to be edited.  The pages created as a 
result of the footnoting would be normal, fully-editable wiki pages.  Is 
MoinMoin able to accommodate this?






New Attachment

Nouvel attachement

Attached Files

Attached Files

Attached Files

Fichiers attach?s