Merge branch 'virtuoso_integration' of gitlab.com:participa/noosfero into virtuoso_integration

Victor Costa
2 parents ca63fd93 2bd1be30
Showing 8 changed files with 67 additions and 34 deletions Show diff stats
plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb
plugins/virtuoso/lib/virtuoso_plugin.rb
plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
plugins/virtuoso/public/edit-server-list.js
plugins/virtuoso/public/style.css
plugins/virtuoso/public/virtuoso_plugin_admin.css
plugins/virtuoso/views/virtuoso_plugin_admin/_server_list_item.html.erb
plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
 class VirtuosoPluginAdminController < AdminController
+  #validates :dspace_servers, presence: true
+  
   def index
-    settings = params[:settings]
+    settings = params[:settings] 
     settings ||= {}
     @settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)
     @harvest_running = VirtuosoPlugin::DspaceHarvest.new(environment).find_job.present?
-
     if request.post?
+      settings[:dspace_servers].delete_if do | server | 
+        server[:dspace_uri].empty?
+      end
       @settings.save!
       session[:notice] = 'Settings successfully saved.'
       redirect_to :action => 'index'
@@ -14,8 +18,7 @@ class VirtuosoPluginAdminController &lt; AdminController
   end
   def force_harvest
-    harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
-    harvest.start(params[:from_start])
+    VirtuosoPlugin::DspaceHarvest.harvest_all(environment, params[:from_start])
     session[:notice] = _('Harvest started')
     redirect_to :action => :index
   end
 class VirtuosoPlugin < Noosfero::Plugin
+  @virtuosoServers
+  
   def self.plugin_name
     "Virtuoso integration"
   end
@@ -24,10 +26,6 @@ class VirtuosoPlugin &lt; Noosfero::Plugin
     @virtuoso_readonly_client ||= virtuoso_client_builder(settings.virtuoso_uri, settings.virtuoso_readonly_username, settings.virtuoso_readonly_password)
   end
-  def js_files
-    ['edit-server-list']
-  end
-
   def stylesheet?
     true
   end
@@ -2,9 +2,10 @@
 class VirtuosoPlugin::DspaceHarvest
   DC_CONVERSION = [:title, :creator, :subject, :description, :date, :type, :identifier, :language, :rights, :format]
-
-  def initialize(environment)
+ 
+  def initialize(environment, dspace_uri = "")
     @environment = environment
+    @dspace_uri = dspace_uri
   end
   attr_reader :environment
@@ -16,7 +17,7 @@ class VirtuosoPlugin::DspaceHarvest
   delegate :settings, :to => :plugin
   def dspace_client
-    @dspace_client ||= OAI::Client.new("#{settings.dspace_uri}/oai/request")
+    @dspace_client ||= OAI::Client.new("#{@dspace_uri}/oai/request")
   end
   def triplify(record)
@@ -26,7 +27,7 @@ class VirtuosoPlugin::DspaceHarvest
     DC_CONVERSION.each do |c|
       values = [metadata.send(c)].flatten.compact
       values.each do |value|
-        query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(metadata.identifier), RDF::URI.new("http://purl.org/dc/elements/1.1/#{c}"), value]).graph(RDF::URI.new(settings.dspace_uri))
+        query = RDF::Virtuoso::Query.insert_data([RDF::URI.new(metadata.identifier), RDF::URI.new("http://purl.org/dc/elements/1.1/#{c}"), value]).graph(RDF::URI.new(@dspace_uri))
         plugin.virtuoso_client.insert(query)
       end
     end
@@ -35,7 +36,7 @@ class VirtuosoPlugin::DspaceHarvest
   def run
     harvest_time = Time.now.utc
     params = settings.last_harvest ? {:from => settings.last_harvest.utc} : {}
-    puts "starting harvest #{params} #{settings.dspace_uri} #{settings.virtuoso_uri}"
+    puts "starting harvest #{params} #{@dspace_uri} #{settings.virtuoso_uri}"
     begin
       records = dspace_client.list_records(params)
       records.each do |record|
@@ -52,14 +53,22 @@ class VirtuosoPlugin::DspaceHarvest
     settings.save!
     puts "ending harvest #{harvest_time}"
   end
-
+    
+  def self.harvest_all(environment, from_start)
+    settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin)
+    settings.dspace_servers.each do |k, v|
+      harvest = VirtuosoPlugin::DspaceHarvest.new(environment, k[:dspace_uri])
+      harvest.start(from_start)
+      harvest.run
+    end    
+  end  
+  
   def start(from_start = false)
     if find_job.empty?
       if from_start
         settings.last_harvest = nil
         settings.save!
       end
