Changeset cdfc6b in indico

Timestamp:

01/24/11 15:07:18 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

76defd

Parents:

6df324

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (12/16/10 11:45:36)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (01/24/11 15:07:18)

Message:

[FIX] using integer arithmetic instead of strings

• easier to preserve multiple states;

File:

• indico/ext/livesync/invenio/agent.py (modified) (6 diffs)

indico/ext/livesync/invenio/agent.py

@@ -31 +31 @@
 from MaKaC.common.xmlGen import XMLGen
 
+# some useful constants
+STATUS_DELETED, STATUS_CREATED, STATUS_CHANGED = 1,2,4
+
 
 class InvenioRecordProcessor(object):
 
     @classmethod
-    def _breakDownCategory(cls, categ, chgSet):
+    def _setStatus(cls, chgSet, obj, state):
+        if obj not in chgSet:
+            chgSet[obj] = 0
+
+        chgSet[obj] |= state
+
+    @classmethod
+    def _breakDownCategory(cls, categ, chgSet, state):
 
         # categories are never converted to records
 
         for conf in categ.getAllConferenceList():
-            cls._breakDownConference(conf, chgSet)
+            cls._breakDownConference(conf, chgSet, state)
 
     @classmethod
-    def _breakDownConference(cls, conf, chgSet):
+    def _breakDownConference(cls, conf, chgSet, state):
 
-        chgSet.add(conf)
+        cls._setStatus(chgSet, conf, state)
 
         for contrib in conf.getContributionList():
-            cls._breakDownContribution(contrib, chgSet)
+            cls._breakDownContribution(contrib, chgSet, state)
 
     @classmethod
-    def _breakDownContribution(cls, contrib, chgSet):
+    def _breakDownContribution(cls, contrib, chgSet, state):
 
-        chgSet.add(contrib)
+        cls._setStatus(chgSet, contrib, state)
 
         for scontrib in contrib.getSubContributionList():
-            chgSet.add(scontrib)
+            cls._setStatus(chgSet, scontrib, state)
 
     @classmethod
@@ -63 +73 @@
 
         if isinstance(obj, conference.Category):
-            cls._breakDownCategory(obj, chgSet)
+            cls._breakDownCategory(obj, chgSet, STATUS_CHANGED)
         elif isinstance(obj, conference.Conference):
-            cls._breakDownConference(obj, chgSet)
+            cls._breakDownConference(obj, chgSet, STATUS_CHANGED)
         elif isinstance(obj, conference.Contribution):
-            cls._breakDownContribution(obj, chgSet)
+            cls._breakDownContribution(obj, chgSet, STATUS_CHANGED)
         elif isinstance(obj, conference.SubContribution):
-            chgSet.add(obj)
+            cls._setStatus(chgSet, obj, STATUS_CHANGED)
 
     @classmethod
@@ -78 +88 @@
         """
 
-        deleted = set()
-        changed = set()
-        created = set()
-        protectionChanged = set()
-
+        records = dict()
         result = []
 
-        print 'Computing records...'
-
         for ts, aw in data:
-
             obj = aw.getObject()
 
-            if obj in deleted:
-                # previously deleted?
-                continue
+            if obj in records:
+                if (records[obj] & STATUS_DELETED):
+                    # previously deleted? jump over this one
+                    continue
+            else:
+                records[obj] = 0
 
             for action in aw.getActions():
@@ -100 +106 @@
                     # if the record has been deleted, mark it as such
                     # nothing else will matter
-                    deleted.add(obj)
+                    records[obj] |= STATUS_DELETED
 
                 elif action == 'created':
                     # if the record has been created, mark it as such
-                    created.add(obj)
+                    records[obj] |= STATUS_CREATED
 
                 elif action in ['data_changed', 'acl_changed', 'moved']:
                     # categories are ignored
-                    if not isinstance(obj, conference.Category):
-                        changed.add(obj)
+                    records[obj] |= STATUS_CHANGED
 
                 elif action in ['set_private', 'set_public']:
                     # protection changes have to be handled more carefully
-                    cls._computeProtectionChanges(obj, action, protectionChanged)
+                    cls._computeProtectionChanges(obj, action, records)
 
-        print 'Computed records: %s created, %s changed, %s protection' % \
-                            (len(created), len(changed), len(protectionChanged))
-
-        for obj in (created | changed | protectionChanged) - deleted:
-            yield aw._timestamp, obj, 'create'
-
-        for obj in (deleted):
-            yield aw._timestamp, obj, 'delete'
-
-        # TODO: branching to sub objects (i.e. category protection)
+        for record, state in records.iteritems():
+            yield ts, record, state
 
 
@@ -149 +146 @@
         xg.openTag("collection",[["xmlns","http://www.loc.gov/MARC21/slim"]])
 
-        di.toMarc(record, overrideCache=True, deleted = (operation == 'delete'))
+        di.toMarc(record, overrideCache=True, deleted = (operation & STATUS_DELETED))
 
         xg.closeTag("collection")
@@ -178 +175 @@
         self._v_logger.info('Starting metadata/upload cycle')
         for ts, record, operation in crecords:
-            # TODO: check operation
+
+            if isinstance(record, conference.Category):
+                continue
+
             rdata = self._getMetadata(operation, record)
             try: