[TWiki-Dev] CVS: twiki/bin upload,1.20,1.21

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv8533/bin

Modified Files:
	upload 
Log Message:
Basic meta implementation.


Index: upload
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/upload,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** upload	2001/04/08 20:40:42	1.20
--- upload	2001/04/19 17:06:28	1.21
***************
*** 327,331 ****
      $tmpFilename =~ /(.*)/;
      $tmpFilename = $1;
!     #&TWiki::writeDebug( "tmpFilename $tmpFilename" );
      
      my( $fileSize, $fileUser, $fileDate ) = "";
--- 327,331 ----
      $tmpFilename =~ /(.*)/;
      $tmpFilename = $1;
!     &TWiki::writeDebug( "upload: tmpFilename $tmpFilename" );
      
      my( $fileSize, $fileUser, $fileDate ) = "";
***************
*** 334,338 ****
  	# check if file exists and has non zero size
  	my $size = -s $tmpFilename;
! 	#&TWiki::writeDebug( "size $size" );
  	if( ! -e $tmpFilename ) {
  	    #&TWiki::writeDebug( "upload: no file" );
--- 334,338 ----
  	# check if file exists and has non zero size
  	my $size = -s $tmpFilename;
! 	&TWiki::writeDebug( "upload: size $size" );
  	if( ! -e $tmpFilename ) {
  	    #&TWiki::writeDebug( "upload: no file" );
***************
*** 394,421 ****
      # update topic
      $fileDate =~ s/ / /go;
!     my $text = "", $before="", $atext="", $after="";
!     $text = &TWiki::Store::readTopic( $topic );
!     # extract attachment section:
!     ( $before, $atext, $after ) = split( /<!--TWikiAttachment-->/, $text );
!     if( ! $before ) { $before = ""; }
!     if( ! $atext  ) { $atext  = ""; }
  
!     if ( $atext =~ /\<TwkNextItem\>/ ) {
          # FIXME - move to view code, maybe not as this would cause RCS update?
!         $atext = TWiki::Attach::migrateToFileAttachmentMacro( $atext );
!     }
  
!     $atext = TWiki::Attach::updateAttachment( 
!                 $atext, $fileVersion, $fileName, $filePath, $fileSize,
!                 $fileDate, $fileUser, $fileComment, $hideFile );
      if( $createLink ) {
!         $before = addLinkToEndOfTopic( $before, $newFile, $fileName, $fileComment );
!     }
!     $text = "$before<!--TWikiAttachment-->$atext<!--TWikiAttachment-->";
!     if( $after ) {
!         $text .= $after;
      }
  
!     my $error = &TWiki::Store::saveTopic( $topic, $text );
      if( $error ) {
          # S. Knutson 30 Nov 2000: error happened (probably from RCS), show it
--- 394,412 ----
      # update topic
      $fileDate =~ s/ /&nbsp;/go;
!     my ( $text, @meta ) = &TWiki::Store::readWebTopicNew( $webName, $topic );
  
!     #if ( $atext =~ /\<TwkNextItem\>/ ) {
          # FIXME - move to view code, maybe not as this would cause RCS update?
!     #    $atext = TWiki::Attach::migrateToFileAttachmentMacro( $atext );
!     #}
  
!     @meta = TWiki::Attach::updateAttachment( 
!                 $fileVersion, $fileName, $filePath, $fileSize,
!                 $fileDate, $fileUser, $fileComment, $hideFile, @meta );
      if( $createLink ) {
!         $text = addLinkToEndOfTopic( $text, $newFile, $fileName, $fileComment );
      }
  
!     my $error = &TWiki::Store::saveTopicNew( $webName, $topic, $text, \@meta );
      if( $error ) {
          # S. Knutson 30 Nov 2000: error happened (probably from RCS), show it