-
       job = VirtuosoPlugin::DspaceHarvest::Job.new(@environment.id)
       Delayed::Job.enqueue(job)
     end
@@ -13,24 +13,21 @@ function send_ajax(source_url) {
         }
       });
     },
-
     minLength: 3
   });
 }
 function new_server_action(){
   send_ajax(jQuery("#page_url").val());
-
   jQuery(".delete-server-list-row").click(function(){
-    jQuery(this).parent().parent().remove();
+    jQuery(this).parent().remove();
     return false;
   });
-
   jQuery(document).scrollTop(jQuery('#dropable-server-list').scrollTop());
 }
 function add_new_server() {
-  var new_server = jQuery('#edit-server-list-block #new-template>li').clone();
+  var new_server = jQuery('#edit-server-list-block #dspace-new-template > div').clone();
   new_server.show();
   jQuery('#dropable-server-list').append(new_server);
   new_server_action();
@@ -39,8 +36,8 @@ function add_new_server() {
 jQuery(document).ready(function(){
   new_server_action();
-  jQuery("#dropable-server-list").sortable({
-    revert: true,
-    axis: "y"
-  });
+//  jQuery("#dropable-server-list").sortable({
+//    revert: true,
+//    axis: "y"
+//  });
 });
@@ -29,3 +29,4 @@
 #virtuoso-triples-management #triples-list .triple-actions {
   text-align: right;
 }
+
@@ -0,0 +1,8 @@
+.dspace-servers-config-box{
+  border: 1px solid gray;
+  padding: 5px;
+}
+
+#dspace-new-template{
+  display: none;
+}
 \ No newline at end of file
@@ -0,0 +1,7 @@
+<div>
+  <% value = server_list_item[:dspace_uri] if server_list_item %>
+  <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60 } %>
+  <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>
+  <BR><BR>  
+</div>
+ 
 <%= javascript_include_tag '/plugins/virtuoso/edit-server-list' %>
+<link rel="stylesheet" type="text/css" href="/plugins/virtuoso/virtuoso_plugin_admin.css">
-<h1><%= _('Virtuoso settings')%></h1>
+<h1><%= _('Virtuoso settings') %></h1>
 <%= form_for(:settings) do |f| %>
-
   <strong>
     <%= labelled_form_field _('Virtuoso URL:'), f.text_field(:virtuoso_uri) %>
     <%= labelled_form_field _('Virtuoso Admin Username:'), f.text_field(:virtuoso_username) %>
@@ -12,14 +12,26 @@
     <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password) %>
     <%= labelled_form_field _('DSpace URL:'), f.text_field(:dspace_uri) %>
   </strong>
-
+  <BR> 
+<div class="dspace-servers-config-box" >
+  
+  <strong><%= _('Dspace Servers\' URL:') %></strong>
+  <div id='edit-server-list-block'>
+    <div id="dropable-server-list">
+      <%= render :partial => 'server_list_item', :collection=>@settings.dspace_servers  %>
+    </div>
+    <div id="dspace-new-template">
+      <div >  
+        <%= render :partial => 'server_list_item', :locals => {:dspace_uri => "http://"} %>
+      </div>  
+  </div>
+    <%= link_to_function(_('New Dspace Server'), 'add_new_server();', :class => 'button icon-add with-text') %>
+  </div>
+</div>  
   <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+      <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <% end %>
   <% end %>
-
-<% end %>
-
-<hr/>
 <div class="harvest">
   <% if @settings.last_harvest %>
   <div class="date">
@@ -36,9 +48,7 @@
     <% end %>
   </div>
 </div>
-
 <hr />
-
 <div class="triple-management">
   <div class="actions">
     <%= button :edit, _('Triples management'), :action => :triples_management %>
	@@ -29,3 +29,4 @@		@@ -29,3 +29,4 @@
29	#virtuoso-triples-management #triples-list .triple-actions {	29	#virtuoso-triples-management #triples-list .triple-actions {
30	text-align: right;	30	text-align: right;
31	}	31	}
		32	+
	@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
		1	+.dspace-servers-config-box{
		2	+ border: 1px solid gray;
		3	+ padding: 5px;
		4	+}
		5	+
		6	+#dspace-new-template{
		7	+ display: none;
		8	+}
0	\ No newline at end of file	9	\ No newline at end of file
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+<div>
	2	+ <% value = server_list_item[:dspace_uri] if server_list_item %>
	3	+ <%= text_field_tag 'settings[dspace_servers][][dspace_uri]', value, { :class => 'link-name', :maxlength => 60 } %>
	4	+ <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>
	5	+ <BR><BR>
	6	+</div>
	7	+