Changeset b2e7499 in indico

Timestamp:

02/17/11 19:03:51 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

9f7b3f6

Parents:

4e5048

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/17/11 16:54:54)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/17/11 19:03:51)

Message:

[IMP] Extra links added to MARCXML

File:

• indico/MaKaC/common/output.py (modified) (6 diffs)

indico/MaKaC/common/output.py

@@ -205 +205 @@
         return accounts
 
+    def _generateLinkField(self, obj, text, out):
+        out.openTag("datafield", [["tag", "856"], ["ind1", "4"], ["ind2", " "]])
+        url = str(urlHandlers.UHConferenceDisplay.getURL(obj))
+        out.writeTag("subfield", url, [["code", "u"]])
+        out.writeTag("subfield", text, [["code", "y"]])
+        out.closeTag("datafield")
+
     def _generateACLDatafield(self, eType, memberList, objId, out):
         """
@@ -227 +234 @@
         out.closeTag("datafield")
 
-    def _generateAccessList(self, out, obj, specifyId=True):
+    def _generateAccessList(self, obj, out, specifyId=True):
         """
         Generate a comprehensive access list showing all users and e-groups who
@@ -1405 +1412 @@
         out.closeTag("datafield")
 
-        out.openTag("datafield",[["tag","856"],["ind1","4"],["ind2"," "]])
-        url = str(urlHandlers.UHConferenceDisplay.getURL(conf))
-        out.writeTag("subfield",url,[["code","u"]])
-        out.writeTag("subfield", "Event details", [["code","y"]])
-        out.closeTag("datafield")
-
-        self._generateAccessList(out, conf, specifyId=False)
+        self._generateLinkField(conf, "Event details", out)
+
+        self._generateAccessList(conf, out, specifyId=False)
 
     ## def sessionToXMLMarc21(self,session,includeMaterial=1, out=None, overrideCache=False):
@@ -1693 +1696 @@
         out.closeTag("datafield")
 
-        out.openTag("datafield",[["tag","856"],["ind1","4"],["ind2"," "]])
-        url = str(urlHandlers.UHContributionDisplay.getURL(cont))
-        out.writeTag("subfield",url,[["code","u"]])
-        out.writeTag("subfield", "Contribution details", [["code","y"]])
-        out.closeTag("datafield")
-
-        self._generateAccessList(out, cont, specifyId=False)
+        self._generateLinkField(cont, "Contribution details", out)
+        self._generateLinkField(cont.getConference(), "Event details", out)
+
+        self._generateAccessList(cont, out, specifyId=False)
     ####
     #fb
@@ -1867 +1867 @@
         out.closeTag("datafield")
 
-        out.openTag("datafield",[["tag","856"],["ind1","4"],["ind2"," "]])
-        url = str(urlHandlers.UHSubContributionDisplay.getURL(subCont))
-        out.writeTag("subfield",url,[["code","u"]])
-        out.writeTag("subfield", "Contribution details", [["code","y"]])
-        out.closeTag("datafield")
-
-        self._generateAccessList(out, subCont, specifyId=None)
+        self._generateLinkField(subCont, "Contribution details", out)
+        self._generateLinkField(subCont.getConference(), "Event details", out)
+
+        self._generateAccessList(subCont, out, specifyId=None)
 
 
@@ -1895 +1892 @@
             if self.dataInt.isPrivateDataInt() or res.canAccess(self.__aw):
                 self.resourceToXMLMarc21(res, out=out)
-                self._generateAccessList(out, res)
+                self._generateAccessList(res, out)
 
     def resourceToXMLMarc21(self,res, out=None):