[Netcomics-cvs] netcomics/lib unitedmedia,1.36,1.37

[Sven H. <ha...@us...>]

Update of /cvsroot/netcomics/netcomics/lib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2720

Modified Files:
	unitedmedia 
Log Message:
Extract type from previous regexp.


Index: unitedmedia
===================================================================
RCS file: /cvsroot/netcomics/netcomics/lib/unitedmedia,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- unitedmedia	12 Jan 2011 01:59:13 -0000	1.36
+++ unitedmedia	12 Jan 2011 02:06:17 -0000	1.37
@@ -54,7 +54,7 @@
             if (m%(http://[.\d\w]*/dyn/str_strip/\d+[.\d\w]*\.full\.(gif|jpg|png))%) {
                 my $tmp = $1;
 		$tmp =~ s/full/zoom/;
-                my $type = $1 if ($tmp =~ m%\.(\w+)$%);
+                my $type = $2;
                 push @relurls, {
 		    'pagebase' => "",
                     'page' => $tmp,
@@ -64,7 +64,7 @@
                 };
             } elsif (m%(/dyn/str_strip/\d+/\d+/\d+/\d+/\d+/\d+/\d+/\d+/\d+[.\d\w]*\.strip(\.sunday|\.zoom)?\.(gif|jpg|png))%) {
 		my $tmp = $1;
-	        my $type = $1 if ($tmp =~ m%\.(\w+)$%);
+	        my $type = $3;
                 push @relurls, {
                     'page' => $tmp,
                     'comic' => $tmp,