Changeset 12494

Timestamp:

09/10/11 08:24:51 (21 months ago)

Author:

CrawfordCurrie

Message:

Item11091: deep RCS store changes to support the .txt as a latest revision in the history. With these changes, the core does not need to know anything about topic caches or rev numbers other than positive integers and 0 (for a non-existent topic).

Location:

trunk/core

Files:

• data/TestCases/TestCaseAutoFormattedSearch.txt (modified) (1 diff)
• lib/Foswiki/Store.pm (modified) (1 diff)
• lib/Foswiki/Store/VC/Handler.pm (modified) (10 diffs)
• lib/Foswiki/Store/VC/RcsLiteHandler.pm (modified) (7 diffs)
• lib/Foswiki/Store/VC/RcsWrapHandler.pm (modified) (5 diffs)
• lib/Foswiki/Store/VC/Store.pm (modified) (5 diffs)

trunk/core/data/TestCases/TestCaseAutoFormattedSearch.txt

@@ -83 +83 @@
 
 ---++ Expected
+_Note that the .txt says it is rev 4, but because there is no ,v to back this up
+it is treated as rev 1_
 
 <!-- expected with $parent -->
-Revision 4 has parent <nop>TestCaseAutoFormattedSearch and it contains the form <nop>FormattedSearchForm
+Revision 1 has parent <nop>TestCaseAutoFormattedSearch and it contains the form <nop>FormattedSearchForm
 <!-- /expected -->
 

trunk/core/lib/Foswiki/Store.pm

@@ -444 +444 @@
    * =$attachment= - name of an attachment (optional)
 Get an iterator over the list of revisions of the object. The iterator returns
-the revision identifiers (which will usually be numbers) starting with the most recent revision.
+the revision identifiers (which will usually be numbers) starting with the most
+recent revision.
 
 MUST WORK FOR ATTACHMENTS AS WELL AS TOPICS
+
+If the object does not exist, returns an empty iterator ($iterator->hasNext() will be
+false).
 
 =cut

trunk/core/lib/Foswiki/Store/VC/Handler.pm

@@ -205 +205 @@
 
 Designed to be overridden by subclasses, which can call up to this method
