Changeset 886

Timestamp:

05/15/12 12:55:56 (12 months ago)

Author:

brent

Message:

Updated page templates to be more informatvie.

Location:

Products.ecmigration/trunk/Products/ecmigration

Files:

• MigrationTool.py (modified) (4 diffs)
• migrate.py (modified) (2 diffs)
• www/ecmigration_export.zpt (modified) (1 diff)
• www/ecmigration_import.zpt (modified) (1 diff)
• www/ecmigration_overview.zpt (modified) (1 diff)

Products.ecmigration/trunk/Products/ecmigration/MigrationTool.py

@@ -1 @@
-# -*- coding: us-ascii -*-
+ # -*- coding: us-ascii -*-
 # _______________________________________________________________________
 #              __________                      .__        
@@ -38 +38 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Globals import InitializeClass
-from migrate import ECMigration
+from migrate import ECMigration, getBaseDirectory, getLogDirectory
 import os
 
@@ -62 +62 @@
     security.declareProtected(ManagePortal, 'manage_import')
     manage_import = PageTemplateFile(os.path.join('www','ecmigration_import'), globals())
+
     security.declareProtected(ManagePortal, 'manage_export')
     manage_export = PageTemplateFile(os.path.join('www','ecmigration_export'), globals())
+
+    def getBaseDir(self):
+        return '%s' %getBaseDirectory(create=False)
+
+    def getLogDir(self):
+        return '%s' %getLogDir()
 
     security.declareProtected(ManagePortal, 'importFilenames')
@@ -85 +92 @@
         """ Export content from eduCommons """
         mig = ECMigration(self.portal_url.getPortalObject())
-        mig.exportContent()
+        results = mig.exportContent()
+        if REQUEST:
+            REQUEST['export_results'] = results
         if REQUEST:
             REQUEST.response.redirect('manage_overview')

Products.ecmigration/trunk/Products/ecmigration/migrate.py

@@ -96 +96 @@
 # Migration logging
 
-def getBaseDirectory():
+def getBaseDirectory(create=True):
     """ Get the base directory for migration files """
     try:
@@ -103 +103 @@
         cwd = os.getcwd()    # needed for eduCommons 4.0.0
     basedir = os.path.join(cwd, 'migration')
-    if not os.path.exists(basedir):
-        os.mkdir(basedir)
+    if create:
+        if not os.path.exists(basedir):
+            os.mkdir(basedir)
     return basedir
+
+def getLogDirectory():
+    getBaseDirectory(create=False)
+    base = getBaseDirectory()
+    return os.path.join(base, 'ecmigration.log')
 
 def setupLogging(logger):
     """ Set up logging for the migration """
-    base = getBaseDirectory()
-    logfn = os.path.join(base, 'ecmigration.log')
+    logfn = getLogDirectory()
     handler = logging.FileHandler(logfn)
     logfmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s')

Products.ecmigration/trunk/Products/ecmigration/www/ecmigration_export.zpt

@@ -3 +3 @@
     tal:replace="structure context/manage_tabs">Tabs</h2>
 
-<p>Export content to be migated to a newer version of eduCommons.</p>
+<p>Export content from this site to be migated to a newer version of eduCommons.</p>
+<p>Content will be exported to following directory:</p> 
 
+<blockquote tal:content="context/getBaseDir">/some/path/migrate</blockquote>
+
+<p>This may take a long time, depending on the amount of content in the site. Please ensure that there is adequate disk space in the above location for your site's content before exporting.</p>
 
 <form action="exportContent" method="POST">

Products.ecmigration/trunk/Products/ecmigration/www/ecmigration_import.zpt

@@ -5 +5 @@
 <p>Import migrated content from a previous version of eduCommons.</p>
 
+<p style="color:red">WARNING: This action will alter the current contents of your site!! If you are importing into a current production site, be sure that you have backed it up before continuing.</p>
+
+<p>Content will be imported from the following directory:</p>
+
+<blockquote tal:content="context/getBaseDir">/some/path/migrate</blockquote>
+
+<p>Please be sure that exported content is copied to the above directory before proceeding.</p>
+
 <form action="importContent" method="POST">
   <input type="submit" value="Import Site"/>
 </form>
-
+<!--
 <form action="importFilenames" method="POST">
   <input type="submit" value="Import Filenames Only" />
 </form>
-
+-->
 <h1 tal:replace="structure context/manage_page_footer">Footer</h1>

Products.ecmigration/trunk/Products/ecmigration/www/ecmigration_overview.zpt

@@ -5 +5 @@
 <p>This tool is used to migrate older versions of eduCommons to the latest current version. The tool creates a directory structure under the <em>var</em> directory in your eduCommons instance.</p>
 
+<h3>Exporting</h3>
+
+<p>Use the "Export" tab to export the content in this version of eduCommons for use in a future version of eduCommons.</p>
+
+<p>The path where migrated content will be written will be listed on the export page.</p>
+
+<p>Once the export is complete, create an archive of the exported files by using the following:
+
+<blockquote>
+cd <em>(path to migrated content)</em><br />
+tar -zcvf migrated_content.tgz .
+</blockquote>
+
 <h3>Importing</h3>
 
-<p>Use the import tab to import content from a previous version of eduCommons into this instance.</p>
+<p>Use the "Import" tab to import content from a previous version of eduCommons into this instance.</p>
 
-<h3>Exporting</h3>
+<p>Before importing be sure that the exported content is located in the correct directory on the server. This directory is listed on the import tab. Also, if you have copied the exported content as a file archive, you will need to unarchive the content before importing.</P>
 
-<p>Export the content in this version of eduCommons for use in a future version of eduCommons.</p>
+<blockquote>
+cd <em>(path to import directory)</em><br />
+tar -zxvf migrated_content.tgz
+</blockquote>
 
+<p>Also make sure that your current eduCommons instance has permission to read the files once they are unarchived.
+
+<blockquote>
+cd <em>(path to import directory)</em><br />
+chown -R zope *
+</blockquote>
 
 <h1 tal:replace="structure context/manage_page_footer">Footer</h1>