Changeset 1057 for trunk/common

Timestamp:

11/03/09 00:08:26 (3 years ago)

Author:

bogdan2412

Message:

Implemented script for copying textblock pages in bulk.

This can be used, for example, to copy everything under algoritmiada-2009/ to algoritmiada-2010/.

• Script was based on existing "recursive-move".
• textblock_copy_replace was modified to use textblock_copy which also supports copying attachments, instead of textblock_add_revision.
• textblock_copy was changed to receive an existing textblock object to copy, instead of the name of the one to copy. This allows modifying parts of the textblock before copying.

Reviewed: ​http://reviewboard.infoarena.ro/r/95/

Location:

trunk/common

Files:

• db/textblock.php (modified) (3 diffs)
• textblock.php (modified) (2 diffs)

trunk/common/db/textblock.php

@@ -1 @@
-<?php 
+<?php
 
 require_once(IA_ROOT_DIR."common/db/db.php");
@@ -40 +40 @@
         // copy current version to revision table
         db_insert('ia_textblock_revision', $current_revision);
-    
+
         // replace current version
         $query = sprintf("DELETE FROM ia_textblock
@@ -323 +323 @@
 }
 
-function textblock_copy($old_name, $new_name, $user_id, $remote_ip_info) {
-    $old_name = normalize_page_name($old_name);
+// Copy a textblock to new_name.
+// Also copies attachments.
+function textblock_copy($old_textblock, $new_name, $user_id, $remote_ip_info) {
+    log_assert(!textblock_validate($old_textblock));
     $new_name = normalize_page_name($new_name);
-    log_assert(is_normal_page_name($old_name));
     log_assert(is_normal_page_name($new_name));
 
-    $new_textblock = textblock_get_revision($old_name);
+    $new_textblock = $old_textblock;
     $new_textblock['name'] = $new_name;
     $new_textblock['user_id'] = $user_id;
+    $new_textblock['creation_timestamp'] = null;
+    // Keep creation_timestamp correct when textblock with new name already exists
+    $aux = textblock_get_revision($new_name);
+    if ($aux) {
+        $new_textblock['creation_timestamp'] = $aux['creation_timestamp'];
+    }
     textblock_add_revision($new_textblock['name'], $new_textblock['title'],
                            $new_textblock['text'], $new_textblock['user_id'],
                            $new_textblock['security'],
-                           $new_textblock['forum_topic'], null, null,
+                           $new_textblock['forum_topic'],
+                           null, $new_textblock['creation_timestamp'],
                            $remote_ip_info);
 
     // Get a list of attachments.
-    $files = attachment_get_all($old_name);
+    $files = attachment_get_all($old_textblock["name"]);
 
     // Copy attachments in db and hard drive

trunk/common/textblock.php

@@ -152 +152 @@
         $user_id, $remote_ip_info = null) {
     assert($srcprefix != $dstprefix);
-    assert(is_textblock_security_descriptor($security));
+    assert($security === null || is_textblock_security_descriptor($security));
     assert(is_whole_number($user_id));
 
@@ -160 +160 @@
             textblock_template_replace($textblock, $replace);
         }
-        if ($replace !== null) {
+        if ($security !== null) {
             $textblock['security'] = $security;
         }
-        $textblock['name'] = preg_replace('/^'.preg_quote($srcprefix, '/').'/i', $dstprefix, $textblock['name']);
+        $new_name = preg_replace('/^'.preg_quote($srcprefix, '/').'/i',
+            $dstprefix, $textblock['name']);
 
-        //FIXME: hack to keep creation_timestamp correct when textblock already exists
-        $first_textblock = textblock_get_revision($textblock['name']);
-        if (!$first_textblock) {
-            $first_textblock['creation_timestamp'] = null;
-        }
-
-        textblock_add_revision($textblock['name'], $textblock['title'],
-                $textblock['text'], $user_id, $textblock['security'],
-                $textblock['forum_topic'], null,
-                $first_textblock['creation_timestamp'], $remote_ip_info);
+        textblock_copy($textblock, $new_name, $user_id, $remote_ip_info);
     }
 }