From 7ebf143c86c7cbb88dc18987861cd823c0afc5c1 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 3 Aug 2011 14:23:11 -0400 Subject: [PATCH] Add per-class limit support to the tag URI parser; correct location/org thinko Signed-off-by: Mike Rylander Signed-off-by: Dan Scott Signed-off-by: Jason Stephenson --- Open-ILS/src/perlmods/lib/OpenILS/Utils/TagURI.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/TagURI.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/TagURI.pm index e9c6546369..a6679f4fdb 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/TagURI.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/TagURI.pm @@ -91,8 +91,8 @@ sub parse { $self->classname($classname); $self->id($id); $self->paging(($paging ? [ map { s/^\s*//; s/\s*$//; $_ } split(',', $paging) ] : [])); - $self->includes(($inc? [ map { s/^\s*//; s/\s*$//; $_ } split(',', $inc) ] : [])); - $self->org($loc); + $self->includes(($inc ? { map { /:/ ? split(':') : ($_,undef) } map { s/^\s*//; s/\s*$//; $_ } split(',', $inc) } : {})); + $self->location($loc); $self->depth($depth); $self->pathinfo($mods); } @@ -122,7 +122,7 @@ sub toURI { $tag .= 'U2@' if ($self->version == 2); $tag .= $self->classname . '/' . $self->id; $tag .= '['. join(',', @{ $self->paging }) . ']' if defined($self->paging); - $tag .= '{'. join(',', @{ $self->includes }) . '}' if defined($self->includes); + $tag .= '{'. join(',', map { $_ . ':' . $self->includes->{$_} } keys %{ $self->includes }) . '}' if defined($self->includes); $tag .= '/' . $self->location if defined($self->location); $tag .= '/' . $self->depth if defined($self->depth); $tag .= '/' . $self->pathinfo if defined($self->pathinfo); -- 2.43.2