Changeset 7439

Timestamp:

05/16/10 16:15:31 (2 years ago)

Author:

GeorgeClark

Message:

Item9015: Some optimizations

• Don't retrieve pub directory if automatic attachment of pub files is not enabled
• Don't process the list of files if the number found is consistent with the number in Metadata

Also fix unit tests to work even if test environment has auto attach disabled.

Location:

trunk/AttachmentListPlugin

Files:

• lib/Foswiki/Plugins/AttachmentListPlugin.pm (modified) (3 diffs)
• test/unit/AttachmentListPlugin/AttachmentListPluginTests.pm (modified) (1 diff)

trunk/AttachmentListPlugin/lib/Foswiki/Plugins/AttachmentListPlugin.pm

@@ -164 +164 @@
     # has META:FILEATTACHMENT data
     my $attachments = _getAttachmentsInTopic( $inWeb, $inTopic );
-    my $attach_files = _getAttachmentList( $inWeb, $inTopic );
+    my $attach_files = _getAttachmentList( $inWeb, $inTopic ) if ($Foswiki::cfg{RCS}{AutoAttachPubFiles}) ;
+
+    #print STDERR "attachments = " . scalar @$attachments . "\n";
+    #print STDERR "files = " . scalar @$attach_files . "\n" ;
 
     _debug("AttachmentListPlugin::_createFileData");
@@ -181 +184 @@
         }
 
-        foreach my $fileName (@$attach_files) {
-            unless ($inTopicHash->{$inTopic}{$fileName}) {
-                my $fd =
-                  Foswiki::Plugins::AttachmentListPlugin::FileData->new( $inWeb,
-                    $inTopic, { name => $fileName, path => $fileName, autoattached => 1}  );
-                $inTopicHash->{$inTopic}{$fileName} = \$fd;
+        if ($Foswiki::cfg{RCS}{AutoAttachPubFiles} && defined $attach_files && (scalar @$attachments != scalar @$attach_files)) {
+            foreach my $fileName (@$attach_files) {
+                unless ($inTopicHash->{$inTopic}{$fileName}) {
+                    my $fd =
+                      Foswiki::Plugins::AttachmentListPlugin::FileData->new( $inWeb,
+                        $inTopic, { name => $fileName, path => $fileName, autoattached => 1}  );
+                    $inTopicHash->{$inTopic}{$fileName} = \$fd;
+                }
             }
         }
@@ -350 +355 @@
     my ($web, $topic) = @_;
 
+    #print STDERR "getAttachmentList entered for $web $topic\n";
     my $dir  = "$Foswiki::cfg{PubDir}/$web/$topic";
     my $dh;

trunk/AttachmentListPlugin/test/unit/AttachmentListPlugin/AttachmentListPluginTests.pm

@@ -203 +203 @@
     my $testTopic1 = $testAttachments{topic1}{name};
     my $testTopic2 = $testAttachments{topic2}{name};
+    $Foswiki::cfg{RCS}{AutoAttachPubFiles} = 1;
 
     my $source =