changeset 1393:e6e054247a58

Disabled debug mode, output GetText as well if GetText2 is not necessary, refactored my CHANGES file.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Mon, 21 Aug 2006 16:09:12 +0200
parents 6b83abc85e83
children 7bad9a3b1c15
files MoinMoin/action/SyncPages.py docs/CHANGES.aschremmer
diffstat 2 files changed, 23 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Mon Aug 21 14:28:53 2006 +0200
+++ b/MoinMoin/action/SyncPages.py	Mon Aug 21 16:09:12 2006 +0200
@@ -30,7 +30,7 @@
 from MoinMoin.util import diff3
 
 
-debug = True
+debug = False
 
 
 # map sync directions
@@ -59,10 +59,17 @@
         table = []
 
         for line in self.status:
-            macro_args = [line[1]] + list(line[2])
-            table.append(table_line % {"smiley": line[0][1], "message":
-                line[1] and (u"[[GetText2(|%s)]]" % (packLine(macro_args), )),
-                "raw_suffix": line[3]})
+            if line[1]:
+                if line[2]:
+                    macro_args = [line[1]] + list(line[2])
+                    message = u"[[GetText2(|%s)]]" % (packLine(macro_args), )
+                else:
+                    message = u"[[GetText(%s)]]" % (line[1], )
+            else:
+                message = u""
+            table.append(table_line % {"smiley": line[0][1],
+                                       "message": message,
+                                       "raw_suffix": line[3]})
 
         return "\n".join(table)
 
--- a/docs/CHANGES.aschremmer	Mon Aug 21 14:28:53 2006 +0200
+++ b/docs/CHANGES.aschremmer	Mon Aug 21 16:09:12 2006 +0200
@@ -8,11 +8,11 @@
       (currently done in Pickle files)
 
   ToDo: (this should not go into CHANGES)
+    * Add authentication to the MoinRemoteWiki methods that are left.
     * Reduce round-trip times by caching queries and using MultiCall objects (coroutines?)
-    * Check what needs to be documented on MoinMaster.
+      
     * Implement a cross-site authentication system, i.e. mainly an
       identity storage. (does OpenID make sense?)
-
     * Maybe refactor YYY into MoinLocalWiki
     * Add page locking, i.e. use the one in the new storage layer (see XXX).
     * Do older tags of one wiki site have to be stored as well? Why don't we
@@ -23,7 +23,6 @@
 
   New Features:
     * Conflict icon in RecentChanges
-    * Binary Diffing
     * New XMLRPC methods (see doc strings for details):
       * getMoinVersion
       * system.multicall -- multicall support
@@ -62,6 +61,7 @@
 
   Other Changes:
     * Refactored conflict resolution and XMLRPC code.
+    * Added a module for binary diffs
 
   Developer notes:
     * There is a new Page method called Page.get_raw_body_str that returns
@@ -69,20 +69,21 @@
       (e.g. while generating binary diffs).
     * The TagStore/PickleTagStore system is used to store the syncronisation tags.
     * XMLRPC functions may return Fault instances
+    * Moin got multicall support, including a module that makes it usable on the
+      client-side without requiring Python 2.4
 
 Do not forget to check the related wiki page: http://moinmoin.wikiwikiweb.de/WikiSyncronisation
 
 Diary
 =====
 
-Week 21: Basic Infrastructur setup (repos),
+Week 21: Basic infrastructure setup (repos),
          initial talks to the mentor, started writing the design document,
          helped other students to get started
-Week 22: Tax forms, Fulfilled transcription request,
+Week 22: Tax forms, fulfilled transcription request,
          written conflict icon support, refactored conflict handling,
-         changed conflict icon,
-         Added xmlrpc multicall support into the server and
-         backported the client code from python 2.4
+         changed conflict icon, added xmlrpc multicall support into the server
+         and backported the client code from Python 2.4
 Week 23: Debian-Sprint in Extremadura, Spain. Initial thoughts about Mercurial as
          a base for syncronisation. (See wiki)
 Week 24: Evaluation of OpenID as a base for authentication, written local testing scripts
@@ -116,7 +117,8 @@
          the prefix and the pageList on the remote side. Finished the direction==DOWN mode.
 Week 33: Started designing the solutions for the other sync cases. Store and transmit the
          normalised name. Implemented preliminary mime type support, only transmission of the mime type
-         and the new storage API is missing. Changed getDiff interface. Detect renamed pages (and choke :).
+         and the new storage API is missing. Changed getDiff interface. Detect renamed pages (and inform
+         the user about the missing support for them).
          Added infrastructure support for detecting deleted pages.
          Reworked i18n and logging support. Added GetText2 macro. Getting syncing of pages
          working that are just available on one side. Working synchronisation of deleted pages.