moodle2cc 0.2.5 → 0.2.6

data/lib/moodle2cc/moodle2/parsers/question_parsers/calculated_parser.rb

@@ -22,10 +22,20 @@ module Moodle2CC::Moodle2
       end
 
       q_node.search('dataset_definitions/dataset_definition').each do |ds_node|
+        var_name = parse_text(ds_node, 'name')
         question.dataset_definitions << {
-            :name => parse_text(ds_node, 'name'),
+            :name => var_name,
             :options => parse_text(ds_node, 'options')
         }
+        ds_node.search('dataset_items/dataset_item').each do |ds_item_node|
+          ident = parse_text(ds_item_node, 'number')
+          var_set = question.var_sets.detect{|vs| vs[:ident] == ident}
+          unless var_set
+            var_set = {:ident => ident, :vars => {}}
+            question.var_sets << var_set
+          end
+          var_set[:vars][var_name] = parse_text(ds_item_node, 'value')
+        end
       end
 
       q_node.search('calculated_records/calculated_record').each do |cr_node|

data/lib/moodle2cc/moodle2/parsers/question_parsers/match_parser.rb

@@ -2,9 +2,10 @@ module Moodle2CC::Moodle2
   class Parsers::QuestionParsers::MatchParser < Parsers::QuestionParsers::QuestionParser
     include Parsers::ParserHelper
     register_parser_type('match')
+    register_parser_type('ddmatch')
 
     def parse_question(node)
-      question = super
+      question = super(node, 'match')
 
       q_node = node.at_xpath("plugin_qtype_#{question.qtype}_question")
 

data/lib/moodle2cc/moodle2/parsers/question_parsers/multichoice_parser.rb

@@ -9,6 +9,8 @@ module Moodle2CC::Moodle2
       answer_parser = Parsers::AnswerParser.new
       question.answers += node.search('answers/answer').map { |n| answer_parser.parse(n) }
 
+      question.single = parse_boolean(node, 'plugin_qtype_multichoice_question/multichoice/single')
+
       question
     end
 

data/lib/moodle2cc/moodle2/parsers/questionnaire_parser.rb

@@ -39,6 +39,11 @@ module Moodle2CC::Moodle2::Parsers
           question.type_id = parse_text(node, 'type_id')
           question.position = parse_text(node, 'position')
           question.content = parse_text(node, 'content')
+
+          question.length = parse_text(node, 'length') # used for rating scale
+          question.precise = parse_text(node, 'precise') # used for rating scale type
+
+          question.deleted = parse_boolean(node, 'deleted')
           node.search('quest_choices/quest_choice').each do |choice_node|
             question.choices << {
               :id => choice_node.attributes['id'].value,

data/lib/moodle2cc/moodle2/parsers/quiz_parser.rb

@@ -69,6 +69,11 @@ module Moodle2CC::Moodle2::Parsers
           }
         end
 
