From 8441c81e13e94c79a6e44119582becb59d16d528 Mon Sep 17 00:00:00 2001 From: Simon Mayer <simon.mayer@onb.ac.at> Date: Mon, 12 Sep 2022 15:33:12 +0200 Subject: [PATCH] Remove debug prints for now --- app/channels/application_cable/connection.rb | 2 +- app/controllers/catalog_controller.rb | 2 +- app/controllers/concerns/authentication.rb | 6 +++--- app/controllers/dataset_controller.rb | 20 ++++++++++---------- app/models/solr_searcher.rb | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb index a427edb..785dda3 100644 --- a/app/channels/application_cable/connection.rb +++ b/app/channels/application_cable/connection.rb @@ -11,7 +11,7 @@ module ApplicationCable def find_user current_user = User.find_by(labs_user_id: "2") if current_user - puts "Current user case, id #{current_user.id}" + # puts "Current user case, id #{current_user.id}" current_user else puts "Unauthorized connection rejected" diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index ecd7a53..e78b045 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -55,7 +55,7 @@ class CatalogController < ApplicationController @issue = Issue.from_solr params[:id], with_pages = true, with_articles = true session["named_entities"] = Issue.named_entities @issue.id session["named_entities_labels"] = helpers.get_linked_entities session["named_entities"].map { |k, v| v.keys }.flatten.uniq - puts session.inspect + # puts session.inspect end ## diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb index c573d8c..9694605 100644 --- a/app/controllers/concerns/authentication.rb +++ b/app/controllers/concerns/authentication.rb @@ -16,7 +16,7 @@ module Authentication @user = User.find_by(labs_user_id: id_dict["labs_user_id"]) if @user if !session[:current_user_id] - puts "Logging in the user since current_user_id was not set" + # puts "Logging in the user since current_user_id was not set" login @user end else @@ -30,7 +30,7 @@ module Authentication def login(user) reset_session session[:current_user_id] = user.id - puts "The user id taken from session is " + String(session[:current_user_id]) + # puts "The user id taken from session is " + String(session[:current_user_id]) end private @@ -58,7 +58,7 @@ module Authentication (timestamp.unpack("Q>")[0] - Time.now.to_i).abs < 3600 && OpenSSL.fixed_length_secure_compare(hmac, computed_hmac) # all good - puts "Token authenticated" + # puts "Token authenticated" else # do something now raise "Invalid Token" diff --git a/app/controllers/dataset_controller.rb b/app/controllers/dataset_controller.rb index d2d29f0..63b89aa 100644 --- a/app/controllers/dataset_controller.rb +++ b/app/controllers/dataset_controller.rb @@ -4,19 +4,19 @@ class DatasetController < ApplicationController ## # List all datasets def index - puts "Listing datasets" - puts session.inspect + # puts "Listing datasets" + # puts session.inspect end ## # Display a single dataset def show - puts "Finding dataset with id " + String(params[:id]) + # puts "Finding dataset with id " + String(params[:id]) @dataset = Dataset.find(params[:id]) @current_page = params[:page] || 1 @per_page = params[:per_page] || 10 session[:working_dataset] = @dataset.id - puts "The session now has working_dataset " + String(session[:working_dataset]) + # puts "The session now has working_dataset " + String(session[:working_dataset]) end ## @@ -111,16 +111,16 @@ class DatasetController < ApplicationController def set_working_dataset session[:working_dataset] = params[:dataset_id] @title = Dataset.find(session[:working_dataset]).title - puts "Setting working dataset to " + String(session[:working_dataset]) - puts session.inspect + # puts "Setting working dataset to " + String(session[:working_dataset]) + # puts session.inspect respond_to do |format| format.js end end def add_selected_documents - puts session.inspect - puts "User id from session is " + String(session[:current_user_id]) + " and working dataset is " + String(session[:working_dataset]) + # puts session.inspect + # puts "User id from session is " + String(session[:current_user_id]) + " and working dataset is " + String(session[:working_dataset]) out = {} @nb_added_docs = params[:documents_ids].size dataset = Dataset.find(session[:working_dataset]) @@ -156,10 +156,10 @@ class DatasetController < ApplicationController def remove_selected_documents @nb_removed_docs = params[:documents_ids].size - puts "Remove selected documents called, session has working dataset with id " + String(session[:working_dataset]) + # puts "Remove selected documents called, session has working dataset with id " + String(session[:working_dataset]) dataset = Dataset.find(session[:working_dataset]) dataset.remove_documents params[:documents_ids] - puts request.host, request.port, request.url, request.original_fullpath + # puts request.host, request.port, request.url, request.original_fullpath redirect_to "http://127.0.0.1:8001/en/tool/newspapers-platform/dataset/#{dataset.id}", id: dataset.id end diff --git a/app/models/solr_searcher.rb b/app/models/solr_searcher.rb index 0ba1863..664c1eb 100644 --- a/app/models/solr_searcher.rb +++ b/app/models/solr_searcher.rb @@ -5,7 +5,7 @@ class SolrSearcher def self.query(params) connect unless @@connection - puts "[SolrSearcher.Query] #{params.to_json}\n" if Rails.env == "development" + # puts "[SolrSearcher.Query] #{params.to_json}\n" if Rails.env == "development" @@connection.send_and_receive("select", data: params, method: :post) end -- GitLab