Merge pull request #1 from zhblue/master

test

Author: melongist

README.md

@@ -87,6 +87,8 @@ Star us, please!
 
 更新日志
 ------
+2020-01-23 更新：修订了[Moodle集成代码](https://github.com/zhblue/hustoj/blob/master/wiki/MoodleIntegration.md)，实现HUSTOJ给moodle系统作业自动判分。
+
 2020-01-20 更新：删除noip模式比赛的多余提交记录，允许自定义“noip”关键词，增加privilege表user_id索引。
 
 2019-12-19 更新：增加了judge.conf中的注释，提供了备案号变量$OJ_BEIAN，对系统判题时间分辨率进行了更新优化，提高灵活度。

trunk/install/README

@@ -1,24 +1,14 @@
 HUSTOJ安装说明 
 	by zhblue([email protected])
 
-debian8 可以用.deb文件安装
 
-    https://github.com/muzea/hustoj-deb/issues/4
 
-
-或者安装ubuntu16.04（拥有更新的编译器版本），然后用下面脚本快速安装OJ：  
-
-    wget https://raw.githubusercontent.com/zhblue/hustoj/master/trunk/install/install-ubuntu16+.sh
-    sudo bash install-ubuntu16+.sh
-
-https://www.youtube.com/watch?v=nlhmfZqyHnA 
-
-发烧级用户ubuntu18.04(至少1年以上debian系Linux使用经验，欢迎帮忙踩坑测试，有问题会尽快修复)
+小白用户推荐ubuntu18.04
 
     wget https://github.com/zhblue/hustoj/raw/master/trunk/install/install-ubuntu18.04.sh
     sudo bash install-ubuntu18.04.sh
 
-假如你不得已非要用centos7 （有的语言可能不支持），可以用下面脚本快速安装OJ：  
+服务器无法安装ubuntu可以用centos7 （有的语言可能不支持），可以用下面脚本快速安装OJ：  
 
     wget https://raw.githubusercontent.com/zhblue/hustoj/master/trunk/install/install-centos7.sh
     sudo bash install-centos7.sh

trunk/install/moodle.sql

@@ -0,0 +1,69 @@
+DELIMITER $$
+DROP trigger IF EXISTS `jol`.`tri_moodle` $$
+create trigger tri_moodle
+after update on solution
+for each row
+begin
+   declare mark int;
+   declare total int;
+  
+   select count(1) into total from contest_problem where contest_id=new.contest_id;
+   if total>0 then
+       select sum(ac)/total*100 into mark
+          from (select max(pass_rate) ac from solution where user_id=new.user_id and contest_id=new.contest_id and problem_id>0 group by problem_id) s;
+     
+       call update_moodle(new.contest_id,new.user_id,mark);
+       
+   end if;
+end $$
+
+
+CREATE PROCEDURE `update_moodle`(IN `cid` INT, IN `user_id` VARCHAR(20), IN `mark` INT)
+top:BEGIN
+   declare as_id int;
+  declare u_id int;
+  declare nowtime int;
+  declare oldid int;
+  set nowtime=UNIX_TIMESTAMP(now());
+  set as_id=0;
+  select m.id into as_id from
+        moodle.mdl_assign m
+         where m.name = concat('[OJ]-C',cid);
+  if as_id=0 then
+    leave top;
+  end if;
+  set u_id =-1;
+  select m.id into u_id from moodle.mdl_user m where username=user_id;
+  select mag.grade into oldid from moodle.mdl_assign_grades mag
+      where assignment=as_id and userid=u_id;
+
+  set oldid=-1;
+
+  select id into oldid from moodle.mdl_assign_submission m
+      where assignment=as_id and userid=u_id;
+    if oldid =-1 then
+ 
+       insert into moodle.mdl_assign_submission
+             (assignment,userid,timecreated,timemodified,status,attemptnumber)
+       values( as_id    ,u_id  ,nowtime    ,nowtime     ,'new' ,0);
+       insert into  moodle.mdl_assign_grades(assignment,userid,timecreated,timemodified,grader,grade,attemptnumber)
+       select ma.id,mas.userid,UNIX_TIMESTAMP( NOW( ) ),UNIX_TIMESTAMP( NOW( ) ),2,mark,0
+                from  moodle.mdl_assign ma
+                inner join  moodle.mdl_assign_submission mas on
+                mas.assignment=ma.id and mas.status='new' 
+                where concat(ma.id,',',mas.userid) not in (select  concat(assignment,',',userid)  from moodle.mdl_assign_grades);
+
+   else
+
+   
+    update moodle.mdl_assign_grades
+       set grade=mark,timemodified=nowtime where
+        assignment=as_id and userid=u_id;
+
+  end if;
+
+  
+END$$
+
+
+DELIMITER ;

wiki/MoodleIntegration.md

@@ -12,6 +12,7 @@ Preparation 预备工作
 --
 
 install hustoj using .sh script, add line before ```location / { ``` in /etc/nginx/sites-enbaled/default for install moodle
+
 首先用脚本安装HUSTOJ，然后在/etc/nginx/sites-enbaled/default文件中```location / { ``` 这一行之前添加下面的内容：
 
 ```
@@ -34,31 +35,45 @@ sudo service nginx reload
 ```
 install moodle 安装moodle
 --
+download moodle source files from [Moodle Download](https://download.moodle.org/releases/latest/)
+
+从[这里](https://download.moodle.org/releases/latest/)下载最新的moodle源码文件。
 
 unzip/tar -xzf moodle files into /home/judge/src/web/
+
 把下载到的moodle安装文件解压到/home/judge/src/web目录下，得到/home/judge/src/web/moodle目录
 
 fix ownner of src
+
 修改所有目录的属主为www-data
 
 ```
 chown -R www-data /home/judge/src/
 
 ```
 refresh OJ web will show the Moodle Link on top left, click to begain install moodle.
+
 刷新OJ页，得到右上角的Moodle入口，点击开始安装流程。
 
+**don't change the moodle default database name: moodle   default table name prefix: mdl_**
+
+**moodle的数据库默认moodle，表前缀mdl_ ，请不要修改**
+
+
 link two system 关联两个系统
 --
 
 let students use same username in both system.
+
 让学生在两个系统中用相同的用户名注册。
 
 
 add a contest in HUSTOJ for example Contest 1000
+
 在HUSTOJ中添加一个比赛，获得比赛编号1000
 
 add a text-homework in moodle with title [OJ]-C1000 for OJ Contest 1000.
+
 在moodle中添加一个文本作业，标题命名为[OJ]-C1000，其中的1000表示OJ中对应的比赛编号。
 
 add trigger 添加触发器
@@ -88,7 +103,7 @@ add procedure 添加存储过程
 --
 ```
 DELIMITER $$
-CREATE DEFINER=`debian-sys-maint`@`localhost` PROCEDURE `update_moodle`(IN `cid` INT, IN `user_id` VARCHAR(20), IN `mark` INT)
+CREATE PROCEDURE `update_moodle`(IN `cid` INT, IN `user_id` VARCHAR(20), IN `mark` INT)
 top:BEGIN
    declare as_id int;
   declare u_id int;
@@ -140,10 +155,10 @@ DELIMITER ;
 Expecting Result 预期效果
 --
 when students submit solution in hustoj , moodle will show the latest mark for the contest in 0-100.
-当学生在hustoj中提交代码，moodle将在作业里同步显示他们的最新成绩。
-
 
+当学生在hustoj中提交代码，moodle将在作业里同步显示他们的最新成绩。
 
+<img src="https://raw.githubusercontent.com/zhblue/hustoj/master/wiki/moodle.png" >