Author: sevein
Date: Tue Aug 14 11:37:23 2012
New Revision: 12100

Log:
Move qtSwordPlugin routes to the bottom and use semi-colon to avoid conflicts, 
issue 2376

Modified:
   trunk/apps/qubit/config/routing.yml

Modified: trunk/apps/qubit/config/routing.yml
==============================================================================
--- trunk/apps/qubit/config/routing.yml Tue Aug 14 00:07:54 2012        (r12099)
+++ trunk/apps/qubit/config/routing.yml Tue Aug 14 11:37:23 2012        (r12100)
@@ -9,19 +9,6 @@
     action: index
     slug: home
 
-sword/action/slug:
-  url: /sword/:action/:slug
-  class: QubitResourceRoute
-  param:
-    module: qtSwordPlugin
-    slug: { pattern: '[^;]+' }
-    throw404: false
-
-sword:
-  url: /sword/:action
-  param:
-    module: qtSwordPlugin
-
 slug:
   url: /:slug
   class: QubitResourceRoute
@@ -297,7 +284,7 @@
 oai_harvester_harvest_all_sets:
   url: /oai/harvest/:type/:id/*
   param:
-    module: qtOaiPlugin 
+    module: qtOaiPlugin
     action: harvesterHarvest
     id: { pattern: \d+ }
 
@@ -311,7 +298,7 @@
 oai_requests:
   url: /;oai/request
   param:
-    module: qtOaiPlugin 
+    module: qtOaiPlugin
     action: oai
 
 informationObject:
@@ -371,6 +358,19 @@
     module: informationobject
     action: reports
 
+sword/action/slug:
+  url: /;sword/:action/:slug
+  class: QubitResourceRoute
+  param:
+    module: qtSwordPlugin
+    slug: { pattern: '[^;]+' }
+    throw404: false
+
+sword:
+  url: /;sword/:action
+  param:
+    module: qtSwordPlugin
+
 slug;default_index:
   url:   /:slug;:module
   class: QubitResourceRoute

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to