Changeset 159

Timestamp:

05/08/09 11:58:34 (4 years ago)

Author:

jon

Message:

Reverting changes made for the integration of refactored IMSTransport tool. Changes our now located in trunk.

Location:

enpraxis.educommons/trunk/enpraxis/educommons

Files:

• browser/configure.zcml (modified) (1 diff)
• configure.zcml (modified) (1 diff)
• eventHandlers.py (modified) (3 diffs)
• overrides.zcml (modified) (1 diff)
• portlet/coursebuilderform.py (modified) (3 diffs)

enpraxis.educommons/trunk/enpraxis/educommons/browser/configure.zcml

@@ -8 +8 @@
   <include package="plone.app.contentmenu" />
 
-  <utility
-    provides="collective.imstransport.utilities.interfaces.IIMSManifestWriter"
-    factory="enpraxis.educommons.utilities.ccwriter.IMSCCWriter"
-    name="eduCommons Common Cartridge"
-    />
-
   <browser:page
      name="order_courseobjs"

enpraxis.educommons/trunk/enpraxis/educommons/configure.zcml

@@ -156 +156 @@
   />
 
+  <subscriber 
+     for="collective.imstransport.interfaces.ISetNameSpaces" 
+     handler=".eventHandlers.setNameSpaces" /> 
+                 
+  <subscriber 
+     for="collective.imstransport.interfaces.IObjectWriteMetadata" 
+     handler=".eventHandlers.writeECMetadata" /> 
+
+  <subscriber
+     for="collective.imstransport.interfaces.IObjectReadMetadata" 
+     handler=".eventHandlers.readECMetadata" /> 
+                 
+  <subscriber
+     for="collective.imstransport.interfaces.IObjectWriteOrganizations" 
+     handler=".eventHandlers.writeOrganizations" /> 
+                 
+  <subscriber
+     for="collective.imstransport.interfaces.IObjectReadOrganizations" 
+     handler=".eventHandlers.readOrganizations" /> 
+                 
+  <subscriber 
+     for="collective.imstransport.interfaces.IObjectWriteContributeNode" 
+     handler=".eventHandlers.writeContributeNode" /> 
+                  
+  <subscriber 
+     for="collective.imstransport.interfaces.IObjectReadContributeNode" 
+     handler=".eventHandlers.readContributeNode" /> 
+                  
+  <subscriber 
+     for="collective.imstransport.interfaces.IObjectCreateObject"
+     handler=".eventHandlers.eduCommonsCreateObject" />
 
   <subscriber

enpraxis.educommons/trunk/enpraxis/educommons/eventHandlers.py

@@ -27 +27 @@
 
 from enpraxis.educommons.interfaces import ICourse, IDivision
-from collective.imstransport.utilities.ccwriter import LOM_namespace
+from collective.imstransport.ManifestHandlers import LOM_namespace 
+from collective.imstransport.IMS_exceptions import ManifestError 
 from Products.CMFDefault.SyndicationTool import SyndicationTool
 from Products.CMFDefault.SyndicationInfo import SyndicationInformation
@@ -37 +38 @@
 from zope.schema.interfaces import IVocabularyFactory
 from zope.formlib.form import action
-from collective.imstransport.browser.importform import IMSImportForm
+from collective.imstransport.browser.imstransportform import ImportForm 
 from utilities.interfaces import IECUtility
 from zope.component import getUtility, queryUtility
@@ -568 +569 @@
     
 
-class eduCommonsImportForm(IMSImportForm):
+class eduCommonsImportForm(ImportForm):
     """ Render the import form  """
 

enpraxis.educommons/trunk/enpraxis/educommons/overrides.zcml

@@ -130 +130 @@
 
 
-  <utility
-    provides="collective.imstransport.utilities.interfaces.IIMSManifestWriter"
-    factory="enpraxis.educommons.utilities.ccwriter.IMSCCWriter"
-    name="Common Cartridge"
-    />
-
-
        
 </configure>

enpraxis.educommons/trunk/enpraxis/educommons/portlet/coursebuilderform.py

@@ -36 +36 @@
 from enpraxis.educommons import eduCommonsMessageFactory as _
 from Products.CMFCore.utils import getToolByName
-from collective.imstransport.browser.importform import ZipFileLine
+from collective.imstransport.browser.imstransportform import ZipFileLine
 from collective.imstransport.utilities.interfaces import IIMSTransportUtility
 from Products.CMFDefault.formlib.widgets import ChoiceRadioWidget
@@ -164 +164 @@
     packagetype = schema.Choice(title=_(u"Package Type"),
                                 description=_(u"The type of the ims package being uploaded"),
-                                required=False,
+                                required=True,
                                 default='Default',
-                                vocabulary="imspackagetypevocab")
+                                vocabulary="imsvocab")
 
 
@@ -263 +263 @@
             
         if filename != '' and packagetype != '':
-            imsvocab = getUtility(IVocabularyFactory, name='imspackagetypevocab')(self.context)
+            imsvocab = getUtility(IVocabularyFactory, name='imsvocab')(self.context)
             package_xform = imsvocab.getTermByToken(packagetype).value
             self.ims_util.importZipfile(course,filename,package_xform,rtype='eduCommons')