Permalink
Switch branches/tags
Nothing to show
Commits on Feb 3, 2017
  1. don't resolve entities in xml

    maneframe committed Feb 3, 2017
    Fixes CNVS-34737
    
    Change-Id: Ia6a8d1cebf6cbe3ca47f3e4497b423a87792d4c2
    Reviewed-on: https://gerrit.instructure.com/101046
    Reviewed-by: Dan Minkevitch <dan@instructure.com>
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Oct 27, 2016
  1. bring over cc_profile metadata

    maneframe committed Oct 27, 2016
    refs #CNVS-32221
    
    Change-Id: I7a24d4fea03a3d6539d14d6a9392e1e38589b2c2
    Reviewed-on: https://gerrit.instructure.com/93819
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Oct 5, 2016
  1. bring over precision and tolerance for d2l formula questions

    maneframe committed Oct 5, 2016
    refs #CNVS-32462
    
    Change-Id: Ic53514a3a11099e337c41da8ea9234a5b72114bb
    Reviewed-on: https://gerrit.instructure.com/92056
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Aug 15, 2016
  1. rescue XMLSyntaxErrors while parsing

    landonwilkins committed Aug 12, 2016
    an XMLSyntaxError may be thrown during
    `etree.parse(f,self.parser)` if f is empty
    
    example:
    Processing file: /tmp/d20160812-16410-fo8sho/__MACOSX/._res00041.dat
    Traceback (most recent call last):
      File "/mnt/canvas/vendor/QTIMigrationTool/migrate.py", line 149, in <module>
        parser.ProcessFiles(os.getcwd(),fileNames)
      File "/mnt/canvas/vendor/QTIMigrationTool/lib/imsqtiv1.py", line 6272, in ProcessFiles
        self.ProcessFiles(path,children)
      File "/mnt/canvas/vendor/QTIMigrationTool/lib/imsqtiv1.py", line 6272, in ProcessFiles
        self.ProcessFiles(path,children)
      File "/mnt/canvas/vendor/QTIMigrationTool/lib/imsqtiv1.py", line 6277, in ProcessFiles
        self.Parse(f,path)
      File "/mnt/canvas/vendor/QTIMigrationTool/lib/imsqtiv1.py", line 6297, in Parse
        tree = etree.parse(f,self.parser)
      File "lxml.etree.pyx", line 3198, in lxml.etree.parse (src/lxml/lxml.etree.c:65063)
    ...
    lxml.etree.XMLSyntaxError: Document is empty, line 1, column 1
    
    test plan:
    * specs pass
    
    Change-Id: I2ea8d8615314fe74e3a79c883da9f2e5fd9a9b1e
    Reviewed-on: https://gerrit.instructure.com/87714
    Tested-by: Jenkins
    Product-Review: Shawn Meredith <shawn@instructure.com>
    QA-Review: Shawn Meredith <shawn@instructure.com>
    Reviewed-by: Shawn Meredith <shawn@instructure.com>
Commits on Jun 30, 2016
  1. pull bb assessment object ids as alternative bank ids

    maneframe committed Jun 22, 2016
    because of course they are referenced inconsistently
    
    refs #CNVS-30107
    
    Change-Id: Id27401c1524eae2f67e5fcc5627a559436598138
    Reviewed-on: https://gerrit.instructure.com/83284
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
  2. pull all selection_extension values with the same key

    maneframe committed Jun 22, 2016
    is needed to get all the sourcebank_refs because apparently
    blackboard can link multiple question banks to one section
    
    refs #CNVS-30107
    
    Change-Id: I382c24b211f33de5254f427a3d8ca3b86718a99a
    Reviewed-on: https://gerrit.instructure.com/83268
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on May 2, 2016
  1. import quiz question points better from d2l

    maneframe committed Apr 27, 2016
    test plan:
    * import the package referenced in the comment
     referenced in the ticket
    * the questions with points should have
     correct point values
    
    closes #CNVS-28976
    
    Change-Id: Ifeb0f1d7cf14c6f9a184572856c51fdadb7f921f
    Reviewed-on: https://gerrit.instructure.com/78127
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
Commits on Apr 29, 2016
  1. lay groundwork for importing d2l quiz descriptions/introductions

    maneframe committed Apr 28, 2016
    refs #CNVS-28984
    
    Change-Id: Ic2ece6b3500ab2b172651d729c7d9805df7c105b
    Reviewed-on: https://gerrit.instructure.com/78221
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Aug 5, 2015
  1. improve handling of crappy qti

    maneframe committed Jul 14, 2015
    test plan:
    * import the qti package referenced in the ticket
    * it should not fail, also should have some answers
     in some of their questions
    
    closes #CNVS-21859
    
    Change-Id: Iabc087c0b247bb7560c65d1f9ed23faaeeb9d88f
    Reviewed-on: https://gerrit.instructure.com/58424
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
Commits on Apr 7, 2015
  1. use text class for just_text elements

    maneframe committed Apr 3, 2015
    refs #CNVS-19634
    
    Change-Id: I267b103ef99d699253d0e2523acaa557057578e9
    Reviewed-on: https://gerrit.instructure.com/51584
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Clare Strong <clare@instructure.com>
    Tested-by: Jenkins
    Product-Review: James Williams  <jamesw@instructure.com>
