patch n° 1 Crawlers ISTEX PUBMED

moissonneurs/istex.py

@@ -30,7 +30,10 @@ def query( request ):
 
     if request.method == "POST":
         query = request.POST["query"]
-        N = int(request.POST["N"])
+        if request.POST[N] == "NaN":
+            N = QUERY_SIZE_N_MAX
+        else:
+            N = int(request.POST["N"])
         print ("LOG::TIME:_ "+datetime.datetime.now().isoformat()+" query =", query )
         print ("LOG::TIME:_ "+datetime.datetime.now().isoformat()+" N =", N )
         query_string = query.replace(" ","+")
@@ -77,7 +80,7 @@ def save(request , project_id):
     if project.user_id != user.id:
         return HttpResponseForbidden()
 
-
+    query_string = ""
     if request.method == "POST":
         query = "-"
         query_string = "-"
@@ -88,7 +91,10 @@ def save(request , project_id):
             query_string = query.replace(" ","+")   # url encoded q
 
         if "N" in request.POST:
-            N = int(request.POST["N"])     # query_size from views_opti
+            if request.POST["N"] == "NaN":
+                N = QUERY_SIZE_N_MAX
+            else:
+                N = int(request.POST["N"])     # query_size from views_opti
             if N > QUERY_SIZE_N_MAX:
                 msg = "Invalid sample size N = %i (max = %i)" % (N, QUERY_SIZE_N_MAX)
                 print("ERROR (scrap: istex d/l ): ",msg)
@@ -133,7 +139,7 @@ def save(request , project_id):
             if filename!=False:
                 # add the uploaded resource to the corpus
                 corpus.add_resource(
-                  type = get_resource_by_name('ISTex [ISI]')["type"]
+                  type = get_resource_by_name('ISTex')["type"]
                 , path = filename
                                    )
                 dwnldsOK+=1

moissonneurs/pubmed.py

@@ -48,7 +48,10 @@ def query( request ):
 
     if request.method == "POST":
         query = request.POST["query"]
-        N = int(request.POST["N"])
+        if request.POST["N"] == "NaN":
+            N = QUERY_SIZE_N_MAX
+        else:
+            N = int(request.POST["N"])
 
         if N > QUERY_SIZE_N_MAX:
             msg = "Invalid sample size N = %i (max = %i)" % (N, QUERY_SIZE_N_MAX)

templates/pages/projects/project.html

@@ -364,6 +364,7 @@
                         }
 
                         function getGlobalResults(value){
+
                             console.log("in getGlobalResults()")
                             // AJAX to django
                             var pubmedquery = $("#id_name").val()
@@ -376,7 +377,7 @@
 
                             var theType = $("#id_type option:selected").html();
 
-                            if(theType=="Pubmed (XML format)") {
+                            if(theType=="Pubmed [XML]") {
                                 $.ajax({
                                     // contentType: "application/json",
                                     url: window.location.origin+"/moissonneurs/pubmed/query",
@@ -388,7 +389,7 @@
                                     success: function(data) {
                                         console.log("SUCCESS")
                                         console.log("in getGlobalResults")
-                                        // console.log(data)
+                                        console.log(data)
                                         console.log("enabling "+"#"+value.id)
                                         $("#"+value.id).attr('onclick','getGlobalResults(this);');
                                         // $("#submit_thing").prop('disabled' , false)