--- a/web/ldt/ldt_utils/urls.py	Tue Nov 16 12:20:59 2010 +0100
+++ b/web/ldt/ldt_utils/urls.py	Tue Nov 16 14:15:07 2010 +0100
@@ -6,16 +6,46 @@
 # admin.autodiscover()
 
 urlpatterns = patterns('ldt.ldt_utils',
-    url(r'^create/(?P<content>.*)$', 'views.create_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<filter>.*)/(?P<limit>.*)/(?P<creator>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<filter>.*)/(?P<limit>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<filter>.*)/(?P<creator>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<limit>.*)/(?P<creator>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<limit>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)/(?P<creator>.*)$', 'views.filter_annotation'),
-    url(r'^filter/(?P<uri>.*)$', 'views.filter_annotation'),
-    url(r'^get/(?P<id>.*)$', 'views.get_annotation'),
-    url(r'^delete/(?P<id>.*)$', 'views.delete_annotation'),
-    url(r'^update/(?P<content>.*)/(?P<id>.*)$', 'views.update_annotation'),
-    #url(r'^oauth/', include('oauth_provider.urls')),
-)
\ No newline at end of file
+    url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.searchInit'),
+    url(r'^searchForm/$', 'views.searchForm'),
+    url(r'^search/$', 'views.searchIndex'),
+    url(r'^search/(?P<field>.*)/(?P<query>.*)$', 'views.searchIndexGet'),
+    url(r'^searchLdt/(?P<field>.*)/(?P<query>.*)$', 'views.searchLdt'),
+    url(r'^searchSeg/(?P<field>.*)/(?P<query>.*)$', 'views.searchSegments'),
+    url(r'^index/(?P<url>.*)$', 'views.index'),
+    url(r'^init/(?P<method>.*)/(?P<url>.*)$', 'views.init', name='ldt_init'),
+    url(r'^ldt/(?P<url>.*)$', 'views.ldt'),
+    url(r'^search/loading/$', 'views.loading'),
+    url(r'^create/(?P<iri_id>.*)$', 'views.create_project'),
+    url(r'^copy/(?P<ldt_id>.*)$', 'views.copy_project'),
+    url(r'^update/(?P<ldt_id>.*)$', 'views.update_project'),
+    url(r'^cljson/id/(?P<id>.*)$', 'views.project_json_id'),
+    url(r'^cljson/externalid/(?P<id>.*)$', 'views.project_json_externalid'),
+    url(r'^rdf/id/(?P<ldt_id>.*)$', 'views.project_annotations_rdf'),
+    url(r'^/?$', "views.workspace", name="root-view"),
+    url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)$', "views.projectsfilter", ),
+    url(r'^filtercontents/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.contentsfilter", ),
+    (r'^embedpopup/?$', "views.popup_embed"),
+)
+
+urlpatterns += patterns('',
+    url('^jsi18n','django.views.i18n.javascript_catalog', name='jsi18n'),
+)
+
+
+if test_ldt():
+    urlpatterns += patterns('ldt.ldt_utils',
+        url(r'^space/content/$', 'views.list_content'),
+        url(r'^space/content/create/$', 'views.write_content'),
+        url(r'^space/content/update/(?P<iri_id>[\w-]+)$', 'views.write_content'),
+        url(r'^space/ldt/$', 'views.list_ldt'),
+        url(r'^space/ldt/indexproject/(?P<id>.*)$', 'views.indexProject'),
+        url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.+)$', 'views.init', name='space_ldt_init'),
+        url(r'^space/ldt/project/(?P<id>.*)$', 'views.ldtProject'),
+        url(r'^space/ldt/create/$', 'views.create_ldt_view'),
+        url(r'^space/ldt/created_done/$', 'views.created_ldt'),
+        url(r'^space/ldt/save/$', 'views.save_ldtProject'),
+        url(r'^space/ldt/publish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.publish'),
+        url(r'^space/ldt/unpublish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.unpublish'),
+
+)