Merge branch 'master' into dev

Author: Konstiman

server/preprocessing/other-scripts/base.R

@@ -38,7 +38,6 @@ blog <- getLogger('api.base')
 
 
 get_papers <- function(query, params, limit=100,
-                       filter=NULL,
                        retry_opts=rbace::bs_retry_options(3,60,3,4)) {
 
   blog$info(paste("vis_id:", .GlobalEnv$VIS_ID, "Search:", query))

server/preprocessing/other-scripts/text_similarity.R

@@ -6,11 +6,6 @@ query <- args[2]
 service <- args[3]
 params_file <- args[4]
 
-print(wd)
-print(query)
-print(service)
-print(params_file)
-
 setwd(wd) #Don't forget to set your working directory
 
 source('../other-scripts/utils.R')
@@ -86,14 +81,10 @@ switch(service,
       }
 )
 
-print("inhere")
-
 MAX_CLUSTERS = 15
 LANGUAGE <- get_service_lang(lang_id, valid_langs, service)
 ADDITIONAL_STOP_WORDS = LANGUAGE$name
 
-print("reading stuff")
-print(params)
 failed <- list(params=params)
 tryCatch({
   query <- sanitize_query(query)
@@ -105,7 +96,6 @@ tryCatch({
 })
 
 if(exists('input_data')) {
-  print("got the input")
   tryCatch({
     output_json = vis_layout(input_data$text, input_data$metadata,
                              service,

server/preprocessing/other-scripts/utils.R

@@ -104,6 +104,9 @@ detect_error <- function(failed, service) {
         reason <- c(reason, 'API error: timeout')
     }
     if (length(reason) == 0 && service == 'base') {
+      if (grepl("Timeout was reached: [api.base-search.net]", failed$query_reason, fixed=TRUE)){
+          reason <- list('BASE error: timeout')
+      }
       if (grepl("xml_find_first", failed$query_reason, fixed=TRUE)){
         reason <- c(reason, 'API error: BASE not reachable')
       }