Ensure files are placed in org subdirectory in archive

Change-Id: I0f931d37203f8b24b84ece26cdfb93e8918e71b3

edx/analytics/tasks/archive.py

@@ -97,7 +97,7 @@ class ArchiveExportTask(MultiOutputMapReduceJobTask):
         task = PathSetTask(src=org_source, include=['*.log*'])
         for target in task.output():
             target_url = target.path
-            relative_url = target_url[len(org_source):].lstrip('/')
+            relative_url = target_url[len(self.eventlog_output_root):].lstrip('/')
             yield (target_url, relative_url)
 
     def mapper(self, _line):

edx/analytics/tasks/tests/test_archive.py

@@ -84,11 +84,12 @@ class ArchiveExportTaskTestCase(unittest.TestCase):
         """
         Extract parameters from log file name.
 
-        Expects name of form "prod-edge-edxapp-001/2014-05-09_HSchoolX.log".
+        Expects name of form "HSchoolX/prod-edge-edxapp-001/2014-05-09_HSchoolX.log".
         """
-        server, name = logfile_name.split('/')
+        org_dir, server, name = logfile_name.split('/')
         date, org = name.split('_')
         org = org[:-4]
+        self.assertEquals(org_dir, org)
         return org, server, date
 
     def _check_tar_file_contents(self, tarfile_path):