[Archive-access-cvs] SF.net SVN: archive-access: [2302] trunk/archive-access/projects/wayback/ wayback-core/src

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

Revision: 2302
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2302&view=rev
Author:   bradtofel
Date:     2008-06-24 14:42:44 -0700 (Tue, 24 Jun 2008)

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

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java
    trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/replay/TagMagixTest.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java	2008-06-24 21:09:13 UTC (rev 2301)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java	2008-06-24 21:42:44 UTC (rev 2302)
@@ -71,20 +71,12 @@
 			+ APOSED_ATTR_VALUE + "|" + ESC_QUOTED_ATTR_VALUE + "|"
 			+ RAW_ATTR_VALUE;
 	
-//	private static String cssUrlPatString = 
-//		"url\\s*\\(\\s*(['\"]?.+?['\"]?)\\s*\\)";
 	private static String cssUrlPatString = 
 		"url\\s*\\(\\s*([\\\\\"']*.+?[\\\\\"']*)\\s*\\)";
 
-	private static String cssImportPatString = 
-		"@import\\s+" + cssUrlPatString;
-
 	private static String cssImportNoUrlPatString =
 		"@import\\s+([\"'].+?[\"'])";
 	
-	private static Pattern cssImportPattern = 
-		Pattern.compile(cssImportPatString);
-
 	private static Pattern cssImportNoUrlPattern = 
 		Pattern.compile(cssImportNoUrlPatString);
 	
@@ -161,8 +153,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,

Modified: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/replay/TagMagixTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/replay/TagMagixTest.java	2008-06-24 21:09:13 UTC (rev 2301)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/replay/TagMagixTest.java	2008-06-24 21:42:44 UTC (rev 2302)
@@ -333,6 +333,26 @@
 		checkCSSMarkup("@import 'http://foo.com/f.css';",
 				"@import 'http://web.archive.org/wayback/2004/http://foo.com/f.css';",
 				"http://web.archive.org/wayback/","2004","http://foo.com/");
+
+		checkCSSMarkup("@import \"http://foo.com/f.css\"; @import url( http://foo.com/f.css);",
+				"@import \"http://web.archive.org/wayback/2004/http://foo.com/f.css\"; @import url( http://web.archive.org/wayback/2004/http://foo.com/f.css);",
+				"http://web.archive.org/wayback/","2004","http://foo.com/");
+
+		checkCSSMarkup("@import \"http://foo.com/f.css\";\n@import url( http://foo.com/f.css);",
+				"@import \"http://web.archive.org/wayback/2004/http://foo.com/f.css\";\n@import url( http://web.archive.org/wayback/2004/http://foo.com/f.css);",
+				"http://web.archive.org/wayback/","2004","http://foo.com/");
+
+		checkCSSMarkup("@import url( http://foo.com/f.css);\n@import \"http://foo.com/f.css\";",
+				"@import url( http://web.archive.org/wayback/2004/http://foo.com/f.css);\n@import \"http://web.archive.org/wayback/2004/http://foo.com/f.css\";",
+				"http://web.archive.org/wayback/","2004","http://foo.com/");
+
+		checkCSSMarkup("background: #9caad1 url('/~alabama/images/bg.jpg') 0 0 repeat-y;",
+				"background: #9caad1 url('http://web.archive.org/wayback/2004/http://foo.com/~alabama/images/bg.jpg') 0 0 repeat-y;",
+				"http://web.archive.org/wayback/","2004","http://foo.com/");
+
+		checkCSSMarkup("background: #9caad1 url('/~alabama/images/bg.jpg') 0 0 repeat-y;",
+				"background: #9caad1 url('http://web.archive.org/wayback/2004/http://foo.com/~alabama/images/bg.jpg') 0 0 repeat-y;",
+				"http://web.archive.org/wayback/","2004","http://foo.com/b/");
 		
 	}
 	


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