Merge pull request #9 from prashantsinalkar/master

added solr code search

1 files changed, 58 insertions, 14 deletions

diff --git a/website/static/website/js/cloud.js b/website/static/website/js/cloud.js
index 43f035f..9a632e7 100644
--- a/website/static/website/js/cloud.js
+++ b/website/static/website/js/cloud.js
@@ -905,10 +905,27 @@ $(document.body).ready(function() {
         });
     });
     /********************************************/
+    /********************************************/
+    /********************************************/
+    /********* search feature *******************/
+    /********************************************/
+    $(document).on("change", "input[type=radio][name=optradio]", function() {
+        if (this.value == 'bybook') {
+            $("#searched_code").hide();
+            $("#searched_book").show();
+        }
+        else if (this.value == 'bycode') {
+            $("#searched_code").show();
+            $("#searched_book").hide();
+        }
+    });
+    /********************************************/
     $(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';
         }
@@ -920,13 +937,17 @@ $(document.body).ready(function() {
                     search_string: search_string,
                 },
                 success: function(data) {
+                    if(data.length > 0 ){
                     $("#relevant").html('<h2>Relevant</h2><hr>');
                     for (var i = 0; i < data.length; i++) {
                         $("#relevant").append(
-                            '<a  href="?book_id=' + data[i].ids + '" class="">' + data[i].book +
+                            '<a  href="?book_id=' + data[i].id + '" class="">' + data[i].book +
                             ' (Author: ' + data[i].author + ')</a><hr>');
                    
                     }
+                    }else{
+                    $("#relevant").append('Oops! This book is not availabe!');
+                    }
                     ajax_loader("clear");
                 }
             }),
@@ -946,7 +967,6 @@ $(document.body).ready(function() {
                     }
                     ajax_loader("clear");
                 }
-                
             }),
             $.ajax({
                 url: 'search_book/recent/',
@@ -962,9 +982,33 @@ $(document.body).ready(function() {
                             '<a  href="?book_id=' + data[i].ids + '" class="">' + data[i].book +
                             ' (Author: ' + data[i].author + ')</a><hr>');
                     }
-                    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) {
@@ -986,7 +1030,7 @@ $(document.body).ready(function() {
                     $("#popular").html('<h2>Popular</h2><hr>');
                     for (var i = 0; i < data.length; i++) {
                         $("#popular").append(
-                            '<a  href="?book_id=' + data[i].ids + '" class="">' + data[i].book +
+                            '<a  href="?book_id=' + data[i].id + '" class="">' + data[i].book +
                             ' (Author: ' + data[i].author + ')</a><hr>');
                     }
                     ajax_loader("clear");
@@ -1003,7 +1047,7 @@ $(document.body).ready(function() {
                     $("#recent").html('<h2>Recent</h2><hr>');
                     for (var i = 0; i < data.length; i++) {
                         $("#recent").append(
-                            '<a  href="?book_id=' + data[i].ids + '" class="">' + data[i].book +
+                            '<a  href="?book_id=' + data[i].id + '" class="">' + data[i].book +
                             ' (Author: ' + data[i].author + ')</a><hr>');
                     }
                     ajax_loader("clear");
@@ -1068,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");
+                    }
+               }
      });
 }