Commits on Mar 23, 2015
  1. keep processing files even if a QTIException is raised

    maneframe committed Mar 23, 2015
    refs #CNVS-19269
    
    Change-Id: Iebb87ff6f1e00409bf5da861cfd6ff7c6fb14612
    Reviewed-on: https://gerrit.instructure.com/50755
    Tested-by: Jenkins
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
    QA-Review: James Williams  <jamesw@instructure.com>
Commits on Jan 16, 2015
  1. prepare for migration_tool gemification

    ccutrer committed Jan 15, 2015
    Change-Id: I71996673c7e09ee2ba625ec569ef2037ceabb8d6
    Reviewed-on: https://gerrit.instructure.com/47235
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Nick Cloward <ncloward@instructure.com>
    Product-Review: Cody Cutrer <cody@instructure.com>
    QA-Review: Cody Cutrer <cody@instructure.com>
Commits on Oct 14, 2014
  1. bring in blackboard files without image extentions

    maneframe committed Oct 10, 2014
    turns out some blackboard files don't actually
    have an extension, meaning we were ignoring them
    when they were actually images
    
    test plan:
    * import the package referenced by the ticket
    * should have images in assessment questions
    
    closes #PFS-23
    
    Change-Id: I06d2ef68bd10113e4841bc07a1641724de1265ef
    Reviewed-on: https://gerrit.instructure.com/42601
    Reviewed-by: Dave Jungst <dave@instructure.com>
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Product-Review: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Sam Derby <sderby@instructure.com>
Commits on Feb 28, 2014
  1. escape InstructureMetadata XML inserts

    jstanley0 committed Feb 18, 2014
    fixes CNVS-11196
    
    test plan:
     - create a new course
     - create a question bank in this course that has
       an ampersand in its name, for example: "this & that"
     - create a question in this question bank
     - copy the course
     - in the copied course,
       - the question bank name should retain the ampersand
         ("this & that", not "this  that")
       - the question text should not gain spurious "div" and "p" text
         ("Test question", not "divpTest Question/p/div")
    
    Change-Id: I7934a036f9f96c83ae013c1881736a2f579c40a3
    Reviewed-on: https://gerrit.instructure.com/30267
    Tested-by: Jenkins <jenkins@instructure.com>
    QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
    Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
    Product-Review: Bracken Mosbacker <bracken@instructure.com>
Commits on Jan 31, 2014
  1. only send to saxify if element tree is parsed correctly

    maneframe committed Jan 23, 2014
    Change-Id: I70fcd82d85f5b318f803b32a351c55f9fcec6ebb
    Reviewed-on: https://gerrit.instructure.com/29068
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
    Product-Review: Bracken Mosbacker <bracken@instructure.com>
    QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Commits on Jan 22, 2014
  1. Revert "lxml fix for webct and d2l_2p0 namespaces"

    bracken committed with codekitchen Jan 22, 2014
    This reverts commit 9de5189.
    
    Change-Id: I8c659983429dc8eb1773ef0199f003dc6a9d064f
    Reviewed-on: https://gerrit.instructure.com/29090
    Tested-by: Brian Palmer <brianp@instructure.com>
    Reviewed-by: Brian Palmer <brianp@instructure.com>
    QA-Review: Brian Palmer <brianp@instructure.com>
    Product-Review: Brian Palmer <brianp@instructure.com>
  2. lxml fix for webct and d2l_2p0 namespaces

    maneframe committed Jan 20, 2014
    Change-Id: I54e70edfa8bfd13d9ce9cfa221af1a4bc7d4c8c6
    Reviewed-on: https://gerrit.instructure.com/28842
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
Commits on Jan 18, 2014
  1. Revert "use lxml to recover from xml parsing errors"

    Bryan Madsen committed Jan 18, 2014
    This reverts commit 1ab0b24.
    
    Change-Id: Ib4221f3ea001326e6e8e9fe5cf547088d974a6d1
    Reviewed-on: https://gerrit.instructure.com/28851
    Tested-by: Bryan Madsen <bryan@instructure.com>
    Reviewed-by: Bryan Madsen <bryan@instructure.com>
    QA-Review: Bryan Madsen <bryan@instructure.com>
    Product-Review: Bryan Madsen <bryan@instructure.com>
