diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index afe179aa..2cc28143 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -76,10 +76,13 @@ class Admin::ImportDataController < OrbitBackendController teachers = User.all teachers.each do |hash| - if hash.ntu_seq.present? - ntu_seq = hash.ntu_seq + # if hash.ntu_seq.present? + if hash.user_id.present? + # ntu_seq = hash.ntu_seq + u_account = hash.user_id books_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}")) @books = books_xml.xpath("//Book").map do |book_node| { author: (book_node>"Authors").text, @@ -125,10 +128,13 @@ class Admin::ImportDataController < OrbitBackendController teachers = User.all teachers.each do |hash| - if hash.ntu_seq.present? - ntu_seq = hash.ntu_seq + # if hash.ntu_seq.present? + if hash.user_id.present? + # ntu_seq = hash.ntu_seq + u_account = hash.user_id conference_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C")) #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml")) @conference_papers = conference_xml.xpath("//Paper").map do |cp_node| { @@ -196,11 +202,14 @@ class Admin::ImportDataController < OrbitBackendController teachers = User.all teachers.each do |hash| - if hash.ntu_seq.present? - ntu_seq = hash.ntu_seq + # if hash.ntu_seq.present? + if hash.user_id.present? + # ntu_seq = hash.ntu_seq + u_account = hash.user_id paper_xml = Nokogiri::XML( \ #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml")) - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J")) @journal_papers = paper_xml.xpath("//Paper").map do |paper_node| { author: (paper_node>"Authors").text, @@ -265,10 +274,13 @@ def sync_conference_data @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if @user.sid.present? - ntu_seq = @user.sid + # if @user.sid.present? + if @user.user_id.present? + # ntu_seq = @user.sid + u_account = @user.user_id conference_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C")) #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml")) @conference_papers = conference_xml.xpath("//Paper").map do |cp_node| { @@ -339,11 +351,14 @@ def sync_conference_data @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if @user.sid.present? - ntu_seq = @user.sid + # if @user.sid.present? + if @user.user_id.present? + # ntu_seq = @user.sid + u_account = @user.user_id paper_xml = Nokogiri::XML( \ #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml")) - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J")) @journal_papers = paper_xml.xpath("//Paper").map do |paper_node| { author: (paper_node>"Authors").text, @@ -417,10 +432,13 @@ def sync_book_data @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if @user.sid.present? - ntu_seq = @user.sid + # if @user.sid.present? + if @user.user_id.present? + # ntu_seq = @user.sid + u_account = @user.user_id books_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}")) @books = books_xml.xpath("//Book").map do |book_node| { author: (book_node>"Authors").text, @@ -470,10 +488,13 @@ end # @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if user.sid.present? - ntu_seq = user.sid + # if user.sid.present? + if user.user_id.present? + # ntu_seq = user.sid + u_account = user.user_id conference_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=C")) #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml")) @conference_papers = conference_xml.xpath("//Paper").map do |cp_node| { @@ -547,11 +568,14 @@ def sync_journal_paper_data_auto # @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if user.sid.present? - ntu_seq = user.sid + # if user.sid.present? + if user.user_id.present? + # ntu_seq = user.sid + u_account = user.user_id paper_xml = Nokogiri::XML( \ #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml")) - open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=paper&account=#{u_account}&type=J")) @journal_papers = paper_xml.xpath("//Paper").map do |paper_node| { author: (paper_node>"Authors").text, @@ -621,10 +645,13 @@ def sync_book_data_auto # @user = User.find("#{params[:user_id]}") # teachers.each do |hash| - if user.sid.present? - ntu_seq = user.sid + # if user.sid.present? + if user.user_id.present? + # ntu_seq = user.sid + u_account = user.user_id books_xml = Nokogiri::XML( \ - open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlData_useMail.asp?item=Book&account=#{u_account}")) @books = books_xml.xpath("//Book").map do |book_node| { author: (book_node>"Authors").text, diff --git a/config/routes.rb b/config/routes.rb index 00a3c39a..14a62ac3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -232,16 +232,6 @@ Orbit::Application.routes.draw do get "import_data/sync_journal_paper_data_auto" get "import_data/sync_conference_data_auto" - get "import_data/get_teacher_data" - get "import_data/get_book_data" - get "import_data/get_conference_data" - get "import_data/get_journal_paper_data" - get "import_data/get_announcement_data" - get "import_data/get_page_data" - get "import_data/sync_book_data" - get "import_data/sync_journal_paper_data" - get "import_data/sync_conference_data" - resources :tags do collection do post 'add_to_default'