-if file-based rev info is required.
+if simple file-based rev info is required.
 
 =cut
 
 sub getInfo {
-    my $this = shift;
+    my $this = shift; # $version is not useful here, as we have no way to record history
 
     # SMELL: this is only required for the constant
     require Foswiki::Users::BaseUserMapping;
 
-    # If a topic file exists, grab the TOPICINFO from it. This is
-    # the default behaviour if no implementing class can come up
-    # with a better answer. Note that we only peek at the first line
-    # of the file, which is where a "proper" save will have left the tag.
+    # We only arrive here if the implementation getInfo can't serve the info; this
+    # will usually be because the ,v is missing or the topic cache is newer.
+
+    # If there is a .txt file, grab the TOPICINFO from it.
+    # Note that we only peek at the first line of the file,
+    # which is where a "proper" save will have left the tag.
     my $info = {};
     my $f;
-    if ( open( $f, '<', $this->{file} ) ) {
-        local $/ = "\n";
-        my $ti = <$f>;
-        close($f);
-        if ( defined $ti && $ti =~ /^%META:TOPICINFO{(.*)}%/ ) {
-            require Foswiki::Attrs;
-            my $a = Foswiki::Attrs->new($1);
-
-            # Default bad revs to 1, not 0, because this is coming from
-            # a topic on disk, so we know it's a "real" rev.
-            $info->{version} = Foswiki::Store::cleanUpRevID( $a->{version} )
-              || 1;
-            $info->{date}    = $a->{date}    if defined $a->{date};
-            $info->{author}  = $a->{author}  if defined $a->{author};
-            $info->{comment} = $a->{comment} if defined $a->{comment};
-        }
-    }
-
-    # version, date, author and comment fields *must* be defined
+    if ( $this->noCheckinPending() ) {
+        # TOPICINFO may be OK
+        if ( open( $f, '<', $this->{file} ) ) {
+            local $/ = "\n";
+            my $ti = <$f>;
+            close($f);
+            if ( defined $ti && $ti =~ /^%META:TOPICINFO{(.*)}%/ ) {
+                require Foswiki::Attrs;
+                my $a = Foswiki::Attrs->new($1);
+                
+                # Default bad revs to 1, not 0, because this is coming from
+                # a topic on disk, so we know it's a "real" rev.
+                $info->{version} = Foswiki::Store::cleanUpRevID( $a->{version} )
+                    || 1;
+                $info->{date}    = $a->{date};
+                $info->{author}  = $a->{author};
+                $info->{comment} = $a->{comment};
+            }
+        }
+    } else {
+        # There is a checkin pending. We need the latest rev in the history + 1
+        $info->{version} = -e $this->{rcsFile} ? $this->_numRevisions() + 1 : 1;
+        $info->{comment} = "pending";
+    }
+    $info->{date} = $this->getTimestamp() unless defined $info->{date};
     $info->{version} = 1 unless defined $info->{version};
-    $info->{date} = $this->getTimestamp() unless defined $info->{date};
-    $info->{author} = $Foswiki::Users::BaseUserMapping::DEFAULT_USER_CUID
-      unless defined $info->{author};
-    $info->{comment} = ''
-      unless defined $info->{comment};
+    $info->{comment} = '' unless defined $info->{comment};
+    $info->{author} ||= $Foswiki::Users::BaseUserMapping::UNKNOWN_USER_CUID;
     return $info;
+}
+
+# Check to see if there is a newer non-,v file waiting to be checked in. If there is, then
+# all rev numbers have to be incremented, as they will auto-increment when it is finally
+# checked in (usually as the result of a save). This is also used to test the validity of
+# TOPICINFO, as a pending checkin does not contain valid TOPICINFO.
+sub noCheckinPending {
+    my $this = shift;
+    my $isValid = 0;
+
+    if (! -e $this->{file}) {
+        $isValid = 1; # Hmmmm......
+    } else {
+        if (-e $this->{rcsFile}) {
+            # Check the time on the rcs file; is the .txt newer?
+            # Danger, Will Robinson! stat isn't reliable on all file systems, though [9] is claimed to be OK
+            # See perldoc perlport for more on this.
+            local ${^WIN32_SLOPPY_STAT} = 1; # don't need to open the file on Win32
+            my $rcsTime = (stat($this->{rcsFile}))[9];
+            my $fileTime = (stat($this->{file}))[9];
+            $isValid = ($rcsTime < $fileTime) ? 0 : 1;
+        }
+    }
+    return $isValid;
+}
+
+# Must be implemented by subclasses
+sub ci {
+    die "Pure virtual method";
+}
+
+# Protected for use only in subclasses. Check that the object has a history
+# and the .txt is consistent with that history.
+sub _saveDamage {
+    my $this = shift;
+    return if $this->noCheckinPending();
+
+    # the version in the TOPICINFO may not be correct. We need
+    # to check the change in and update the TOPICINFO accordingly
+    my $t = $this->readFile($this->{file});
+
+    # If this is a topic, adjust the TOPICINFO
+    if (defined $this->{topic} && !defined $this->{attachment}) {
+        my $rev = -e $this->{rcsFile} ? $this->getLatestRevisionID() : 1;
+        $t =~ s/^%META:TOPICINFO{(.*)}%$//m;
+        $t = '%META:TOPICINFO{author="'
+            . $Foswiki::Users::BaseUserMapping::UNKNOWN_USER_CUID.
+            '" comment="autosave" date="' .time().'" format="1.1" version="'
+            .$rev.'"}%'."\n$t";
+    }
+    $this->ci( 0,
+        $t, 'autosave',
+        $Foswiki::Users::BaseUserMapping::UNKNOWN_USER_CUID, time());
+}
+
+=begin TML
+
+---++ ObjectMethod addRevisionFromText($text, $comment, $cUID, $date)
+
+Add new revision. Replace file with text.
+   * =$text= of new revision
+   * =$comment= checkin comment
+   * =$cUID= is a cUID.
+   * =$date= in epoch seconds; may be ignored
+
+=cut
+
+sub addRevisionFromText {
+    my ( $this, $text, $comment, $user, $date ) = @_;
+    $this->init();
+    # Commit any out-of-band damage to .txt
+    $this->_saveDamage();
+    $this->ci( 0, $text, $comment, $user, $date );
+}
+
+=begin TML
+
+---++ ObjectMethod addRevisionFromStream($fh, $comment, $cUID, $date)
+
+Add new revision. Replace file with contents of stream.
+   * =$fh= filehandle for contents of new revision
+   * =$cUID= is a cUID.
+   * =$date= in epoch seconds; may be ignored
+
+=cut
+
+sub addRevisionFromStream {
+    my ( $this, $stream, $comment, $user, $date ) = @_;
+    $this->init();
+
+    # Commit any out-of-band damage to .txt
+    $this->_saveDamage();
+
+    $this->ci( 1, $stream, $comment, $user, $date );
+}
+
+=begin TML
+
+---++ ObjectMethod replaceRevision($text, $comment, $cUID, $date)
+
+Replace the top revision.
+   * =$text= is the new revision
+   * =$date= is in epoch seconds.
+   * =$cUID= is a cUID.
+   * =$comment= is a string
+
+=cut
+
+sub replaceRevision {
+    my $this = shift;
+    $this->_saveDamage();
+    $this->repRev(@_);
+}
+
+# Signature as for replaceRevision
+sub repRev {
+    die "Pure virtual method";
 }
 
