[open-ils-commits] r16127 - trunk/Open-ILS/src/perlmods/OpenILS/WWW (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-04-04 20:18:07 -0400 (Sun, 04 Apr 2010)
New Revision: 16127

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
Log:
better regexp with new paging functionallity

Modified: trunk/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-04-04 21:46:40 UTC (rev 16126)
+++ trunk/Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	2010-04-05 00:18:07 UTC (rev 16127)
@@ -331,7 +331,7 @@
 	if (!$format) {
 		my $body = "Content-type: application/xml; charset=utf-8\n\n";
 	
-		if ($uri =~ m{^tag:[^:]+:([^\/]+)/([^/]+?)(?:\[([^\]]+)\])?(?:/(.+))?}o) {
+		if ($uri =~ m{^tag:[^:]+:([^\/]+)/(\d+)(?:\[([0-9,]+)\])?(?:/(.+))?}o) {
 			$id = $2;
 			$paging = $3;
 			$lib = uc($4);
@@ -419,7 +419,7 @@
 		return Apache2::Const::OK;
 	}
 
-	if ($uri =~ m{^tag:[^:]+:([^\/]+)/([^/]+?)(?:\[([^\]]+)\])?(?:/(.+))?}o) {
+	if ($uri =~ m{^tag:[^:]+:([^\/]+)/(\d+)(?:\[([0-9,]+)\])?(?:/(.+))?}o) {
 		$id = $2;
 		$paging = $3;
 		$lib = uc($4);