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

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

Revision: 2239
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2239&view=rev
Author:   bradtofel
Date:     2008-04-14 17:01:01 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
BUGFIX: was not updating
	import 'URL';
	import "URL";
correctly

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-04-11 04:25:37 UTC (rev 2238)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TagMagix.java	2008-04-15 00:01:01 UTC (rev 2239)
@@ -75,12 +75,18 @@
 //		"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);
 	
 	private static Pattern cssUrlPattern = Pattern.compile(cssUrlPatString);
 
@@ -156,6 +162,7 @@
 			ResultURIConverter uriConverter, String captureDate,
 			String baseUrl) {
 		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssImportPattern);
+		markupTagREURIC(page,uriConverter,captureDate,baseUrl,cssImportNoUrlPattern);
 	}
 	
 	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-04-11 04:25:37 UTC (rev 2238)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/replay/TagMagixTest.java	2008-04-15 00:01:01 UTC (rev 2239)
@@ -327,8 +327,13 @@
 				"@import url(\r\n\"http://web.archive.org/wayback/2004/http://foo.com/f.css\"\n\r);",
 				"http://web.archive.org/wayback/","2004","http://foo.com/");
 
+		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 'http://web.archive.org/wayback/2004/http://foo.com/f.css';",
+				"http://web.archive.org/wayback/","2004","http://foo.com/");
 		
-		
 	}
 	
 	public void testStyleUrlMarkup() {


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