merge conflict

.gitignore

@@ -100,4 +100,7 @@ bio_nginx.conf
 gunicorn.conf.py
 
 #log
-log/*
+log/*
+
+#apple
+.DS_Store

BioDesignVer/settings.py

@@ -41,7 +41,8 @@
     'design',
     'system',
     'geneRelationship',
-    'gunicorn'
+    'gunicorn',
+    'biosearch'
 ]
 
 MIDDLEWARE = [

BioDesignVer/urls.py

@@ -21,13 +21,14 @@
 from django.conf.urls import *
 
 urlpatterns = [
-	url(r'^$', RedirectView.as_view(url='/static/login_register/login_register.html')),
+	url(r'^$', RedirectView.as_view(url='/static/search_track/search_index.html')),
     url(r'^admin/', admin.site.urls),
     url(r'^accounts/', include('accounts.urls')),
     url(r'^home/', include('projectManage.urls')),
     url(r'^design/', include('design.urls')),
     url(r'^system/', include('system.urls')),
     url(r'^geneRelationship/', include('geneRelationship.urls')),
+    url(r'^biosearch/', include('biosearch.urls')),
 ]
 
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

accounts/views.py

@@ -132,7 +132,6 @@ def logout(request):
 	try:
 		data = json.loads(request.body)
 		customerToken = data['token']
-		token = Token()
 		token = Token.objects.get(token=customerToken)
 		token.delete()
 		result = {
@@ -143,6 +142,7 @@ def logout(request):
 			},
 		}
 	except Exception as e:
+		print(str(e));
 		result = {
 			'successful': False,
 			'error': {

biosearch/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

biosearch/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class BiosearchConfig(AppConfig):
+    name = 'biosearch'

biosearch/asciitest.py

@@ -0,0 +1,19 @@
+from elasticsearch import Elasticsearch
+es = Elasticsearch()
+_keyword = "Environment"
+_track = "Environment"
+_query = {
+        "query": {
+            "bool":{
+                "should":{
+                    "multi_match": {
+                    "query": _keyword,
+                    "fields":["attribution"]
+                    }
+                },
+                "must":{"match": {"track": _track}}
+            }
+        }
+    }
+_searched = es.search(index='search_index3', doc_type='searchtest3',body=_query)
+print (_searched)