many updates

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@227 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5SyncML/Subscription.py

@@ -29,11 +29,13 @@
 from Globals import PersistentMapping
 from time import gmtime,strftime # for anchors
 from SyncCode import SyncCode
+from Products.CMFCore.utils import getToolByName
+from Acquisition import Implicit, aq_base
 from zLOG import LOG
 
 import md5
 
-class Conflict(SyncCode):
+class Conflict(SyncCode, Implicit):
   """
     object_path : the path of the obect
     keyword : an identifier of the conflict
@@ -118,6 +120,21 @@ class Conflict(SyncCode):
     except TypeError: # It happens when we try to store StringIO
       self.remote_value = None
 
+  def applyLocalValue(self):
+    """
+      after a conflict resolution, we have decided
+      to keep the local version of this object
+    """
+    p_sync = getToolByName(self,'portal_synchronizations')
+    p_sync.applyLocalValue(self)
+
+  def applyRemoteValue(self):
+    """
+    get the domain
+    """
+    p_sync = getToolByName(self,'portal_synchronizations')
+    p_sync.applyRemoteValue(self)
+
   def setDomain(self, domain):
     """
     set the domain
@@ -148,18 +165,6 @@ class Conflict(SyncCode):
     """
     self.domain_id = domain_id
 
-  def applyRemoteValue():
-    """
-    We will take the remote value for this conflict
-    """
-    pass
-
-  def applyLocalValue():
-    """
-    We will take the local value for this conflict
-    """
-    pass
-
 class Signature(SyncCode):
   """
     status -- SENT, CONFLICT...
@@ -179,7 +184,6 @@ class Signature(SyncCode):
     self.partial_xml = None
     self.action = None
     self.setTempXML(None)
-    self.setTempXML(None)
     self.resetConflictList()
     self.md5_string = None
     self.force = 0
@@ -351,23 +355,39 @@ class Signature(SyncCode):
     Return the actual action for a partial synchronization
     """
     LOG('setConflictList, list',0,conflict_list)
-    if conflict_list is None:
+    if conflict_list is None or conflict_list==[]:
       self.resetConflictList()
     else:
-      new_conflict_list = []
+      #new_conflict_list = []
       # If two conflicts are on the same objects, then
       # we join them, so we have a conflict with many xupdate
-      for conflict in conflict_list:
-        found = None
-        for n_conflict in new_conflict_list:
-          if n_conflict.getObjectPath() == conflict.getObjectPath():
-            found = n_conflict
-        LOG('setConflictList, found',0,found)
-        if found == None:
-          new_conflict_list += [conflict]
+#       for conflict in conflict_list:
+#         found = None
+#         for n_conflict in new_conflict_list:
+#           if n_conflict.getObjectPath() == conflict.getObjectPath():
+#             found = n_conflict
+#         LOG('setConflictList, found',0,found)
+#         if found == None:
+#           new_conflict_list += [conflict]
+#         else:
+#           n_conflict.setXupdate(conflict.getXupdateList())
+      #self.conflict_list = new_conflict_list
+      self.conflict_list = conflict_list
+
+  def delConflict(self, conflict):
+    """
+    Return the actual action for a partial synchronization
+    """
+    LOG('delConflict, conflict',0,conflict)
+    conflict_list = []
+    for c in self.getConflictList():
+      LOG('delConflict, c==conflict',0,c==aq_base(conflict))
+      if c != aq_base(conflict):
+        conflict_list += [c]
+    if conflict_list != []:
+      self.setConflictList(conflict_list)
     else:
-          n_conflict.setXupdate(conflict.getXupdateList())
-      self.conflict_list = new_conflict_list
+      self.resetConflictList()
 
 class Subscription(SyncCode):
   """

product/ERP5SyncML/SyncCode.py

@@ -70,7 +70,8 @@ class SyncCode(Persistent):
   #ENCODING='iso-8859-1'
 
 
