Changeset 577

Timestamp:

12/23/06 07:17:55 (3 years ago)

Author:

vasi

Message:

Fix case when mirrored but not cached. Don't allow empty charset

Files:

• scrapers/trunk/RSS.pm (modified) (2 diffs)

scrapers/trunk/RSS.pm

@@ -113 +113 @@
         
         my $default = 'ISO-8859-1';
-        $charset = $default unless defined $charset;
+        $charset = $default unless $charset;
         return $charset;
 }
@@ -140 +140 @@
         if ($response->code == RC_NOT_MODIFIED) {
                 my $name = $subs[-2];
-                return lock_retrieve(mirror_file($url, type => $name));
-        } else {
-                die $response->status_line unless $response->is_success;
+                my $cache = mirror_file($url, type => $name);
+                return lock_retrieve($cache) if -f $cache;
                 
-                my $content = read_file($mirror, ':raw');
-                my $charset = charset($response, $content);
-                $content = decode($charset, $content);
+                # Woops, got mirrored but not cached
+                unlink $mirror;
+                $response = $ua->mirror($url, $mirror);
+        }       
                 
-                my (%cached, $ret);
-                while (@subs) {
-                        (my $name, my $sub, @subs) = @subs;
-                        $ret = $cached{$name} = $sub->($content, %cached);
-                        lock_store($ret, mirror_file($url, type => $name));
-                }
-                
-                return $ret;
-        }
+        die $response->status_line unless $response->is_success;
+        
+        my $content = read_file($mirror, ':raw');
+        my $charset = charset($response, $content);
+        $content = decode($charset, $content);
+        
+        my (%cached, $ret);
+        while (@subs) {
+                (my $name, my $sub, @subs) = @subs;
+                $ret = $cached{$name} = $sub->($content, %cached);
+                lock_store($ret, mirror_file($url, type => $name));
+        }
+        
+        return $ret;
 }