merged r2657:2666 from trunk:

debian/changelog

@@ -1,6 +1,9 @@
-sipwise-www-admin (2.0.2) UNRELEASED; urgency=medium
+sipwise-www-admin (2.0.2) unstable; urgency=medium
 
- -- Daniel Tiefnig <dtiefnig@sipwise.com>  Thu, 11 Mar 2010 18:32:12 +0100
+  * LNP number search persistence fixed
+  * package files install dirs corrected
+
+ -- Daniel Tiefnig <dtiefnig@sipwise.com>  Fri, 12 Mar 2010 18:09:04 +0100
 
 sipwise-www-admin (2.0.1) unstable; urgency=medium
 

debian/rules

@@ -37,8 +37,8 @@ install: build
 
 	# Add here commands to install the package into debian/sipwise-www-admin.
 	cp -a lib  debian/sipwise-www-admin/usr/local/admin/
-	cp -a root debian/sipwise-www-admin/usr/local/admin/
-	install -m 644 admin.yml debian/sipwise-www-admin/usr/local/admin/
+	cp -a root debian/sipwise-www-admin/usr/local/admin/lib/admin/
+	install -m 644 admin.yml debian/sipwise-www-admin/usr/local/admin/lib/admin/
 	install -m 644 -D etc/admin.conf debian/sipwise-www-admin/usr/local/etc/admin.conf
 	install -m 644 -D etc/apache.site debian/sipwise-www-admin/usr/share/doc/sipwise-www-admin/apache.site
 	# we don't need admin_create.pl and admin_test.pl:

lib/admin/Controller/lnp.pm

@@ -206,10 +206,13 @@ sub search_numbers : Local {
 
     my %filter;
 
-    $filter{lnp_provider_id} = $c->request->params->{search_provid}
-        if $c->request->params->{search_provid};
+    %filter = %{$c->session->{searched_lnp_numbers}}
+        if defined $c->session->{searched_lnp_numbers};
+
+    $filter{lnp_provider_id} = $c->request->params->{search_provid} || undef
+        if defined $c->request->params->{search_provid};
     $filter{number} = $c->request->params->{search_number}
-        if $c->request->params->{search_number};
+        if defined $c->request->params->{search_number};
     $filter{exact_number} = $c->request->params->{exact_number};
     $filter{offset} = $c->request->params->{offset} || 0;
     $filter{limit} = 10;