[csw-devel] SF.net SVN: gar:[13578] csw/mgar/gar/v2/lib/web/pkgdb_web.py

[wahwah at users.sourceforge.net]

Revision: 13578
          http://gar.svn.sourceforge.net/gar/?rev=13578&view=rev
Author:   wahwah
Date:     2011-03-05 08:07:00 +0000 (Sat, 05 Mar 2011)

Log Message:
-----------
pkgdb-web: URL recognizer bugfixes

Some URLs use catrel-arch-osrel, while others use catrel/arch/osrel.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-03-05 07:31:00 UTC (rev 13577)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-03-05 08:07:00 UTC (rev 13578)
@@ -27,11 +27,11 @@
   r'/catalognames/', 'CatalognameList',
   r'/catalognames/([^/]+)/', 'Catalogname',
   r'/error-tags/', 'ErrorTagList',
-  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/', 'Catalogs',
-  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/pkgname-by-filename',
+  r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs',
+  r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename',
       'PkgnameByFilename',
   # Query by catalog release, arch, OS release and catalogname
-  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
+  r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
   r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail',
 )
 


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