Changeset 2011 for branches/release-35/lib/MT/WeblogPublisher.pm

Timestamp:

04/21/08 21:43:09 (19 months ago)

Author:

bchoate

Message:

Fixes for building indexes through the publish queue. Thanks, Jay. BugId:79403

Files:

• branches/release-35/lib/MT/WeblogPublisher.pm (modified) (3 diffs)

branches/release-35/lib/MT/WeblogPublisher.pm

@@ -1260 +1260 @@
         ## the site_path and the template outfile.
         ($file) = $file =~ /(.+)/s;
-        my $finfo;
-        require MT::FileInfo;
-        my @finfos = MT::FileInfo->load(
+        my $finfo = $param{FileInfo};  # available for single template calls
+        unless ( $finfo ) {
+            require MT::FileInfo;
+            my @finfos = MT::FileInfo->load(
+                {
+                    blog_id     => $tmpl->blog_id,
+                    template_id => $tmpl->id
+                }
+            );
+            if (   ( scalar @finfos == 1 )
+                && ( $finfos[0]->file_path eq $file )
+                && ( ( $finfos[0]->url || '' ) eq $rel_url ) )
             {
-                blog_id     => $tmpl->blog_id,
-                template_id => $tmpl->id
-            }
-        );
-        if (   ( scalar @finfos == 1 )
-            && ( $finfos[0]->file_path eq $file )
-            && ( ( $finfos[0]->url || '' ) eq $rel_url ) )
-        {
-            $finfo = $finfos[0];
-        }
-        else {
-            foreach (@finfos) { $_->remove(); }
-            $finfo = MT::FileInfo->set_info_for_url(
-                $rel_url, $file, 'index',
-                {
-                    Blog     => $tmpl->blog_id,
-                    Template => $tmpl->id,
-                }
-              )
-              || die "Couldn't create FileInfo because " . MT::FileInfo->errstr;
+                $finfo = $finfos[0];
+            }
+            else {
+                foreach (@finfos) { $_->remove(); }
+                $finfo = MT::FileInfo->set_info_for_url(
+                    $rel_url, $file, 'index',
+                    {
+                        Blog     => $tmpl->blog_id,
+                        Template => $tmpl->id,
+                    }
+                  )
+                  || die "Couldn't create FileInfo because " . MT::FileInfo->errstr;
+            }
         }
         if ( $tmpl->build_dynamic ) {
@@ -1452 +1454 @@
             BlogID   => $fi->blog_id,
             Template => MT::Template->load( $fi->template_id ),
+            FileInfo => $fi,
             Force    => 1,
         ) or return;
@@ -1775 +1778 @@
     require MT::PublishOption;
     my $throttle = MT::PublishOption::get_throttle($fi);
+    return 0 if $throttle->{type} == MT::PublishOption::DISABLED();
     return 1 if $throttle->{type} != MT::PublishOption::ASYNC();
-    return 0 if $throttle->{type} == MT::PublishOption::DISABLED();
 
     require MT::TheSchwartz;