@@ -257 +379 @@
 
 The default is to return an iterator from the current version number
-down to 1.   Return rev 0 if the file exists without history.
+down to 1.   Return rev 1 if the file exists without history. Return
+an empty iterator if the file does not exist.
 
 =cut
@@ -267 +390 @@
         require Foswiki::ListIterator;
         if ( -e $this->{file} ) {
-            return Foswiki::ListIterator->new( [0] );
+            return Foswiki::ListIterator->new( [1] );
         }
         else {
@@ -289 +412 @@
 
 sub getLatestRevisionID {
-    return shift->numRevisions() || 1;
+    my $this = shift;
+    return 0 unless -e $this->{file};
+    my $rev = $this->_numRevisions() || 1;
+    # If there is a pending pseudo-revision, need n+1, but only if there is
+    # an existing history
+    $rev++ unless $this->noCheckinPending() || !-e $this->{rcsFile};
+    return $rev;
 }
 
@@ -308 +437 @@
 sub getNextRevisionID {
     my $this = shift;
-    return ( $this->numRevisions() || ( ( -e $this->{file} ) ? 1 : 0 ) ) + 1;
+    return $this->getLatestRevisionID() + 1;
 }
 
@@ -363 +492 @@
 
     # Rev numbers run from 1 to numRevisions
-    return $rev && $rev <= $this->numRevisions();
+    return $rev && $rev <= $this->_numRevisions();
 }
 
@@ -454 +583 @@
     return 0 unless $this->{file};
     return -e $this->{file};
-}
-
-=begin TML
-
----++ ObjectMethod getTimestamp() -> $integer
-
-Get the timestamp of the file
-Returns 0 if no file, otherwise epoch seconds
-
-=cut
-
-sub getTimestamp {
-    my ($this) = @_;
-    ASSERT( $this->{file} ) if DEBUG;
-
-    my $date = 0;
-    if ( -e $this->{file} ) {
-
-        # If the stat fails, stamp it with some arbitrary static
-        # time in the past (00:40:05 on 5th Jan 1989)
-        $date = ( stat $this->{file} )[9] || 600000000;
-    }
-    return $date;
 }
 
@@ -1299 +1405 @@
 }
 
+# ObjectMethod getTimestamp() -> $integer
+# Get the timestamp of the file
+# Returns 0 if no file, otherwise epoch seconds
+# Used in subclasses
+
+sub getTimestamp {
+    my ($this) = @_;
+    ASSERT( $this->{file} ) if DEBUG;
+
+    my $date = 0;
+    if ( -e $this->{file} ) {
+
+        # If the stat fails, stamp it with some arbitrary static
+        # time in the past (00:40:05 on 5th Jan 1989)
+        $date = ( stat $this->{file} )[9] || 600000000;
+    }
+    return $date;
+}
+
 1;
 
@@ -1359 +1484 @@
 =begin TML
 
----++ ObjectMethod addRevisionFromText($text, $comment, $cUID, $date)
-
-Add new revision. Replace file with text.
-   * =$text= of new revision
-   * =$comment= checkin comment
-   * =$cUID= is a cUID.
-   * =$date= in epoch seconds; may be ignored
-
-*Virtual method* - must be implemented by subclasses
-
-=begin TML
-
----++ ObjectMethod addRevisionFromStream($fh, $comment, $cUID, $date)
-
-Add new revision. Replace file with contents of stream.
-   * =$fh= filehandle for contents of new revision
-   * =$cUID= is a cUID.
-   * =$date= in epoch seconds; may be ignored
-
-*Virtual method* - must be implemented by subclasses
-
-=cut
-
-=begin TML
-
----++ ObjectMethod replaceRevision($text, $comment, $cUID, $date)
-
-Replace the top revision.
-   * =$text= is the new revision
-   * =$date= is in epoch seconds.
-   * =$cUID= is a cUID.
-   * =$comment= is a string
-
-*Virtual method* - must be implemented by subclasses
-
-=cut
-
-=begin TML
-
 ---++ ObjectMethod deleteRevision()
 
