Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

app/controllers/zipdown_controller.rb

@@ -101,10 +101,20 @@ class ZipdownController < ApplicationController
 
     Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
       input_filename.each do |filename|
+        flag = true
+        index = 1
         rename_file = ic.iconv( (File.basename(filename)) ).to_s
         rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment
 
+        begin
           zipfile.add(rename_file, filename)
+          flag = false
+        rescue Exception => e
+          zipfile.get_output_stream('FILE_NOTICE.txt') do |os|
+            os.write l(:label_file_exist)
+          end
+          next
+        end
       end
       unless not_exist_file.empty?
         zipfile.get_output_stream('FILE_LOST.txt') do |os|

config/locales/zh.yml

@@ -2239,5 +2239,6 @@ zh:
   label_course_prompt: 课程：
   label_contain_resource: 已包含资源：
   label_quote_resource_failed: ",此资源引用失败! "
-  label_file_lost: 以下文件在服务器丢失，请联系相关人员重新上传：
+  label_file_lost: 以下无法成功下载，请联系相关人员重新上传：
+  label_file_exist: 该作品中有重复命名文件，请通过文件名学号和姓名信息进入该作业详细界面手动下载