[Archive-access-cvs] SF.net SVN: archive-access: [2434] branches/wayback-1_2_2/wayback/ wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java

[<bra...@us...>]

Revision: 2434
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2434&view=rev
Author:   bradtofel
Date:     2008-07-13 18:40:33 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
BUGFIX (ACC-21): now rewrites all(or at least more) url(XXX) tags in CSS.

Modified Paths:
--------------
    branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java

Modified: branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java
===================================================================
--- branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java	2008-07-14 01:40:16 UTC (rev 2433)
+++ branches/wayback-1_2_2/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java	2008-07-14 01:40:33 UTC (rev 2434)
@@ -76,14 +76,14 @@
 	private static String cssUrlPatString = 
 		"url\\s*\\(\\s*([\\\\\"']*.+?[\\\\\"']*)\\s*\\)";
 
-	private static String cssImportPatString = 
-		"@import\\s+" + cssUrlPatString;
+//	private static String cssImportPatString = 
+//		"@import\\s+" + cssUrlPatString;
 
 	private static String cssImportNoUrlPatString =
 		"@import\\s+([\"'].+?[\"'])";
 	
-	private static Pattern cssImportPattern = 
-		Pattern.compile(cssImportPatString);
+//	private static Pattern cssImportPattern = 
+//		Pattern.compile(cssImportPatString);
 
 	private static Pattern cssImportNoUrlPattern = 
 		Pattern.compile(cssImportNoUrlPatString);
@@ -161,8 +161,9 @@
 	public static void markupCSSImports(StringBuilder page,
 			ResultURIConverter uriConverter, String captureDate,
 			String baseUrl) {
-		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssImportPattern);
+//		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssImportPattern);
 		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssImportNoUrlPattern);
+		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssUrlPattern);
 	}
 	
 	public static void markupStyleUrls(StringBuilder page,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.