Commits on Jan 17, 2014
  1. use lxml to recover from xml parsing errors

    maneframe committed with bracken Jan 15, 2014
    requires the lxml python package
    
    installation instructions:
    (OSX) easy_install lxml
    (Ubuntu) apt-get install python-lxml
    
    fixes #CNVS-10411
    
    Change-Id: Ied85a00245623b843e020251fc78de0772cfcc35
    Reviewed-on: https://gerrit.instructure.com/28598
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Nathan Rogowski <nathan@instructure.com>
    Product-Review: Bracken Mosbacker <bracken@instructure.com>
  2. allow ConditionVar elements to be directly under RespCondition

    maneframe committed Jan 15, 2014
    fixes #CNVS-10487
    
    Change-Id: I3d50859c60e6f3ad0135370c8d646d40845e44cd
    Reviewed-on: https://gerrit.instructure.com/28607
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
    Product-Review: James Williams  <jamesw@instructure.com>
Commits on Oct 4, 2013
  1. global git repo arg handling

    smeredith0506 committed Aug 8, 2013
    Change-Id: I04e020f850e3133b473dca74e5f93ce082766c61
    Reviewed-on: https://gerrit.instructure.com/23156
    Reviewed-by: Bryan Madsen <bryan@instructure.com>
    Product-Review: Bryan Madsen <bryan@instructure.com>
    QA-Review: Bryan Madsen <bryan@instructure.com>
    Tested-by: Jenkins <jenkins@instructure.com>
  2. correctly process webct calculated question text

    maneframe committed with bracken Sep 24, 2013
    closes #CNVS-2168
    
    Change-Id: Iec527c12b9b9b0f23efc4cde09e6d0251dbec7cc
    Reviewed-on: https://gerrit.instructure.com/24660
    Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
    Product-Review: Bracken Mosbacker <bracken@instructure.com>
    QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
    Tested-by: Jenkins <jenkins@instructure.com>
Commits on Jan 11, 2013
  1. fix hudson_setup.sh to work with new gerrit mirror url

    Bryan Madsen committed Jan 11, 2013
    Change-Id: Ib895694543619f2b8cf02594fb9d8aad51be5e2a
    Reviewed-on: https://gerrit.instructure.com/16728
    Reviewed-by: Bryan Madsen <bryan@instructure.com>
    QA-Review: Bryan Madsen <bryan@instructure.com>
    Tested-by: Bryan Madsen <bryan@instructure.com>
Commits on Dec 4, 2012
  1. pass label through to manifest node if available

    bracken committed Dec 4, 2012
    some vendors use the label attribute instead of identifier
    as the unique id. This allows them to be processed correctly
    
    refs #CNVS-1346
    
    Change-Id: I007952a7c9a99b61056816cce1feb33ac1e72277
    Reviewed-on: https://gerrit.instructure.com/15818
    Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
    Tested-by: Jenkins <jenkins@instructure.com>
Commits on Aug 16, 2012
  1. gracefully handle response_labels w/o ident attribute.

    zachpendleton committed with bracken Aug 15, 2012
    fixes #9876
    
    some malformed imports are missing the ident attribute
    on some response_labels. this commit returns early instead
    of throwing an exception.
    
    Change-Id: I793172a8d343ec11436aec0ff2249feba3f94dcb
    Reviewed-on: https://gerrit.instructure.com/12951
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Commits on Jun 25, 2012
  1. make sure imsmanifest.xml is processed first in a directory

    bracken committed Jun 25, 2012
    refs #8051
    
    Change-Id: I82c2a9827a10e352e57b3c0f7168987843786c32
    Reviewed-on: https://gerrit.instructure.com/11822
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Simon Williams <simon@instructure.com>
Commits on Jun 21, 2012
  1. pull item references from selection metadata

    bracken committed Jun 21, 2012
    refs #8862
    
    Change-Id: I977694e2e0bfd702926a9247f505fc5bf56c02c1
    Reviewed-on: https://gerrit.instructure.com/11742
    Reviewed-by: Simon Williams <simon@instructure.com>
    Tested-by: Jenkins <jenkins@instructure.com>