-  NOT_EDITABLE_PROPERTY = ('id','object','uid','xupdate:element','workflow_history',
+  action_tag = 'workflow_action'
+  NOT_EDITABLE_PROPERTY = ('id','object','uid','xupdate:element',action_tag,
                            'xupdate:attribute','local_role')
   XUPDATE_INSERT =        ('xupdate:insert-after','xupdate:insert-before')
   XUPDATE_ADD =           ('xupdate:append',)
@@ -87,12 +88,13 @@ class SyncCode(Persistent):
   dict_type_list = ('dict',)
   pickle_type_list = ('pickle',)
   xml_object_tag = 'object'
-  history_tag = 'workflow_history'
+  #history_tag = 'workflow_history'
+  history_tag = 'workflow_action'
   local_role_tag = 'local_role'
   local_role_list = (local_role_tag,'/'+local_role_tag)
-  action_tag = 'workflow_action'
   ADDABLE_PROPERTY = (local_role_tag,history_tag)
   sub_object_exp = "/object\[@id='.*'\]/object\[@id='.*'\]"
   object_exp = "/object\[@id='.*'\]"
   sub_sub_object_exp = "/object\[@id='.*'\]/object\[@id='.*'\]/object\[@id='.*'\]"
-  history_exp = "/object\[@id='.*'\]/%s\[@id='.*'\]" % history_tag
+  history_exp = "/%s\[@id='.*'\]" % history_tag
+  bad_history_exp = "/%s\[@id='.*'\]/" % history_tag

product/ERP5SyncML/Synchronisation.txt

@@ -143,10 +143,6 @@ Details
             data must specify the DTD used.
 
 
-        //4 The master updates is database with the objects from the client. Then
-        //the master generate an xml file of differences between the two databases (tricky if
-        //at the beginning the client don't have any data), differences only all objects 
-        //corresponding to the query.
         At this step, we may eventually record the subscriber in the publication
         of the master database for... (OPTION). This is like
         the subscribtion is becoming member of mail list to be informed of

product/ERP5SyncML/conflict.txt

@@ -73,23 +73,27 @@ Conflict management with n clients, n >= 2
        I guess the best way is to just solve conflict one by one, then we are still
        free to make another method wich solve for all versions by the same time.
      - So we have to do :
-       Conflict2.manageRemoteObject()
-       Conflict1.manageLocalObject() # wich is the version of D because of the previous call
-       Conflict3.manageLocalObject()
-       Conflict4.manageLocalObject()
+       Conflict2.setRemoteObject()
+       Conflict1.setLocalObject() # wich is the version of D because of the previous call
+       Conflict3.setLocalObject()
+       Conflict4.setLocalObject()
      - May be we can do a global method, like :
-       Conflict2.manageGlobalRemoteObject() wich implicitly call
-         Conflict1.manageLocalObject()
-       and Conflict3.manageGlobalLocalObject() wich implicitly call
-         Conflict4.manageLocalObject()
-     - Conflict2.manageRemoteObject() have to apply all xupdate strings stored
-       in Conflict2
-     - Conflict3.manageLocalObject() have to set the status as SYNCHRONIZED and then
-       it has to delete itself (Conflict3) -> How ??
-         Probably the best way is to call the synchronizationTool wich know everything
+       Conflict2.setGlobalRemoteObject() wich implicitly call
+         Conflict1.setLocalObject()
+       and Conflict3.setGlobalLocalObject() wich implicitly call
+         Conflict4.setLocalObject()
+     - Conflict2.setRemoteObject() have to apply all xupdate strings stored
+       in Conflict2. Then it have to set the status as CONFLICT_CLIENT_WIN.
+     - Conflict3.setLocalObject() have to set the status as CONFLICT_MERGE. How ??
+         - Probably the best way is to call the synchronizationTool wich know everything
          about subscription and subscriber.
+         - synchronizationtool.setLocalObject should have  as parameter: the conflict (wich
+           store the subscriber), that's all
+         - then we can look at the signature of the object, delete the corresponding
+           Conflict, and if there is no conflict left, then we can set the signature
+           as CONFLICT_MERGE
      - At this state, we do have the /w/x/truc of D, and the /w/x/machin of B, and
        there is no conflict left, at least on the server side.
-     - at the time of the next synchronization, the server should send is new version
+     #- at the time of the next synchronization, the server should send is new version
        of /w/x/truc and /w/x/machin to B, C and D, so that everyone is synchronized
        without conflict.

product/ERP5SyncML/dtml/manageConflicts.dtml

@@ -40,11 +40,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
     <th align="left" valign="top">Local Value</th>
     <th align="left" valign="top">Remote Value</th>
   </tr>
-  <dtml-in getConflictList>
+  <dtml-in prefix="loop" expr="getConflictList()">
       <tr>
-        <td align="left" valign="top"><a href="manageLocalValue?domain=<dtml-var domain>&domain_id=<dtml-var domain_id>&object_path=<dtml-var "'/'.join(object_path)">">Local</a> <a href="manageRemoteValue?domain=<dtml-var domain>&domain_id=<dtml-var domain_id>&object_path=<dtml-var "'/'.join(object_path)">">Remote</a></td>
+        <td align="left" valign="top"><a href="manageLocalValue?subscription_url=<dtml-var expr="loop_item.getDomain().getSubscriptionUrl()">&keyword=<dtml-var keyword>&object_path=<dtml-var "'/'.join(object_path)">">Local</a> <a href="manageRemoteValue?subscription_url=<dtml-var expr="loop_item.getDomain().getSubscriptionUrl()">&keyword=<dtml-var keyword>&object_path=<dtml-var "'/'.join(object_path)">">Remote</a></td>
+        <td align="left" valign="top"><dtml-var expr="loop_item.getDomain().getSubscriptionUrl()"></td>
         <td align="left" valign="top"><dtml-var domain></td>
-        <td align="left" valign="top"><dtml-var domain_id></td>
         <td align="left" valign="top"><dtml-var "'/'.join(object_path)"></td>
         <td align="left" valign="top"><dtml-var keyword></td>
         <td align="left" valign="top"><dtml-var local_value></td>