[Archive-access-cvs] SF.net SVN: archive-access:[3499] trunk/archive-access/projects/ access-control/oracle/src/main/java/org/archive/accesscontrol/webui/ AdminController.java

[<ikr...@us...>]

Revision: 3499
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3499&view=rev
Author:   ikreymer
Date:     2011-08-06 00:13:21 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
ORACLE: Fix URL testing code, properly checks date now, pads to 14-digits correctly

Modified Paths:
--------------
    trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java

Modified: trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java
===================================================================
--- trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2011-08-05 04:55:54 UTC (rev 3498)
+++ trunk/archive-access/projects/access-control/oracle/src/main/java/org/archive/accesscontrol/webui/AdminController.java	2011-08-06 00:13:21 UTC (rev 3499)
@@ -162,7 +162,7 @@
 		
 		String surt;
 		
-		if (!this.isSurt(url)) {
+		if (this.isSurt(url)) {
 			surt = url;
 		} else {
 	        url = ArchiveUtils.addImpliedHttpIfNecessary(url);
@@ -173,24 +173,33 @@
 		String dateStamp = request.getParameter("checkDate");
 		String group = request.getParameter("checkGroup");
 		model.put("checkGroup", group);
-		model.put("dateStamp", dateStamp);
 		model.put("checkURL", url);		
 		
 		Date captureDate = null;
 		
 		if ((dateStamp != null) && !dateStamp.isEmpty()) {
-			String paddedDateStr = ArchiveUtils.padTo(dateStamp, 14, '0');
+			String paddedDateStr = dateStamp;
+			int pad = 14 - dateStamp.length();
+			for (int i = 0; i < pad; i++) {
+				paddedDateStr += '0';
+			}
+			
 			try {
 				captureDate = ArchiveUtils.parse14DigitDate(paddedDateStr);
+				model.put("checkDate", dateStamp);				
 			} catch (ParseException e) {
 				captureDate = null;
 			}
 		}
 		
-		Date retrivealDate = new Date();
+		Date retrievalDate = new Date();
 		
-		Rule theRule = rules.getMatchingRule(surt, captureDate, retrivealDate, group);
+		if (captureDate == null) {
+			captureDate = retrievalDate;
+		}
 		
+		Rule theRule = rules.getMatchingRule(surt, captureDate, retrievalDate, group);
+		
 		if (theRule == null) {
 			return;
 		}


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