cafe-grader-web Commit - r166:7417e965c968

cafe-grader-web

Commit `r166:7417e965c968` public

parent | child

Description:

added language identification using file extension git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@363 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r166:7417e965c968 - Fri, 17 Apr 2009 00:42:20 - 4 files changed: 57 inserted, 7 deleted

db/migrate/20090416235658_add_common_ext_to_languages.rb created 644 ¶ +23

@@ -0,0 +1,23
	1	+ class AddCommonExtToLanguages < ActiveRecord::Migration
	2	+ def self.up
	3	+ # language.common_ext is a comma-separated list of common file
	4	+ # extensions.
	5	+ add_column :languages, :common_ext, :string
	6	+
	7	+ # updating table information
	8	+ Language.reset_column_information
	9	+ common_ext = {
	10	+ 'c' => 'c',
	11	+ 'cpp' => 'cpp,cc',
	12	+ 'pas' => 'pas'
	13	+ }
	14	+ Language.find(:all).each do \|lang\|
	15	+ lang.common_ext = common_ext[lang.name]
	16	+ lang.save
	17	+ end
	18	+ end
	19	+
	20	+ def self.down
	21	+ remove_column :languages, :common_ext
	22	+ end
	23	+ end

app/models/language.rb ¶ +22

@@ -1,2 +1,24
1	class Language < ActiveRecord::Base	1	class Language < ActiveRecord::Base
		2	+
		3	+ @@languages_by_ext = {}
		4	+
		5	+ def self.cache_ext_hash
		6	+ @@languages_by_ext = {}
		7	+ Language.find(:all).each do \|language\|
		8	+ language.common_ext.split(',').each do \|ext\|
		9	+ @@languages_by_ext[ext] = language
2	end	10	end
		11	+ end
		12	+ end
		13	+
		14	+ def self.find_by_extension(ext)
		15	+ if @@languages_by_ext.length == 0
		16	+ Language.cache_ext_hash
		17	+ end
		18	+ if @@languages_by_ext.has_key? ext
		19	+ return @@languages_by_ext[ext]
		20	+ else
		21	+ return nil
		22	+ end
		23	+ end
		24	+ end

app/models/submission.rb ¶ +10 -6

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   last_sub = find(:first,
                                   :conditions => {:user_id => user_id,
                                     :problem_id => problem_id},
                                   :order => 'number DESC')
                   return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
                   Submission.find(:first,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                     :number => number
                                   })
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
                   Submission.find(:all,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                   })
                 end
                 protected
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                 end
-            -   def self.find_language_in_source(source)
+            +   def self.find_language_in_source(source, source_filename="")
                   langopt = find_option_in_source(/^LANG:/,source)
-            -     if language = Language.find_by_name(langopt)
+            +     if langopt
-            -       return language
+            +       return (Language.find_by_name(langopt) ||
-            -     elsif language = Language.find_by_pretty_name(langopt)
+            +               Language.find_by_pretty_name(langopt))
-            -       return language
+            +     else
+            +       if source_filename
+            +         return Language.find_by_extension(source_filename.split('.').last)
                     else
                       return nil
                     end
                   end
+            +   end
                 def self.find_problem_in_source(source)
                   prob_opt = find_option_in_source(/^TASK:/,source)
                   if problem = Problem.find_by_name(prob_opt)
                     return problem
                   else
                     return nil
                   end
                 end
                 def assign_problem
                   if self.problem_id!=-1
                     begin
                       self.problem = Problem.find(self.problem_id)
                     rescue ActiveRecord::RecordNotFound
                       self.problem = nil
                     end
                   else
                     self.problem = Submission.find_problem_in_source(self.source)
                   end
                 end
                 def assign_language
-            -     self.language = Submission.find_language_in_source(self.source)
+            +     self.language = Submission.find_language_in_source(self.source,
+            +                                                        self.source_filename)
                 end
                 # validation codes
                 def must_specify_language
                   return if self.source==nil
                   # for output_only tasks
                   return if self.problem!=nil and self.problem.output_only
                   if self.language==nil
                     errors.add('source',"must specify programming language") unless self.language!=nil
                   end
                 end
                 def must_have_valid_problem
                   return if self.source==nil
                   if self.problem==nil
                     errors.add('problem',"must be specified.")
                   elsif (!self.problem.available) and (self.new_record?)
                     errors.add('problem',"must be valid.")
                   end
                 end
                 # callbacks
                 def assign_latest_number_if_new_recond
                   return if !self.new_record?
                   latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
                   self.number = (latest==nil) ? 1 : latest.number + 1;
                 end
               end

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20090206145016) do
+            + ActiveRecord::Schema.define(:version => 20090416235658) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
+            +     t.string "common_ext"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",           :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "country_id"
                   t.string   "password"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r166:7417e965c968 - Fri, 17 Apr 2009 00:42:20 - 4 files changed: 57 inserted, 7 deleted

Sign in to your account

Commit r166:7417e965c968 public

Author

r166:7417e965c968 - Fri, 17 Apr 2009 00:42:20 - 4 files changed: 57 inserted, 7 deleted

Commit `r166:7417e965c968` public