diff --git a/website/views.py b/website/views.py
index e554ef4..383a8d6 100644
--- a/website/views.py
+++ b/website/views.py
@@ -147,23 +147,10 @@ def index(request):
template = loader.get_template('index.html')
return HttpResponse(template.render(context, request))
elif book_id:
- books = TextbookCompanionPreference.objects\
- .db_manager('r').raw("""
- SELECT DISTINCT (loc.category_id),pe.id,
- tcbm.sub_category,loc.maincategory, pe.book as
- book,loc.category_id,tcbm.sub_category,
- pe.author as author, pe.publisher as publisher,
- pe.year as year, pe.id as pe_id, pe.edition,
- po.approval_date as approval_date
- FROM textbook_companion_preference pe LEFT JOIN
- textbook_companion_proposal po ON pe.proposal_id = po.id
- LEFT JOIN textbook_companion_book_main_subcategories
- tcbm ON pe.id = tcbm.pref_id LEFT JOIN list_of_category
- loc ON tcbm.main_category = loc.category_id WHERE
- po.proposal_status = 3 AND pe.approval_status = 1
- AND pe.id = tcbm.pref_id AND
- pe.cloud_pref_err_status = 0 AND
- pe.id=%s""", [book_id])
+ with connections['r'].cursor() as cursor:
+ cursor.execute(GET_BOOK_CATEGORY_FROM_ID,
+ params=[book_id])
+ books = cursor.fetchone()
books = list(books)
if len(books) == 0:
@@ -179,9 +166,9 @@ def index(request):
template = loader.get_template('index.html')
return HttpResponse(template.render(context, request))
- books = get_books(books[0].sub_category)
- maincat_id = books[0].category_id
- subcat_id = books[0].sub_category
+ req_books = get_books(books[2])
+ maincat_id = books[0]
+ subcat_id = books[2]
request.session['maincat_id'] = maincat_id
request.session['subcategory_id'] = subcat_id
request.session['book_id'] = book_id
@@ -196,8 +183,8 @@ def index(request):
'subcatg': subcateg_all,
'maincat_id': maincat_id,
'chapters': chapters,
- 'subcategory_id': books[0].sub_category,
- 'books': books,
+ 'subcategory_id': books[2],
+ 'books': req_books,
'book_id': int(book_id),
}
@@ -375,3 +362,54 @@ def reset(request):
response = {"data": "ok"}
return HttpResponse(simplejson.dumps(response),
content_type='application/json')
+
+
+def search_book(request):
+ result = {}
+ response_dict = []
+ if request.is_ajax():
+ exact_search_string = request.GET.get('search_string')
+ search_string = "%" + exact_search_string + "%"
+ with connections['r'].cursor() as cursor:
+ cursor.execute(GET_SEARCH_BOOK_SQL, [search_string, search_string,
+ str(exact_search_string),
+ str(exact_search_string)])
+ result = dictfetchall(cursor)
+ return HttpResponse(simplejson.dumps(result),
+ content_type='application/json')
+
+
+def popular(request):
+ result = {}
+ response_dict = []
+ if request.is_ajax():
+ search_string = request.GET.get('search_string')
+ search_string = "%" + search_string + "%"
+ with connections['r'].cursor() as cursor:
+ cursor.execute(GET_SEARCH_POPULAR_BOOK_SQL)
+ result = dictfetchall(cursor)
+ return HttpResponse(simplejson.dumps(result),
+ content_type='application/json')
+
+
+def recent(request):
+ result = {}
+ response_dict = []
+ if request.is_ajax():
+ exact_search_string = request.GET.get('search_string')
+ search_string = "%" + exact_search_string + "%"
+ with connections['r'].cursor() as cursor:
+ cursor.execute(GET_SEARCH_RECENT_BOOK_SQL)
+ result = dictfetchall(cursor)
+ return HttpResponse(simplejson.dumps(result),
+ content_type='application/json')
+
+
+def update_pref_hits(pref_id):
+ updatecount = TextbookCompanionPreferenceHits.objects.using('r')\
+ .filter(pref_id=pref_id)\
+ .update(hitcount=F('hitcount') + 1)
+ if not updatecount:
+ insertcount = TextbookCompanionPreferenceHits.objects.using('r')\
+ .get_or_create(pref_id=pref_id, hitcount=1)
+ return
--
cgit
From 4aa8cf3dc790e445f5ebf52985c68449c8f035d3 Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Wed, 1 Jan 2020 18:23:07 +0530
Subject: updated the urls
---
website/urls.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/website/urls.py b/website/urls.py
index 127cf09..ba1d17b 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -7,7 +7,7 @@ urlpatterns = [
path('', views.index, name='index'),
path('index', views.index, name='index'),
path('get_subcategories/', ajax.subcategories,
- name='subcategories'),
+ name='subcategories'),
path('get_books/', ajax.books, name='books'),
path('get_chapters/', ajax.chapters, name='chapters'),
path('get_examples/', ajax.examples, name='examples'),
@@ -15,7 +15,10 @@ urlpatterns = [
path('get_code/', ajax.code, name='code'),
path('get_diff/', ajax.diff, name='diff'),
path('update_view_count/', views.update_view_count,
- name='update_view_count'),
+ name='update_view_count'),
path('get_contributor/', ajax.contributor, name='contributor'),
path('reset/', views.reset, name='reset'),
- ]
+ path('search_book/', views.search_book, name='search_book'),
+ path('search_book/popular/', views.popular, name='popular'),
+ path('search_book/recent/', views.recent, name='recent'),
+]
--
cgit
From 01be180d3cba129a5431745937615c09d183a5b8 Mon Sep 17 00:00:00 2001
From: Prashant S
Date: Tue, 21 Jan 2020 16:35:44 +0530
Subject: added solr search config
---
R_on_Cloud/default_config.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/R_on_Cloud/default_config.py b/R_on_Cloud/default_config.py
index 842baec..a0a1737 100644
--- a/R_on_Cloud/default_config.py
+++ b/R_on_Cloud/default_config.py
@@ -46,3 +46,10 @@ TORNADO_PORT = '8000'
# class ExecutionHandler.
DEFAULT_TORNADO_WORKERS = 1
DEFAULT_REQUEST_COUNT = 1
+
+# Solr search engine config
+
+HOST = "localhost"
+PORT = "8983"
+COLLECTION = "r_code_search_collection"
+URL = 'http://' + HOST + ':' + PORT + '/solr/' + COLLECTION
--
cgit
From b28d11ad794c3ed438e42a232dc1bd42ab1691ff Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Tue, 21 Jan 2020 17:01:33 +0530
Subject: added sorl code search for cloud
---
website/static/website/js/cloud.js | 51 +++++++++++++++----
website/static/website/templates/index.html | 14 ++----
website/static/website/templates/search_code.html | 28 +++++++++++
website/urls.py | 2 +
website/views.py | 61 +++++++++++++++++++++--
5 files changed, 132 insertions(+), 24 deletions(-)
create mode 100644 website/static/website/templates/search_code.html
diff --git a/website/static/website/js/cloud.js b/website/static/website/js/cloud.js
index f2f7f19..9a632e7 100644
--- a/website/static/website/js/cloud.js
+++ b/website/static/website/js/cloud.js
@@ -922,8 +922,10 @@ $(document.body).ready(function() {
/********************************************/
$(document).on("click", "#search", function() {
ajax_loader(this);
- $("#relevant").html('');
var search_string = jQuery.trim($("#search-input").val());
+ if(search_string != ''){
+ if($("input[name='optradio']:checked").val() == 'bybook'){
+ $("#relevant").html('');
if (search_string == '') {
search_string = 'Null';
}
@@ -935,12 +937,16 @@ $(document.body).ready(function() {
search_string: search_string,
},
success: function(data) {
+ if(data.length > 0 ){
$("#relevant").html('
Relevant
');
for (var i = 0; i < data.length; i++) {
$("#relevant").append(
'
' + data[i].book +
' (Author: ' + data[i].author + ')
');
+ }
+ }else{
+ $("#relevant").append('Oops! This book is not availabe!');
}
ajax_loader("clear");
}
@@ -961,7 +967,6 @@ $(document.body).ready(function() {
}
ajax_loader("clear");
}
-
}),
$.ajax({
url: 'search_book/recent/',
@@ -977,9 +982,33 @@ $(document.body).ready(function() {
'
' + data[i].book +
' (Author: ' + data[i].author + ')
');
}
- ajax_loader("clear");
}
});
+ } else{
+ ajax_loader(this);
+ $.ajax({
+ url: 'search_in_code/',
+ dataType: 'JSON',
+ type: 'GET',
+ data: {
+ search_string: search_string,
+ },
+ success: function(data) {
+ if(data.error != 'True'){
+ console.log(data.data);
+ $("#searched_code_data").html("");
+ $("#searched_code").html(data.data);
+ }else{
+ alert("Oops! Search engine is away, please try after some time!")
+ }
+ }
+ });
+ ajax_loader("clear");
+ }
+ }else{
+ alert("Please enter the search string!");
+ }
+ ajax_loader("clear");
});
$(document).on("click", "#search_book", function(e) {
@@ -1083,14 +1112,14 @@ function doSubmit(){
}
function checkserver(){
-
- $.ajax({url: api_url,
- dataType: "jsonp",
- statusCode: {
- 404: function (response) {
- alert("Oops! R cloud server is not available, please try after some time");
- }
- }
+ $.ajax({url: 'check_server/',
+ dataType: "json",
+ success : function (data) {
+ if((data.status == 200) || (data.error != 'True')){
+ }else{
+ alert("R cloud server is not available, please try after some time");
+ }
+ }
});
}
diff --git a/website/static/website/templates/index.html b/website/static/website/templates/index.html
index 27dbca9..6d68515 100644
--- a/website/static/website/templates/index.html
+++ b/website/static/website/templates/index.html
@@ -46,7 +46,7 @@