Commits on Jun 1, 2012
  1. flag text question responses as text

    bracken committed Jun 1, 2012
    Previous to this text responses would be converted in the
    same way as html responses, so a QTI importing tool wouldn't
    be able to tell the difference. This now flags them as 'text'
    
    refs #8771
    
    Change-Id: Id217e6f5da5c80728e187ad7fc5bcb3840bc2492
    Reviewed-on: https://gerrit.instructure.com/11202
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Simon Williams <simon@instructure.com>
Commits on May 30, 2012
  1. fix the outcome weight identifier referenced

    bracken committed May 30, 2012
    refs #8143
    
    Change-Id: Iba59f05b7096e61ae3700bbbeb4c09fadd951700
    Reviewed-on: https://gerrit.instructure.com/11118
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Simon Williams <simon@instructure.com>
Commits on May 29, 2012
  1. copy files referenced in superfluous manifest files

    bracken committed May 22, 2012
    some vendors create a manifest file for each question and
    related file, this makes it so that the files referenced
    in there are copied and become part of the single manifest
    when finished. It also grabs the expected output name from
    the webct meta data.
    
    refs #8051 #8671
    
    Change-Id: I0e3f3211123dd5301335538f5f332717cc457746
    Reviewed-on: https://gerrit.instructure.com/10936
    Tested-by: Jenkins <jenkins@instructure.com>
    Reviewed-by: Simon Williams <simon@instructure.com>
Commits on Apr 18, 2012
  1. pass selectionExtension properties through

    bracken committed Apr 17, 2012
    refs #8159
    
    Change-Id: I52c211bc9d0e6e64aaa63866aed9c29cb355097c
    Reviewed-on: https://gerrit.instructure.com/10117
    Tested-by: Hudson <hudson@instructure.com>
    Reviewed-by: Simon Williams <simon@instructure.com>
Commits on Apr 2, 2012
  1. don't try to write a response condition if there isn't one

    bracken committed Mar 30, 2012
    refs #6612
    
    Change-Id: I80bbd6a1e4936375d888b989a303c75d984c772d
    Reviewed-on: https://gerrit.instructure.com/9746
    Tested-by: Hudson <hudson@instructure.com>
    Reviewed-by: Cody Cutrer <cody@instructure.com>
Commits on Feb 2, 2012
  1. if an identifier is set on assessment use it

    bracken committed Feb 1, 2012
    the filename was always being used as the identifier
    for an assessment. That should have been the fall-back
    identifier instead of the default.
    
    Test Plan:
     * run canvas-lms plugin specs
    
    refs #7028
    
    Change-Id: If928d8178ccba7a29980ba8019ba7b0cf5681bc2
    Reviewed-on: https://gerrit.instructure.com/8422
    Tested-by: Hudson <hudson@instructure.com>
    Reviewed-by: Cody Cutrer <cody@instructure.com>
Commits on Jan 6, 2012
  1. don't throw an exception for a metadata field out of place

    bracken committed Jan 6, 2012
    Some vendors who generate QTI put all the same meta data values
    in all the metadata places. This isn't valid, but can just be
    ignored instead of killing the whole converstion process
    
    closes #6807
    
    Change-Id: I60e6d2eda99d463198e9c40d3636410f7eedb9a5
    Reviewed-on: https://gerrit.instructure.com/7918
    Tested-by: Hudson <hudson@instructure.com>
    Reviewed-by: Brian Palmer <brianp@instructure.com>
Commits on Nov 15, 2011
  1. correctly remove vendor/plugins/qti_migration_tool in hudson build

    Bryan Madsen committed Nov 15, 2011
    Change-Id: Idabe3c04c0e23645a691ac9fc7e69d5e34896b46
    Reviewed-on: https://gerrit.instructure.com/6990
    Tested-by: Hudson <hudson@instructure.com>
    Reviewed-by: Bracken Mosbacker <bracken@instructure.com>