@@ -1437 +1523 @@
 
 =cut
-__END__
+
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 

trunk/core/lib/Foswiki/Store/VC/RcsLiteHandler.pm

@@ -433 +433 @@
 
 # implements VC::Handler
-sub numRevisions {
+sub _numRevisions {
     my ($this) = @_;
     _ensureProcessed($this);
@@ -445 +445 @@
 }
 
-# implements VC::Handler
-sub addRevisionFromText {
-    _addRevision( shift, 0, @_ );
-}
-
-# implements VC::Handler
-sub addRevisionFromStream {
-    _addRevision( shift, 1, @_ );
-}
-
-sub _addRevision {
+sub ci {
     my ( $this, $isStream, $data, $log, $author, $date ) = @_;
 
     _ensureProcessed($this);
-    if ( $this->{state} eq 'nocommav' && -e $this->{file} ) {
-
-        # Must do this *before* saving the attachment, so we
-        # save the file on disc
-        $this->{head} = 1;
-        $this->{revs}[1]->{text} =
-          Foswiki::Store::VC::Handler::readFile( $this, $this->{file} );
-        $this->{revs}[1]->{log}    = $log;
-        $this->{revs}[1]->{author} = $author;
-        $this->{revs}[1]->{date}   = ( defined $date ? $date : time() );
-        _writeMe($this);
-    }
 
     if ($isStream) {
@@ -481 +459 @@
         $this->saveFile( $this->{file}, $data );
     }
-
-    my $head = $this->{head};
+    my $head = $this->{head} || 0;
     if ($head) {
         my $lNew  = _split($data);
@@ -517 +494 @@
 
 # implements VC::Handler
-sub replaceRevision {
+sub repRev {
     my ( $this, $text, $comment, $user, $date ) = @_;
     _ensureProcessed($this);
     _delLastRevision($this);
-    return _addRevision( $this, 0, $text, $comment, $user, $date );
+    return $this->ci( 0, $text, $comment, $user, $date );
 }
 
@@ -573 +550 @@
 
     _ensureProcessed($this);
-
     my $info;
-    if ( $this->{state} ne 'nocommav' ) {
+    if ( $this->{state} ne 'nocommav') {
         if ( !$version || $version > $this->{head} ) {
             $version = $this->{head} || 1;
@@ -585 +561 @@
             comment => $this->{revs}[$version]->{log}
         };
+        # We have to check that there is not a pending version in the .txt
+        unless ($this->noCheckinPending()) {
+            # There's a pending version in the .txt
+            $info->{version}++;
+            $info->{author} = $Foswiki::Users::BaseUserMapping::UNKNOWN_USER_CUID;
+            $info->{comment} = "pending";
+            $info->{date} = time();
+        }
     }
     else {
@@ -773 +757 @@
     my ( $this, $date ) = @_;
 
-    my $version = 1;
-
     _ensureProcessed($this);
-    $version = $this->{head};
+    if ($this->{state} eq 'nocommav') {
+        return ($date >= (stat($this->{file}))[9]) ? 1 : undef;
+   }
+
+    my $version = $this->{head};
     while ( $this->{revs}[$version]->{date} > $date ) {
         $version--;
-        return 0 if $version == 0;
-    }
-
+        return undef if $version == 0;
+    }
+
+    if ($version == $this->{head} && !$this->noCheckinPending()) {
+        # Check the file date
+        $version++ if ($date >= (stat($this->{file}))[9]);
+    }
     return $version;
 }

trunk/core/lib/Foswiki/Store/VC/RcsWrapHandler.pm

@@ -102 +102 @@
 
 # implements VC::Handler
-sub addRevisionFromText {
+
+# Designed for calling *only* from the Handler superclass and this class
+sub ci {
+    my ($this, $isStream, $data, $comment, $user, $date) = @_;
+#    unless ( -e $this->{rcsFile} ) {    #
+#                                        # SMELL: what is this for?
+#        _lock($this);
+#        _ci( $this, $comment, $user, $date );
+#    }
+    _lock($this);
+    if ($isStream) {
+        $this->saveStream( $data );
+    } else {
+        $this->saveFile( $this->{file}, $data );
+    }
+    _ci( $this, $comment, $user, $date );
+}
+
+# implements VC::Handler
+sub repRev {
     my ( $this, $text, $comment, $user, $date ) = @_;
-    $this->init();
-
-    #print STDERR "Wrap: Forced save at $date $this->{file}\n" if $date;
-
-    unless ( -e $this->{rcsFile} ) {    #
-                                        # SMELL: what is this for?
-        _lock($this);
-        _ci( $this, $comment, $user, $date );
-    }
-    Foswiki::Store::VC::Handler::saveFile( $this, $this->{file}, $text );
-    _lock($this);
-    _ci( $this, $comment, $user, $date );
-}
-
-# implements VC::Handler
-sub addRevisionFromStream {
-    my ( $this, $stream, $comment, $user, $date ) = @_;
-    $this->init();
-
-    _lock($this);
-    Foswiki::Store::VC::Handler::saveStream( $this, $stream );
-    _ci( $this, $comment, $user, $date );
-}
-
-# implements VC::Handler
-sub replaceRevision {
-    my ( $this, $text, $comment, $user, $date ) = @_;
-
-    my $rev = $this->numRevisions() || 0;
+
+    my $rev = $this->_numRevisions() || 0;
 
     $comment ||= 'none';
@@ -168 +160 @@
 sub deleteRevision {
     my ($this) = @_;
-    my $rev = $this->numRevisions();
+    my $rev = $this->_numRevisions();
     return if ( $rev <= 1 );
     return _deleteRevision( $this, $rev );
@@ -281 +273 @@
 
 # implements VC::Handler
-sub numRevisions {
-    my $this = shift;
-
-    unless ( -e $this->{rcsFile} ) {
-
-        # If there is no history, there can only be one.
-        return 1 if -e $this->{file};
-        return 0;
-    }
-
-    my ( $rcsOutput, $exit ) =
-      Foswiki::Sandbox->sysCommand( $Foswiki::cfg{RCS}{histCmd},
-        FILENAME => $this->{rcsFile} );
-    if ($exit) {
-        throw Error::Simple( 'RCS: '
-              . $Foswiki::cfg{RCS}{histCmd} . ' of '
-              . $this->hidePath( $this->{rcsFile} )
-              . ' failed: '
-              . $rcsOutput );
-    }
-    if ( $rcsOutput =~ /head:\s+\d+\.(\d+)\n/ ) {
-        return $1;
-    }
-    if ( $rcsOutput =~ /total revisions: (\d+)\n/ ) {
-        return $1;
-    }
-    return 1;
-}
-
-# implements VC::Handler
 sub getInfo {
     my ( $this, $version ) = @_;
 
-    if ( -e $this->{rcsFile} ) {
-        if ( !$version || $version > $this->numRevisions() ) {
-            $version = $this->numRevisions();
+    if ( $this->noCheckinPending() ) {
+        if ( !$version || $version > $this->_numRevisions() ) {
+            $version = $this->_numRevisions();
         }
         my ( $rcsOut, $exit ) = Foswiki::Sandbox->sysCommand(
@@ -345 +307 @@
 
 # implements VC::Handler
+sub _numRevisions {
+    my $this = shift;
+
+    unless ( -e $this->{rcsFile} ) {
+
+        # If there is no history, there can only be one.
+        return 1 if -e $this->{file};
+        return 0;
+    }
+
+    my ( $rcsOutput, $exit ) =
+      Foswiki::Sandbox->sysCommand( $Foswiki::cfg{RCS}{histCmd},
+        FILENAME => $this->{rcsFile} );
+    if ($exit) {
+        throw Error::Simple( 'RCS: '
+              . $Foswiki::cfg{RCS}{histCmd} . ' of '
+              . $this->hidePath( $this->{rcsFile} )
+              . ' failed: '
+              . $rcsOutput );
+    }
+    if ( $rcsOutput =~ /head:\s+\d+\.(\d+)\n/ ) {
+        return $1;
+    }
+    if ( $rcsOutput =~ /total revisions: (\d+)\n/ ) {
+        return $1;
+    }
+    return 1;
+}
+
+# implements VC::Handler
 # rev1 is the lower, rev2 is the higher revision
 sub revisionDiff {
@@ -526 +518 @@
     my ( $this, $date ) = @_;
 
-    if ( !-e $this->{rcsFile} ) {
-        return;
-    }
+    unless( -e $this->{rcsFile} ) {
+        return ($date >= (stat($this->{file}))[9]) ? 1 : undef;
+    }
+
     require Foswiki::Time;
-    $date = Foswiki::Time::formatTime( $date, '$rcs', 'gmtime' );
+    my $sdate = Foswiki::Time::formatTime( $date, '$rcs', 'gmtime' );
     my ( $rcsOutput, $exit ) = Foswiki::Sandbox->sysCommand(
         $Foswiki::cfg{RCS}{rlogDateCmd},
-        DATE     => $date,
+        DATE     => $sdate,
         FILENAME => $this->{file}
     );
 
+    my $version = undef;
     if ( $rcsOutput =~ m/revision \d+\.(\d+)/ ) {
-        return $1;
-    }
-    return 1;
+        $version = $1;
+    }
+
+    if ($version && !$this->noCheckinPending()) {
+        # Check the file date
+        $version++ if ($date >= (stat($this->{file}))[9]);
+    }
+    return $version;
 }
 

trunk/core/lib/Foswiki/Store/VC/Store.pm

@@ -63 +63 @@
 
 # SMELL: this module does not respect $Foswiki::inUnitTestMode; tests
-# just sit on top of the store which is configured in the current LocalSite.
+# just sit on top of the store which is configured in the current $Foswiki::cfg.
 # Most of the time this is ok, as store listeners will be told that
 # the store is in test mode, so caches should be unaffected. However
@@ -106 +106 @@
     $topicObject->setEmbeddedStoreForm($text);
 
+    unless ($handler->noCheckinPending()) {
+        # If a checkin is pending, fix the TOPICINFO
+        my $ri = $topicObject->get('TOPICINFO');
+        my $truth = $handler->getInfo($version);
+        for my $i qw(author version date) {
+            $ri->{$i} = $truth->{$i};
+        }
+    }
+
     $gotRev = $version;
     unless ( defined $gotRev ) {
 
-        # First try the just-loaded text for the revision
+        # First try the just-loaded for the revision.
         my $ri = $topicObject->get('TOPICINFO');
-        if ( defined($ri) ) {
-
-            # SMELL: this can end up overriding a correct rev no (the one
-            # requested) with an incorrect one (the one in the TOPICINFO)
-            $gotRev = $ri->{version};
-        }
-    }
-    if ( !$gotRev ) {
+        $gotRev = $ri->{version} if defined $ri;
+    }
+    if ( !defined $gotRev ) {
 
         # No revision from any other source; must be latest
@@ -270 +274 @@
 sub getRevisionHistory {
     my ( $this, $topicObject, $attachment ) = @_;
-    
+
     my $itr = $this->askListenersRevisionHistory($topicObject, $attachment);
 
@@ -333 +337 @@
     my $verb = ( $topicObject->existsInStore() ) ? 'update' : 'insert';
 
+    # just in case they are not sequential
+    my $nextRev = $handler->getNextRevisionID();
+    my $ti = $topicObject->get('TOPICINFO');
+    $ti->{version} = $nextRev;
+    $ti->{author} = $cUID;
+
     $handler->addRevisionFromText( $topicObject->getEmbeddedStoreForm(),
         'save topic', $cUID, $options->{forcedate} );
-
-    # just in case they are not sequential
-    my $nextRev = $handler->getLatestRevisionID();
 
     my $extra = $options->{minor} ? 'minor' : '';
@@ -351 +358 @@
     ASSERT( $topicObject->isa('Foswiki::Meta') ) if DEBUG;
     ASSERT($cUID) if DEBUG;
-
     my $info    = $topicObject->getRevisionInfo();
     my $handler = $this->getHandler($topicObject);
     $handler->replaceRevision( $topicObject->getEmbeddedStoreForm(),
-        'reprev', $info->{author}, $info->{date} );
+        'reprev', $cUID, $info->{date} );
     my $rev = $handler->getLatestRevisionID();
     $handler->recordChange( $cUID, $rev, 'minor, reprev' );