X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FCollegeHumorGrabber.pm;h=48ccc7bedc0f33c329841af78ae9dd2479036538;hb=771fcc7e7309dcb054d652812cead6b6bf47be5f;hp=9fdb87e456e3c9f5fcc9b11a363920cee28a5e9a;hpb=d738e03f4f2d70a41eba8b77177826d1ff62f42b;p=videosite.git

diff --git a/videosite/CollegeHumorGrabber.pm b/videosite/CollegeHumorGrabber.pm
index 9fdb87e..48ccc7b 100644
--- a/videosite/CollegeHumorGrabber.pm
+++ b/videosite/CollegeHumorGrabber.pm
@@ -1,9 +1,14 @@
-package CollegeHumorGrabber;
+# Grabber for collegehumor.com
+#
+# (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
+# licensed under GNU GPL v2
 
-use GrabberBase;
-@ISA = qw(GrabberBase);
+package videosite::CollegeHumorGrabber;
 
-use LWP::Simple qw(!get);
+use videosite::GrabberBase;
+@ISA = qw(videosite::GrabberBase);
+
+use videosite::HTMLHelper;
 use XML::Simple;
 use Data::Dumper;
 
@@ -14,7 +19,8 @@ sub new {
     my $self = $class->SUPER::new();
 
     $self->{'NAME'} = 'collegehumor';
-    $self->{'PATTERNS'} = ['(http://www.collegehumor.com/video:(\d+))'];
+    $self->{'PATTERNS'} = ['(http://www.collegehumor.com/video:(\d+))',
+                           '(http://www.collegehumor.com/video/(\d+))'];
 
     bless($self, $class);
     $self->_prepare_parameters();
@@ -29,6 +35,7 @@ sub _parse {
     my $content;
     my $metadata = {};
     my $p = XML::Simple->new();
+    my @accum;
     my $t;
 
     $url =~ m|$pattern|;
@@ -36,12 +43,13 @@ sub _parse {
 
     $metadata->{'URL'} = $url;
     $metadata->{'ID'} = $2;
-    $metadata->{'TYPE'} = 'collegehumor';
+    $metadata->{'TYPE'} = 'video';
+    $metadata->{'SOURCE'} = $self->{'NAME'};
     $metadata->{'TITLE'} = undef;
     $metadata->{'DLURL'} = undef;
 
     # Get the XML file containing the video metadata
-    unless(defined($content = LWP::Simple::get(sprintf('http://www.collegehumor.com/moogaloop/video:%s', $2)))) {
+    unless(defined($content = $self->simple_get(sprintf('http://www.collegehumor.com/moogaloop/video/%s', $2)))) {
         $self->error('Could not download XML metadata');
         return undef;
     }