Changeset 1115

Timestamp:

03/20/10 16:49:35 (2 years ago)

Author:

victorsb

Message:

Wrote a script to add a \n to all grader test files that
currently don't end with one and modified the attachment
code to auto-check for \n at upload time.

REVIEW URL ​http://reviewboard.infoarena.ro/r/139/

Location:

trunk

Files:

• common/attachment.php (modified) (1 diff)
• scripts/attach-endline-fix (added)
• www/controllers/attachment.php (modified) (1 diff)

trunk/common/attachment.php

@@ -118 +118 @@
 }
 
+function is_grader_testfile($file_name) {
+    $pattern = '/^grader_test(\d)*\.(ok|in)$/';
+    if (preg_match($pattern, $file_name) == false) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function is_problem_page($page_name) {
+    $pattern = '/^problema\/' . IA_RE_TASK_ID . '$/';
+    if (preg_match($pattern, $page_name) == false) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function add_ending_newline($file_path) {
+    $content = file_get_contents($file_path);
+    if ($content[strlen($content) - 1] != "\n") {
+        $content .= "\n";
+        file_put_contents($file_path, $content);
+        return true;
+    }
+    return false;
+}
+
 ?>

trunk/www/controllers/attachment.php

@@ -175 +175 @@
             if (is_textfile($file_att['type'])) {
                 dos_to_unix($file_att['disk_name']);
+                if (is_grader_testfile($file_att['name']) &&
+                    is_problem_page($page_name)) {
+                    add_ending_newline($file_att['disk_name']);
+                }
                 $file_att['size'] = filesize($file_att['disk_name']);
             }