+        question_order = parse_text(xml, '/activity/quiz/questions').to_s.split(',')
+        unless question_order.empty?
+          quiz.question_instances.sort_by!{|qi| question_order.index(qi[:question])}
+        end
+
         xml.search('/activity/quiz/feedbacks/feedback').each do |node|
           quiz.feedbacks << {
             :text => parse_text(node, 'feedbacktext'),

data/lib/moodle2cc/moodle2/parsers/section_parser.rb

@@ -25,7 +25,11 @@ module Moodle2CC::Moodle2::Parsers
         section.summary = parse_text(section_xml, '/section/summary')
         section.summary_format = parse_text(section_xml, 'section/summaryformat')
         section.sequence = parse_text(section_xml, 'section/sequence')
-        section.sequence = section.sequence.split(',') if section.sequence
+        if section.sequence
+          section.sequence = section.sequence.split(',')
+        else
+          section.sequence = []
+        end
         section.visible = parse_text(section_xml, 'section/visible') == '1' ? true : false
         section.available_from = parse_text(section_xml, 'section/availablefrom')
         section.available_until = parse_text(section_xml, 'section/availableuntil')

data/lib/moodle2cc/moodle2/parsers/wiki_parser.rb

@@ -0,0 +1,47 @@
+module Moodle2CC::Moodle2::Parsers
+  class WikiParser
+    include ParserHelper
+
+    WIKI_XML = 'wiki.xml'
+    WIKI_MODULE_NAME = 'wiki'
+
+    def initialize(backup_dir)
+      @backup_dir = backup_dir
+    end
+
+    def parse
+      activity_dirs = activity_directories(@backup_dir, WIKI_MODULE_NAME)
+      activity_dirs.map { |dir| parse_wiki(dir) }
+    end
+
+    private
+
+    def parse_wiki(dir)
+      wiki = Moodle2CC::Moodle2::Models::Wiki.new
+      activity_dir = File.join(@backup_dir, dir)
+      File.open(File.join(activity_dir, WIKI_XML)) do |f|
+        wiki_xml = Nokogiri::XML(f)
+        wiki.id = wiki_xml.at_xpath('/activity/wiki/@id').value
+        wiki.module_id = wiki_xml.at_xpath('/activity/@moduleid').value
+        wiki.name = parse_text(wiki_xml, '/activity/wiki/name')
+        wiki.intro = parse_text(wiki_xml, '/activity/wiki/intro')
+        wiki.intro_format = parse_text(wiki_xml, '/activity/wiki/introformat')
+
+        wiki.first_page_title = parse_text(wiki_xml, '/activity/wiki/firstpagetitle')
+
+        wiki_xml.search('/activity/wiki/subwikis/subwiki/pages/page').each do |node|
+          wiki.pages << {
+            :id => node.attributes['id'].value,
+            :title => parse_text(node, 'title'),
+            :content => parse_text(node, 'cachedcontent')
+          }
+        end
+      end
+      parse_module(activity_dir, wiki)
+
+      wiki
+    end
+
+  end
+
+end

data/lib/moodle2cc/moodle2converter/assessment_converter.rb

@@ -11,7 +11,7 @@ module Moodle2CC::Moodle2Converter
     def convert_quiz(moodle_quiz)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
       canvas_assessment.identifier = generate_unique_identifier_for(moodle_quiz.id, ASSESSMENT_SUFFIX)
-      canvas_assessment.title = moodle_quiz.name
+      canvas_assessment.title = truncate_text(moodle_quiz.name)
       canvas_assessment.description = moodle_quiz.intro
       canvas_assessment.workflow_state = workflow_state(moodle_quiz.visible)
 
@@ -25,7 +25,9 @@ module Moodle2CC::Moodle2Converter
       canvas_assessment.access_code = moodle_quiz.password
       canvas_assessment.ip_filter = moodle_quiz.subnet
       canvas_assessment.shuffle_answers = moodle_quiz.shuffle_answers
-      canvas_assessment.time_limit = Integer(moodle_quiz.time_limit) if moodle_quiz.time_limit
+      if moodle_quiz.time_limit && moodle_quiz.time_limit.to_i > 0
+        canvas_assessment.time_limit = (moodle_quiz.time_limit.to_f / 60).ceil
+      end
       canvas_assessment.quiz_type = 'practice_quiz'
 
       canvas_assessment.question_references = moodle_quiz.question_instances
@@ -36,7 +38,7 @@ module Moodle2CC::Moodle2Converter
     def convert_choice(moodle_choice)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
       canvas_assessment.identifier = generate_unique_identifier_for(moodle_choice.id, CHOICE_ASSESSMENT_SUFFIX)
-      canvas_assessment.title = moodle_choice.name
+      canvas_assessment.title = truncate_text(moodle_choice.name)
       canvas_assessment.description = ''
       canvas_assessment.workflow_state = workflow_state(moodle_choice.visible)
 
@@ -49,7 +51,7 @@ module Moodle2CC::Moodle2Converter
 
       question = Moodle2CC::CanvasCC::Models::Question.create('multiple_choice_question')
       question.identifier = generate_unique_identifier_for(moodle_choice.id, '_choice_question')
-      question.title = moodle_choice.name
+      question.title = truncate_text(moodle_choice.name)
       question.material = moodle_choice.intro
       question.answers = []
       moodle_choice.options.each_with_index do |option, num|

data/lib/moodle2cc/moodle2converter/assignment_converter.rb

@@ -5,7 +5,7 @@ module Moodle2CC::Moodle2Converter
     def convert(moodle_assignment)
       canvas_assignment = Moodle2CC::CanvasCC::Models::Assignment.new
       canvas_assignment.identifier = generate_unique_identifier_for(moodle_assignment.id, ASSIGNMENT_SUFFIX)
-      canvas_assignment.title = moodle_assignment.name
+      canvas_assignment.title = truncate_text(moodle_assignment.name)
       canvas_assignment.body = moodle_assignment.intro
       canvas_assignment.due_at = Time.at(Integer(moodle_assignment.due_date)) if moodle_assignment.due_date
       canvas_assignment.lock_at = Time.at(Integer(moodle_assignment.cut_off_date)) if moodle_assignment.cut_off_date

data/lib/moodle2cc/moodle2converter/book_converter.rb

@@ -24,7 +24,7 @@ module Moodle2CC
         page.identifier = generate_unique_identifier_for_book_intro(moodle_book)
         page.body = moodle_book.intro
         if pages.any?{|p| page.title == p.title}
-          page.title = "#{page.title} (Introduction)"
+          page.title = "#{truncate_text(page.title, MAX_TITLE_LENGTH - 20)} (Introduction)"
         end
         page.workflow_state = workflow_state(moodle_book.visible)
         pages.unshift(page)
@@ -46,7 +46,7 @@ module Moodle2CC
     def create_title(moodle_book)
       module_item = create_module_item_with_defaults()
       module_item.content_type = Moodle2CC::CanvasCC::Models::ModuleItem::CONTENT_TYPE_CONTEXT_MODULE_SUB_HEADER
-      module_item.title = moodle_book.name
+      module_item.title = truncate_text(moodle_book.name)
       module_item.indent = "0"
       module_item.identifier = generate_unique_identifier()
       module_item.workflow_state = workflow_state(moodle_book.visible)
@@ -67,7 +67,7 @@ module Moodle2CC
 
     def create_chapter(moodle_chapter)
       module_item = create_module_item_with_defaults()
-      module_item.title = moodle_chapter.title
+      module_item.title = truncate_text(moodle_chapter.title)
       module_item.indent = moodle_chapter.subchapter ? "2" : "1"
       module_item.identifier = generate_unique_identifier()
       module_item.identifierref = generate_unique_identifier_for_activity(moodle_chapter)
@@ -88,7 +88,7 @@ module Moodle2CC
       page = CanvasCC::Models::Page.new
       page.type = CanvasCC::Models::Resource::WEB_CONTENT_TYPE
       page.href = generate_unique_resource_path(CanvasCC::Models::Page::BOOK_PATH, title)
-      page.title = title
+      page.title = truncate_text(title)
       page.workflow_state = CanvasCC::Models::WorkflowState::ACTIVE
       page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
       page

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -20,6 +20,7 @@ module Moodle2CC
 
     ACTIVITY_LOOKUP = {
       Moodle2::Models::Page => {suffix: PAGE_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
+      Moodle2::Models::Wiki => {suffix: PAGE_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
       Moodle2::Models::Assignment => {suffix: ASSIGNMENT_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_ASSIGNMENT},
       Moodle2::Models::Folder => {suffix: FOLDER_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
       Moodle2::Models::Forum => {suffix: DISCUSSION_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_DISCUSSION_TOPIC},
@@ -35,6 +36,8 @@ module Moodle2CC
       Moodle2::Models::Resource => {suffix: nil, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_ATTACHMENT}
     }
 
+    MAX_TITLE_LENGTH = 250
+
     def generate_unique_resource_path(base_path, readable_name, file_extension = 'html')
       file_name_suffix = readable_name ? Moodle2CC::CanvasCC::Models::Page.convert_name_to_url(readable_name) : ''
       ext = file_extension ? ".#{file_extension}" : ''
@@ -69,6 +72,17 @@ module Moodle2CC
       moodle_visibility ? CanvasCC::Models::WorkflowState::ACTIVE : CanvasCC::Models::WorkflowState::UNPUBLISHED
     end
 
+    def truncate_text(text, max_length = nil, ellipsis = '...')
+      max_length ||= MAX_TITLE_LENGTH
+      return text if !text || text.length <= max_length
+
+      actual_length = max_length - ellipsis.length
+
+      # First truncate the text down to the bytes max, then lop off any invalid
+      # unicode characters at the end.
+      truncated = text[0,actual_length][/.{0,#{actual_length}}/mu]
+      truncated + ellipsis
+    end
 
   end
 end

data/lib/moodle2cc/moodle2converter/discussion_converter.rb

@@ -6,7 +6,7 @@ module Moodle2CC::Moodle2Converter
     def convert(forum)
       discussion = Moodle2CC::CanvasCC::Models::Discussion.new
       discussion.identifier = generate_unique_identifier_for(forum.id, DISCUSSION_SUFFIX)
-      discussion.title = forum.name
+      discussion.title = truncate_text(forum.name)
       discussion.text = forum.intro
       discussion.discussion_type = 'threaded'
       discussion.workflow_state = workflow_state(forum.visible)

data/lib/moodle2cc/moodle2converter/feedback_converter.rb

@@ -5,7 +5,7 @@ module Moodle2CC::Moodle2Converter
     def convert_feedback(moodle_feedback)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
       canvas_assessment.identifier = generate_unique_identifier_for(moodle_feedback.id, FEEDBACK_ASSESSMENT_SUFFIX)
-      canvas_assessment.title = moodle_feedback.name
+      canvas_assessment.title = truncate_text(moodle_feedback.name)
       canvas_assessment.description = moodle_feedback.intro
       canvas_assessment.workflow_state = workflow_state(moodle_feedback.visible)
 
@@ -40,10 +40,10 @@ module Moodle2CC::Moodle2Converter
       canvas_question = Moodle2CC::CanvasCC::Models::Question.create(canvas_type)
       canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, "_feedback_question")
       if moodle_question.type == 'label'
-        canvas_question.title = moodle_question.name
+        canvas_question.title = truncate_text(moodle_question.name)
         canvas_question.material = moodle_question.presentation
       else
-        canvas_question.title = moodle_question.label
+        canvas_question.title = truncate_text(moodle_question.label)
         canvas_question.material = moodle_question.name
       end
 

data/lib/moodle2cc/moodle2converter/html_converter.rb

@@ -17,7 +17,9 @@ module Moodle2CC::Moodle2Converter
     end
 
     def convert(content)
-      update_links(content.gsub('id="main"', ''))
+      content = update_links(content.gsub('id="main"', ''))
+      content = convert_equations(content)
+      content
     end
 
     private
@@ -92,5 +94,18 @@ module Moodle2CC::Moodle2Converter
       end
     end
 
+    def convert_equations(content)
+      # turn moodle equations ( e.g. $$3 * x$$ ) into canvas equations
+      content.gsub(/\$\$([^\$]*)\$\$/) do |match|
+        latex = $1.to_s.gsub("\"", "\\\"")
+        if latex.length > 0
+          url = "/equation_images/#{CGI.escape(CGI.escape(latex).gsub("+", "%20"))}"
+
+          "<img class=\"equation_image\" title=\"#{latex}\" alt=\"#{latex}\" src=\"#{url}\">"
+        else
+          ""
+        end
+      end
+    end
   end
 end

data/lib/moodle2cc/moodle2converter/label_converter.rb

@@ -7,7 +7,7 @@ module Moodle2CC
       module_item = CanvasCC::Models::ModuleItem.new
       module_item.identifier = generate_unique_identifier
       module_item.workflow_state = workflow_state(moodle_label.visible)
-      module_item.title = moodle_label.converted_title
+      module_item.title = truncate_text(moodle_label.converted_title)
       module_item.indent = '0'
 
       if moodle_label.convert_to_page?
@@ -25,7 +25,7 @@ module Moodle2CC
       if moodle_label.convert_to_page?
         canvas_page = CanvasCC::Models::Page.new
         canvas_page.identifier = generate_unique_identifier_for_activity(moodle_label)
-        canvas_page.title = moodle_label.converted_title
+        canvas_page.title = truncate_text(moodle_label.converted_title)
         canvas_page.workflow_state = workflow_state(moodle_label.visible)
         canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
         canvas_page.body = moodle_label.intro

data/lib/moodle2cc/moodle2converter/migrator.rb

@@ -1,6 +1,8 @@
 module Moodle2CC::Moodle2Converter
   class Migrator
 
+    include ConverterHelper
+
     def initialize(source_file, output_dir)
       @extractor = Moodle2CC::Moodle2::Extractor.new(source_file)
       @output_dir = output_dir
@@ -11,6 +13,7 @@ module Moodle2CC::Moodle2Converter
         cc_course = convert_course(moodle_course)
         cc_course.files += convert_files(moodle_course.files)
         cc_course.pages += convert_pages(moodle_course.pages)
+        cc_course.pages += convert_wikis(moodle_course.wikis)
         cc_course.discussions += convert_discussions(moodle_course.forums)
         cc_course.assignments += convert_assignments(moodle_course.assignments)
 
@@ -19,7 +22,6 @@ module Moodle2CC::Moodle2Converter
         cc_course.assessments += convert_assessments(moodle_course.quizzes, moodle_course.choices,
           moodle_course.feedbacks, moodle_course.questionnaires)
         cc_course.question_banks += convert_question_banks(moodle_course.question_categories)
-        cc_course.resolve_question_references
 
         cc_course.pages += convert_sections_to_pages(moodle_course.sections)
         cc_course.pages += convert_folders(moodle_course)
@@ -29,8 +31,10 @@ module Moodle2CC::Moodle2Converter
 
         cc_course.canvas_modules += convert_sections(moodle_course.sections)
 
+        resolve_duplicate_page_titles!(cc_course)
         convert_html!(cc_course, moodle_course)
 
+        cc_course.resolve_question_references!
         @path = Moodle2CC::CanvasCC::CartridgeCreator.new(cc_course).create(@output_dir)
       end
       @path
@@ -61,6 +65,11 @@ module Moodle2CC::Moodle2Converter
       pages.map { |page| page_converter.convert(page) }
     end
 
+    def convert_wikis(wikis)
+      wiki_converter = Moodle2CC::Moodle2Converter::WikiConverter.new
+      wikis.map { |wiki| wiki_converter.convert(wiki) }.flatten
+    end
+
     def convert_discussions(discussions)
       discussion_converter = Moodle2CC::Moodle2Converter::DiscussionConverter.new
       discussions.map { |discussion| discussion_converter.convert(discussion) }
@@ -118,8 +127,67 @@ module Moodle2CC::Moodle2Converter
       cc_course.pages.each {|page| page.body = html_converter.convert(page.body)}
       cc_course.discussions.each {|discussion| discussion.text = html_converter.convert(discussion.text)}
       cc_course.assignments.each {|assignment| assignment.body = html_converter.convert(assignment.body)}
-      cc_course.assessments.each {|assessment| assessment.description = html_converter.convert(assessment.description)}
+
+      cc_course.assessments.each do |assessment|
+        assessment.description = html_converter.convert(assessment.description)
+
+        next unless assessment.items
+        assessment.items.each do |item|
+          if item.is_a?(Moodle2CC::CanvasCC::Models::QuestionGroup)
+            item.questions.each do |question|
+              convert_question_html!(question, html_converter)
+            end
+          elsif item.is_a?(Moodle2CC::CanvasCC::Models::Question)
+            convert_question_html!(item, html_converter)
+          end
+        end
+      end
+
+      cc_course.question_banks.each do |question_bank|
+        question_bank.questions.each do |question|
+          convert_question_html!(question, html_converter)
+        end
+      end
+    end
+
+    def convert_question_html!(question, html_converter)
+      question.material = html_converter.convert(question.material)
+      question.general_feedback = html_converter.convert(question.general_feedback) if question.general_feedback
+
+      question.answers.each do |answer|
+        answer.answer_text = html_converter.convert(answer.answer_text)
+        answer.feedback = html_converter.convert(answer.feedback) if answer.feedback
+      end
+
+      question.post_process! if question.is_a?(Moodle2CC::CanvasCC::Models::CalculatedQuestion)
     end
 
+    def resolve_duplicate_page_titles!(cc_course)
+      page_titles = cc_course.pages.map(&:title)
+      duplicate_page_map = cc_course.pages.group_by(&:title).select{|k, v| v.count > 1}
+      duplicate_page_map.each do |title, dup_pages|
+        dup_pages.sort_by!{|page| find_module_index_for_page(cc_course, page)}
+
+        dup_pages.each_with_index do |page, index|
+          next if index == 0
+          num = index + 1
+          while (title = "#{page.title}-#{num}") && page_titles.include?(title)
+            num += 1
+          end
+          page.title = title
+        end
+      end
+    end
+
+    def find_module_index_for_page(cc_course, canvas_page)
+      cc_course.canvas_modules.each_with_index do |canvas_module, module_index|
+        canvas_module.module_items.each_with_index do |module_item, item_index|
+          if module_item.identifierref.to_s == canvas_page.identifier.to_s
+            return [module_index, item_index]
+          end
+        end
+      end
+      [Float::INFINITY]
+    end
   end
 end