[URLS] Cleaning the urls, adding goals to factor graph urls (+ fix a...

[URLS] Cleaning the urls, adding goals to factor graph urls (+ fix a deprecated function in distances.py)

gargantext/urls.py

@@ -9,8 +9,9 @@ Views are shared between these modules:
 """
 
 from django.conf.urls                   import include, url
-
 from django.contrib                     import admin
+from django.views.generic.base          import RedirectView        as Redirect
+from django.contrib.staticfiles.storage import staticfiles_storage as static
 
 import gargantext.views.api.urls
 import gargantext.views.pages.urls
@@ -22,28 +23,26 @@ from annotations.views   import main as annotations_main_view
 
 # Module "Graph Explorer"
 #from graphExplorer     import urls as graphExplorer_urls
-from graphExplorer.rest  import Graph
-from graphExplorer.views import explorer
+import graphExplorer.urls
 
 # Module Scrapers
-from scrapers            import urls as scrapers_urls
+import scrapers.urls
+
 
 urlpatterns = [ url(r'^admin/'     , admin.site.urls                           )
               , url(r'^api/'       , include( gargantext.views.api.urls )      )
               , url(r'^'           , include( gargantext.views.pages.urls )    )
+              , url(r'^favicon.ico$', Redirect.as_view( url=static.url('favicon.ico')
+                                    , permanent=False), name="favicon")
+
+              # Module "Graph Explorer"
+              , url(r'^'           , include( graphExplorer.urls )             )
 
               # Module Annotation
               # tempo: unchanged doc-annotations routes --
               , url(r'^annotations/', include( annotations_urls )              )
               , url(r'^projects/(\d+)/corpora/(\d+)/documents/(\d+)/$', annotations_main_view)
 
-              # Module "Graph Explorer"
-              , url(r'^projects/(\d+)/corpora/(\d+)/explorer$', explorer       )
-              , url(r'^projects/(\d+)/corpora/(\d+)/graph$'   , Graph.as_view())
-              # to be removed:
-              , url(r'^projects/(\d+)/corpora/(\d+)/node_link.json$', Graph.as_view())
-              #url(r'^projects/(\d+)/corpora/(\d+)/explorer$', include(graphExplorer.urls))
-
-              # Scrapers module
-              , url(r'^scrapers/'   , include( scrapers_urls )                 )
+              # Module Scrapers
+              , url(r'^scrapers/'   , include( scrapers.urls )                 )
               ]

graphExplorer/distances.py

@@ -60,8 +60,8 @@ def clusterByDistances( cooc_id
         # top generic or specific
         m = ( xs - ys) / (2 * (x.shape[0] - 1))
 
-        n = n.sort(inplace=False)
-        m = m.sort(inplace=False)
+        n = n.sort_index(inplace=False)
+        m = m.sort_index(inplace=False)
 
         nodes_included = 500 #int(round(size/20,0))
         #nodes_excluded = int(round(size/10,0))

graphExplorer/urls.py

 from django.conf.urls import patterns, url
-from graphExplorer import views
 
-# /!\ urls patterns here are *without* the trailing slash
+#from graphExplorer import views
+from graphExplorer.intersection import getCorpusIntersection
 
-urlpatterns = patterns('',
-    url(r'^register/$', views.Register.as_view()), # Register
-    url(r'^login/$', views.Login.as_view()),       # Login
+# Module "Graph Explorer"
+from graphExplorer.rest         import Graph
+from graphExplorer.views        import explorer
+from graphExplorer.intersection import getCorpusIntersection
 
-)
+
+# TODO : factor urls
+# url will have this pattern:
+# ^explorer/$corpus_id/view
+# ^explorer/$corpus_id/data.json
+# ^explorer/$corpus_id/intersection
+
+urlpatterns = [ url(r'^explorer/intersection/(\w+)$', getCorpusIntersection     )
+              , url(r'^projects/(\d+)/corpora/(\d+)/explorer$', explorer       )
+              , url(r'^projects/(\d+)/corpora/(\d+)/graph$'   , Graph.as_view())
+              , url(r'^projects/(\d+)/corpora/(\d+)/node_link.json$', Graph.as_view())
+              ]