Merge branch 'virtuoso_integration' into stable

Victor Costa
2 parents 996e4d6f 8f767e88
Showing 23 changed files with 441 additions and 76 deletions Show diff stats
plugins/virtuoso/controllers/admin/virtuoso_plugin_ontology_mapping_controller.rb
plugins/virtuoso/controllers/virtuoso_plugin_admin_controller.rb
plugins/virtuoso/lib/virtuoso_plugin.rb
plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
plugins/virtuoso/lib/virtuoso_plugin/dublin_core_metadata.rb
plugins/virtuoso/lib/virtuoso_plugin/triple.rb
plugins/virtuoso/lib/virtuoso_plugin/triples_management.rb
plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb
plugins/virtuoso/public/edit-server-list.js
plugins/virtuoso/public/ontology_mapping.js
plugins/virtuoso/public/style.css
plugins/virtuoso/public/triples_management.js
plugins/virtuoso/public/virtuoso_plugin_admin.css
plugins/virtuoso/test/functional/virtuoso_plugin_admin_controller_test.rb
plugins/virtuoso/test/functional/virtuoso_plugin_ontology_mapping_controller.rb
plugins/virtuoso/test/unit/dublin_core_metadata_test.rb
plugins/virtuoso/test/unit/virtuoso_plugin_test.rb
plugins/virtuoso/views/virtuoso_plugin_admin/_server_list_item.html.erb
plugins/virtuoso/views/virtuoso_plugin_admin/add_triple.html.erb
plugins/virtuoso/views/virtuoso_plugin_admin/index.html.erb
@@ -0,0 +1,13 @@
+class VirtuosoPluginOntologyMappingController < AdminController
+
+  def index
+    @settings = VirtuosoPlugin.new(self).settings
+    if request.post?
+      @settings.ontology_mapping = params['ontology_mapping']
+      @settings.save!
+      session[:notice] = _('Saved!')
+    end
+    @ontology_mapping = @settings.ontology_mapping
+  end
+
+end
@@ -5,8 +5,10 @@ class VirtuosoPluginAdminController &lt; AdminController
     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,13 +16,12 @@ 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
-  def triple_management
+  def triples_management
     triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
     @triples = []
     if request.post?
@@ -45,4 +46,33 @@ class VirtuosoPluginAdminController &lt; AdminController
     redirect_to :action => :triple_management
   end
+  def add_triple
+    if request.post?
+
+      triple = VirtuosoPlugin::Triple.new
+      triple.graph = params[:triple][:graph]
+      triple.subject = params[:triple][:subject]
+      triple.predicate = params[:triple][:predicate]
+      triple.object = params[:triple][:object]
+
+      triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
+      triples_management.add_triple(triple)
+
+      render json: { :ok => true, :message => _('Triple succesfully added.') }
+    end
+  end
+
+  def remove_triple
+    triple = VirtuosoPlugin::Triple.new
+    triple.graph = params[:triple][:graph]
+    triple.subject = params[:triple][:subject]
+    triple.predicate = params[:triple][:predicate]
+    triple.object = params[:triple][:object]
+
+    triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
+    triples_management.remove_triple(triple)
+
+    render json: { :ok => true, :message => _('Triple succesfully removed.') }
+  end
+
 end
@@ -24,14 +24,16 @@ 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
+  def self.ontology_mapping_default_setting
+    VirtuosoPlugin::DublinCoreMetadata::FIELDS.map do |field|
+      {:source => "dc:#{field}", :target => "http://purl.org/dc/elements/1.1/#{field}"}
+    end
+  end
+
   protected
   def virtuoso_client_builder(uri, username, password)
 #inspired by https://github.com/code4lib/ruby-oai/blob/master/lib/oai/harvester/harvest.rb
 class VirtuosoPlugin::DspaceHarvest
-  DC_CONVERSION = [:title, :creator, :subject, :description, :date, :type, :identifier, :language, :rights, :format]
-
-  def initialize(environment)
+  def initialize(environment, dspace_uri = nil)
     @environment = environment
+    @dspace_uri = dspace_uri
   end
   attr_reader :environment
@@ -16,17 +15,18 @@ 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)
     metadata = VirtuosoPlugin::DublinCoreMetadata.new(record.metadata)
-    puts "triplify #{record.header.identifier}"
+    subject_identifier = extract_identifier(record)
+    puts "triplify #{subject_identifier}"
-    DC_CONVERSION.each do |c|
-      values = [metadata.send(c)].flatten.compact
+    settings.ontology_mapping.each do |mapping|
+      values = [metadata.extract_field(mapping[:source])].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(subject_identifier), RDF::URI.new(mapping[:target]), value]).graph(RDF::URI.new(@dspace_uri))
         plugin.virtuoso_client.insert(query)
       end
     end
@@ -35,7 +35,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|
@@ -53,28 +53,42 @@ class VirtuosoPlugin::DspaceHarvest
     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)
+    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)
+      job = VirtuosoPlugin::DspaceHarvest::Job.new(@environment.id, @dspace_uri)
       Delayed::Job.enqueue(job)
     end
   end
   def find_job
-    Delayed::Job.where(:handler => "--- !ruby/struct:VirtuosoPlugin::DspaceHarvest::Job\nenvironment_id: #{@environment.id}\n")
+    Delayed::Job.where(:handler => "--- !ruby/struct:VirtuosoPlugin::DspaceHarvest::Job\nenvironment_id: #{@environment.id}\ndspace_uri: #{@dspace_uri}\n")
   end
-  class Job < Struct.new(:environment_id)
+  class Job < Struct.new(:environment_id, :dspace_uri)
     def perform
       environment = Environment.find(environment_id)
-      harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
+      harvest = VirtuosoPlugin::DspaceHarvest.new(environment, dspace_uri)
       harvest.run
     end
   end
+  protected
+
+  def extract_identifier(record)
+    parsed_identifier = /oai:(.+):(\d+\/\d+)/.match(record.header.identifier)
+    "#{@dspace_uri}/handle/#{parsed_identifier[2]}"
+  end
+
 end
@@ -2,19 +2,27 @@ class VirtuosoPlugin::DublinCoreMetadata
   include OAI::XPath
-  attr_accessor :date, :title, :creator, :subject, :description, :date, :type, :identifier, :language, :rights, :format
+  FIELDS = ['title', 'creator', 'subject', 'description', 'date',
+            'type', 'identifier', 'language', 'rights', 'format']
   def initialize(element)
-    @title = xpath(element, './/dc:title')
-    @creator = xpath(element, './/dc:creator')
-    @subject = xpath_all(element, './/dc:subject').map(&:text)
-    @description = xpath(element, './/dc:description')
-    @date = xpath(element, './/dc:date')
-    @type = xpath(element, './/dc:type')
-    @identifier = xpath(element, './/dc:identifier')
-    @language = xpath(element, './/dc:language')
-    @rights = xpath_all(element, './/dc:rights').map(&:text)
-    @format = xpath(element, './/dc:format')
+    @element = element
+    FIELDS.each do |field|
+      self.class.send(:attr_accessor, field)
+      self.send("#{field}=", extract_field("dc:#{field}"))
+    end
+  end
+
+  def extract_field(name)
+    value = xpath_all(@element, ".//#{name}")
+    case value.size
+    when 0
+      nil
+    when 1
+      value.first.text
+    else
+      value.map(&:text)
+    end
   end
 end
@@ -0,0 +1,16 @@
+class VirtuosoPlugin::Triple
+
+  attr_accessor :graph, :subject, :predicate, :object
+
+  def object=(value)
+    @object = format_triple_term(value)
+  end
+
+  protected
+
+  def format_triple_term(term)
+    term =~ /^(http|https):\/\// ? "<#{term}>" : "'#{term}'"
+  end
+
+end
+
@@ -29,6 +29,16 @@ class VirtuosoPlugin::TriplesManagement
     plugin.virtuoso_client.query(query)
   end
+  def add_triple(triple)
+    query = "WITH <#{triple.graph}> INSERT { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
+    plugin.virtuoso_client.query(query)
+  end
+
+  def remove_triple(triple)
+    query = "WITH <#{triple.graph}> DELETE { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
+    plugin.virtuoso_client.query(query)
+  end
+
   protected
   def format_triple_term(term)
@@ -21,6 +21,7 @@ class VirtuosoPlugin::TriplesTemplate &lt; Article
   settings_items :query, :type => :string
   settings_items :template, :type => :string, :default => initial_template
   settings_items :stylesheet, :type => :string
+  settings_items :per_page, :type => :integer, :default => 50
   attr_accessible :query, :template, :stylesheet
@@ -35,12 +36,12 @@ class VirtuosoPlugin::TriplesTemplate &lt; Article
     @plugin ||= VirtuosoPlugin.new(self)
   end
-  def template_content
+  def template_content(page=1)
     begin
-      results = plugin.virtuoso_readonly_client.query(query)
+      results = plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page})
       liquid_template = Liquid::Template.parse(template)
-      page = liquid_template.render('results' => results)
-      transform_html(page)
+      rendered_template = liquid_template.render('results' => results)
+      transform_html(rendered_template)
     rescue => ex
       logger.info ex.to_s
       "Failed to process the template"
@@ -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"
+//  });
 });
@@ -0,0 +1,11 @@
+jQuery(document).ready(function($) {
+
+  $('#new-ontology-button').on('click', function() {
+    $('#ontology-table').append($('#ontology-item-template tr').clone());
+  });
+
+  $('#ontology-table').on('click', '.remove-ontology-button', function() {
+    $(this).parents('tr').remove();
+  });
+
+});
@@ -2,7 +2,8 @@
   margin: 10px 0;
 }
-#virtuoso-triples-management input[type="text"] {
+#virtuoso-triples-management input[type="text"],
+#virtuoso-triples-management-add-triple input[type="text"] {
   width: 100%
 }
@@ -10,7 +11,8 @@
   width: 99%;
 }
-#virtuoso-triples-management ul {
+#virtuoso-triples-management ul,
+#virtuoso-triples-management-add-triple ul {
   list-style-type: none;
   padding: 0;
 }
@@ -25,3 +27,12 @@
   margin-top: 20px;
   padding-top: 15px;
 }
+
+#virtuoso-triples-management #triples-list .triple-actions {
+  text-align: right;
+}
+
+#virtuoso-triples-management-add-triple {
+  width: 500px;
+  border: 1px solid white;
+}
@@ -0,0 +1,69 @@
+function add_triple() {
+  graph = jQuery("input#triple_graph").val();
+  subject = jQuery("input#triple_subject").val();
+  predicate = jQuery("input#triple_predicate").val();
+  object = jQuery("input#triple_object").val();
+
+  var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } }
+
+  jQuery.ajax({
+    cache: false,
+    type: 'POST',
+    url: '/admin/plugin/virtuoso/add_triple',
+    data: formData,
+    dataType: 'json',
+    success: function(data, status, ajax){
+      if ( !data.ok ) {
+        display_notice(data.error.message);
+        jQuery.colorbox.close();
+      }
+      else {
+        display_notice(data.message);
+        jQuery.colorbox.close();
+      }
+    },
+    error: function(ajax, status, errorThrown) {
+      alert('Send request - HTTP '+status+': '+errorThrown);
+    }
+  });
+
+  return false;
+}
+
+function remove_triple(triple_id) {
+  graph = jQuery("input#graph_uri").val();
+  subject = jQuery("input#triples_triple" + triple_id + "_from_subject").val();
+  predicate = jQuery("input#triples_triple" + triple_id + "_from_predicate").val();
+  object = jQuery("input#triples_triple" + triple_id + "_from_object").val();
+
+  var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } }
+
+  jQuery.ajax({
+    cache: false,
+    type: 'POST',
+    url: '/admin/plugin/virtuoso/remove_triple',
+    data: formData,
+    dataType: 'json',
+    success: function(data, status, ajax){
+      if ( !data.ok ) {
+        display_notice(data.error.message);
+      }
+      else {
+        display_notice(data.message);
+        jQuery("li#triple-" + triple_id).fadeOut(700, function() {
+          if (jQuery("ul#triples-list > li").length == 1) {
+            jQuery("form#form-triples-edit").remove();
+          }
+          else {
+            jQuery("li#triple-" + triple_id).remove();
+          }
+        });
+      }
+    },
+    error: function(ajax, status, errorThrown) {
+      alert('Send request - HTTP '+status+': '+errorThrown);
+    }
+  });
+
+  return false;
+}
@@ -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
@@ -9,17 +9,26 @@ class VirtuosoPluginAdminControllerTest &lt; ActionController::TestCase
   end
   attr_reader :environment
-
+ 
   should 'save virtuoso plugin settings' do
-    post :index, :settings => {'virtuoso_uri' => 'http://virtuoso.noosfero.com',
-                               'virtuoso_username' => 'username',
-                               'virtuoso_password' => 'password',
-                               'dspace_uri' => 'http://dspace.noosfero.com'}
+    post :index, :settings =>
+          {:virtuoso_uri=>"http://virtuoso.noosfero.com",
+           :virtuoso_username=>"username", :virtuoso_password=>"password",
+           :virtuoso_readonly_username=>"password",
+           :virtuoso_readonly_password=>"password",
+           :dspace_servers=>[ 
+                              {"dspace_uri"=>"http://dspace1.noosfero.com"},
+                              {"dspace_uri"=>"http://dspace2.noosfero.com"},
+                              {"dspace_uri"=>"http://dspace3.noosfero.com"}
+                            ]
+          }
     @settings = Noosfero::Plugin::Settings.new(environment.reload, VirtuosoPlugin)
     assert_equal 'http://virtuoso.noosfero.com', @settings.settings[:virtuoso_uri]
     assert_equal 'username', @settings.settings[:virtuoso_username]
     assert_equal 'password', @settings.settings[:virtuoso_password]
-    assert_equal 'http://dspace.noosfero.com', @settings.settings[:dspace_uri]
+    assert_equal 'http://dspace1.noosfero.com', @settings.settings[:dspace_servers][0][:dspace_uri]
+    assert_equal 'http://dspace2.noosfero.com', @settings.settings[:dspace_servers][1][:dspace_uri]
+    assert_equal 'http://dspace3.noosfero.com', @settings.settings[:dspace_servers][2][:dspace_uri]    
     assert_redirected_to :action => 'index'
   end
@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class VirtuosoPluginOntologyMappingControllerTest < ActionController::TestCase
+
+  setup do
+    @environment = Environment.default
+    @plugin = VirtuosoPlugin.new(self)
+    login_as(create_admin_user(environment))
+    @ontology_mapping = [{'source' => 'title',   'target' => 'http://purl.org/dc/elements/1.1/title'},
+                         {'source' => 'creator', 'target' => 'http://purl.org/dc/elements/1.1/creator'}]
+  end
+
+  attr_reader :environment, :plugin, :ontology_mapping
+
+  should 'list saved mappings' do
+    settings = plugin.settings
+    settings.ontology_mapping = ontology_mapping
+    settings.save!
+    get :index
+    assert_select "#ontology-table tr", 3 do
+      assert_select "input[name='ontology_mapping[][source]']"
+      assert_select "input[name='ontology_mapping[][target]']"
+    end
+  end
+
+  should 'save ontology mappings' do
+    post :index, 'ontology_mapping' => ontology_mapping
+    @environment = environment.reload
+    assert_equivalent ontology_mapping, plugin.settings.ontology_mapping
+  end
+
+end
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class DublinCoreMetadataTest < ActiveSupport::TestCase
+
+  should 'parse default dublin core fields' do
+    dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
+    assert_equal "Title", dc.title
+    assert_equal "Creator", dc.creator
+    assert_equal ["Subject", "Other Subject"], dc.subject
+    assert_equal "Description", dc.description
+    assert_equal "2014", dc.date
+    assert_equal "Type", dc.type
+    assert_equal "Identifier", dc.identifier
+    assert_equal "Language", dc.language
+    assert_equal "Rights", dc.rights
+    assert_equal "Format", dc.format
+  end
+
+  should 'extract fields' do
+    dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
+    assert_equal "Title", dc.extract_field('dc:title')
+    assert_equal "Creator", dc.extract_field('dc:creator')
+    assert_equal ["Subject", "Other Subject"], dc.extract_field('dc:subject')
+  end
+
+  should 'return nil when field do not exists' do
+    dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
+    assert_equal nil, dc.extract_field('dc:undefinedField')
+  end
+
+  def metadata
+    REXML::Document.new('
+      <metadata>
+        <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/">
+          <dc:title>Title</dc:title>
+          <dc:creator>Creator</dc:creator>
+          <dc:subject>Subject</dc:subject>
+          <dc:subject>Other Subject</dc:subject>
+          <dc:description>Description</dc:description>
+          <dc:date>2014</dc:date>
+          <dc:type>Type</dc:type>
+          <dc:identifier>Identifier</dc:identifier>
+          <dc:language>Language</dc:language>
+          <dc:rights>Rights</dc:rights>
+          <dc:format>Format</dc:format>
+        </oai_dc:dc>
+      </metadata>
+    ')
+  end
+
+end
@@ -29,4 +29,8 @@ class VirtuosoPluginTest &lt; ActiveSupport::TestCase
     plugin.virtuoso_readonly_client
   end
+  should 'has a default value for ontology mapping setting' do
+    assert plugin.settings.ontology_mapping
+  end
+
 end
@@ -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, :size=> 58 } %>
+  <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-server-list-row") %>
+  <BR><BR>  
+</div>
+ 
@@ -0,0 +1,29 @@
+<div id="virtuoso-triples-management-add-triple">
+
+  <h3><%= _('Add Triple')%></h3>
+
+  <%= form_tag do %>
+
+    <ul>
+      <li>
+        <%= labelled_form_field(_('Graph:'), text_field_tag('triple[graph]', '') ) %>
+      </li>
+      <li>
+        <%= labelled_form_field(_('Subject:'), text_field_tag('triple[subject]', '') ) %>
+      </li>
+      <li>
+        <%= labelled_form_field(_('Predicate:'), text_field_tag('triple[predicate]', '') ) %>
+      </li>
+      <li>
+        <%= labelled_form_field(_('Object:'), text_field_tag('triple[object]', '') ) %>
+      </li>
+    </ul>
+
+    <% button_bar do %>
+      <%= button :add, _('Add'), {}, :href => '#', :onclick => "add_triple(); return false;" %>
+      <%= colorbox_close_button(_('Close')) %>
+    <% end %>
+
+  <% end %>
+
+</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) %>
-    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password) %>
-    <%= labelled_form_field _('Virtuoso Read-Only Username:'), f.text_field(:virtuoso_readonly_username) %>
-    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password) %>
-    <%= labelled_form_field _('DSpace URL:'), f.text_field(:dspace_uri) %>
+    <%= labelled_form_field _('Virtuoso URL:'), f.text_field(:virtuoso_uri, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Admin Username:'), f.text_field(:virtuoso_username, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Admin Password:'), f.password_field(:virtuoso_password, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Read-Only Username:'), f.text_field(:virtuoso_readonly_username, :size=> 60) %>
+    <%= labelled_form_field _('Virtuoso Read-Only Password:'), f.password_field(:virtuoso_readonly_password, :size=> 60) %>
   </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,12 +47,11 @@
     <% end %>
   </div>
 </div>
-
 <hr />
-
 <div class="triple-management">
   <div class="actions">
-    <%= button :edit, _('Triple management'), :action => :triple_management %>
+    <%= button :edit, _('Triples management'), :action => :triples_management %>
     <%= button :edit, _('Custom Queries'), :action => :index, :controller => 'virtuoso_plugin_custom_queries' %>
+    <%= button :edit, _('Ontology mapping'), :action => :index, :controller => 'virtuoso_plugin_ontology_mapping' %>
   </div>
 </div>
 <div id="virtuoso-triples-management">
   <h1><%= _('Virtuoso settings &raquo; Triples Management')%></h1>
-  <%= form_tag('/admin/plugin/virtuoso/triple_management', :method => 'post') do %>
-    <%= labelled_form_field(_('Default Graph IRI:'), text_field_tag(:graph_uri, @graph_uri) ) %>
+  <%= form_tag('/admin/plugin/virtuoso/triples_management', :method => 'post') do %>
+    <%= labelled_form_field(_('Graph URI:'), text_field_tag(:graph_uri, @graph_uri) ) %>
     <%= labelled_form_field(_('Query SPARQL:'), text_area_tag(:query, @query, :rows => 7)) %>
     <% button_bar do %>
-      <%= submit_button(:search, _('Search')) %>
+      <%= submit_button(:search, _('Search triples')) %>
+      <%= colorbox_button('add', _('Add a triple'), { :action => 'add_triple' }) %>
     <% end %>
   <% end %>
   <% unless @triples.empty? %>
-  <%= form_tag('/admin/plugin/virtuoso/triple_update', :method => 'post') do %>
+  <%= form_tag('/admin/plugin/virtuoso/triple_update', :method => 'post', :id => 'form-triples-edit') do %>
     <%= hidden_field_tag(:graph_uri, @graph_uri) %>
     <ul id="triples-list">
@@ -20,7 +21,7 @@
     <% @triples.each { |triple| %>
-      <li>
+      <li id="triple-<%=triple_counter%>">
         <ul class="triple">
           <li>
             <%= hidden_field_tag("triples[triple#{triple_counter}[from][subject]]", triple[:s].to_s) %>
@@ -34,6 +35,9 @@
             <%= hidden_field_tag("triples[triple#{triple_counter}[from][object]]", triple[:o].to_s) %>
             <%= labelled_form_field(_('Object:'), text_field_tag("triples[triple#{triple_counter}[to][object]]", triple[:o].to_s) ) %>
           </li>
+          <li class="triple-actions">
+            <%= button :remove, _('Remove triple'), {}, :href => '#', :onclick => "remove_triple(#{triple_counter}); return false;" %>
+          </li>
         </ul>
       </li>
@@ -52,3 +56,5 @@
   <% end %>
 </div>
+
+<%= javascript_include_tag '/plugins/virtuoso/triples_management.js' %>
@@ -0,0 +1,5 @@
+<tr>
+  <td><%= text_field_tag 'ontology_mapping[][source]', ontology_mapping_item[:source] %></td>
+  <td><%= text_field_tag 'ontology_mapping[][target]', ontology_mapping_item[:target], :style => 'width: 100%' %></td>
+  <td><%= button :remove, _('Remove'), '#', :class => "remove-ontology-button" %></td>
+</tr>
@@ -0,0 +1,22 @@
+<h1><%= _('Ontology Mapping') %></h1>
+
+<%= form_for :ontology_mapping do |f| %>
+<table id="ontology-table">
+  <tr>
+    <th width="30%"><%= _('Source') %></th>
+    <th width="70%"><%= _('Target') %></th>
+    <th></th>
+  </tr>
+  <%= render :partial => 'ontology_mapping_item', :collection => @ontology_mapping %>
+</table>
+<div class="actions">
+  <%= button :new, _('New'), '#', :id => 'new-ontology-button' %>
+  <%= submit_button :save, _('Save') %>
+</div>
+<% end %>
+
+<table id="ontology-item-template" style="display: none">
+  <%= render :partial => 'ontology_mapping_item', :collection => [{:source => '', :target => ''}] %>
+</table>
+
+<%= javascript_include_tag '/plugins/virtuoso/ontology_mapping.js' %>
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class VirtuosoPluginOntologyMappingController < AdminController
	2	+
	3	+ def index
	4	+ @settings = VirtuosoPlugin.new(self).settings
	5	+ if request.post?
	6	+ @settings.ontology_mapping = params['ontology_mapping']
	7	+ @settings.save!
	8	+ session[:notice] = _('Saved!')
	9	+ end
	10	+ @ontology_mapping = @settings.ontology_mapping
	11	+ end
	12	+
	13	+end
	@@ -5,8 +5,10 @@ class VirtuosoPluginAdminController < AdminController		@@ -5,8 +5,10 @@ class VirtuosoPluginAdminController < AdminController
5	settings \|\|= {}	5	settings \|\|= {}
6	@settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)	6	@settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin, settings)
7	@harvest_running = VirtuosoPlugin::DspaceHarvest.new(environment).find_job.present?	7	@harvest_running = VirtuosoPlugin::DspaceHarvest.new(environment).find_job.present?
8	-
9	if request.post?	8	if request.post?
		9	+ settings[:dspace_servers].delete_if do \| server \|
		10	+ server[:dspace_uri].empty?
		11	+ end
10	@settings.save!	12	@settings.save!
11	session[:notice] = 'Settings successfully saved.'	13	session[:notice] = 'Settings successfully saved.'
12	redirect_to :action => 'index'	14	redirect_to :action => 'index'
	@@ -14,13 +16,12 @@ class VirtuosoPluginAdminController < AdminController		@@ -14,13 +16,12 @@ class VirtuosoPluginAdminController < AdminController
14	end	16	end
15		17
16	def force_harvest	18	def force_harvest
17	- harvest = VirtuosoPlugin::DspaceHarvest.new(environment)
18	- harvest.start(params[:from_start])	19	+ VirtuosoPlugin::DspaceHarvest.harvest_all(environment, params[:from_start])
19	session[:notice] = _('Harvest started')	20	session[:notice] = _('Harvest started')
20	redirect_to :action => :index	21	redirect_to :action => :index
21	end	22	end
22		23
23	- def triple_management	24	+ def triples_management
24	triples_management = VirtuosoPlugin::TriplesManagement.new(environment)	25	triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
25	@triples = []	26	@triples = []
26	if request.post?	27	if request.post?
	@@ -45,4 +46,33 @@ class VirtuosoPluginAdminController < AdminController		@@ -45,4 +46,33 @@ class VirtuosoPluginAdminController < AdminController
45	redirect_to :action => :triple_management	46	redirect_to :action => :triple_management
46	end	47	end
47		48
		49	+ def add_triple
		50	+ if request.post?
		51	+
		52	+ triple = VirtuosoPlugin::Triple.new
		53	+ triple.graph = params[:triple][:graph]
		54	+ triple.subject = params[:triple][:subject]
		55	+ triple.predicate = params[:triple][:predicate]
		56	+ triple.object = params[:triple][:object]
		57	+
		58	+ triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
		59	+ triples_management.add_triple(triple)
		60	+
		61	+ render json: { :ok => true, :message => _('Triple succesfully added.') }
		62	+ end
		63	+ end
		64	+
		65	+ def remove_triple
		66	+ triple = VirtuosoPlugin::Triple.new
		67	+ triple.graph = params[:triple][:graph]
		68	+ triple.subject = params[:triple][:subject]
		69	+ triple.predicate = params[:triple][:predicate]
		70	+ triple.object = params[:triple][:object]
		71	+
		72	+ triples_management = VirtuosoPlugin::TriplesManagement.new(environment)
		73	+ triples_management.remove_triple(triple)
		74	+
		75	+ render json: { :ok => true, :message => _('Triple succesfully removed.') }
		76	+ end
		77	+
48	end	78	end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class VirtuosoPlugin::Triple
	2	+
	3	+ attr_accessor :graph, :subject, :predicate, :object
	4	+
	5	+ def object=(value)
	6	+ @object = format_triple_term(value)
	7	+ end
	8	+
	9	+ protected
	10	+
	11	+ def format_triple_term(term)
	12	+ term =~ /^(http\|https):\/\// ? "<#{term}>" : "'#{term}'"
	13	+ end
	14	+
	15	+end
	16	+
	@@ -29,6 +29,16 @@ class VirtuosoPlugin::TriplesManagement		@@ -29,6 +29,16 @@ class VirtuosoPlugin::TriplesManagement
29	plugin.virtuoso_client.query(query)	29	plugin.virtuoso_client.query(query)
30	end	30	end
31		31
		32	+ def add_triple(triple)
		33	+ query = "WITH <#{triple.graph}> INSERT { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
		34	+ plugin.virtuoso_client.query(query)
		35	+ end
		36	+
		37	+ def remove_triple(triple)
		38	+ query = "WITH <#{triple.graph}> DELETE { <#{triple.subject}> <#{triple.predicate}> #{triple.object} }"
		39	+ plugin.virtuoso_client.query(query)
		40	+ end
		41	+
32	protected	42	protected
33		43
34	def format_triple_term(term)	44	def format_triple_term(term)
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+jQuery(document).ready(function($) {
	2	+
	3	+ $('#new-ontology-button').on('click', function() {
	4	+ $('#ontology-table').append($('#ontology-item-template tr').clone());
	5	+ });
	6	+
	7	+ $('#ontology-table').on('click', '.remove-ontology-button', function() {
	8	+ $(this).parents('tr').remove();
	9	+ });
	10	+
	11	+});
@@ -0,0 +1,69 @@		@@ -0,0 +1,69 @@
	1	+function add_triple() {
	2	+ graph = jQuery("input#triple_graph").val();
	3	+ subject = jQuery("input#triple_subject").val();
	4	+ predicate = jQuery("input#triple_predicate").val();
	5	+ object = jQuery("input#triple_object").val();
	6	+
	7	+ var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } }
	8	+
	9	+ jQuery.ajax({
	10	+ cache: false,
	11	+ type: 'POST',
	12	+ url: '/admin/plugin/virtuoso/add_triple',
	13	+ data: formData,
	14	+ dataType: 'json',
	15	+ success: function(data, status, ajax){
	16	+ if ( !data.ok ) {
	17	+ display_notice(data.error.message);
	18	+ jQuery.colorbox.close();
	19	+ }
	20	+ else {
	21	+ display_notice(data.message);
	22	+ jQuery.colorbox.close();
	23	+ }
	24	+ },
	25	+ error: function(ajax, status, errorThrown) {
	26	+ alert('Send request - HTTP '+status+': '+errorThrown);
	27	+ }
	28	+ });
	29	+
	30	+ return false;
	31	+}
	32	+
	33	+function remove_triple(triple_id) {
	34	+ graph = jQuery("input#graph_uri").val();
	35	+ subject = jQuery("input#triples_triple" + triple_id + "_from_subject").val();
	36	+ predicate = jQuery("input#triples_triple" + triple_id + "_from_predicate").val();
	37	+ object = jQuery("input#triples_triple" + triple_id + "_from_object").val();
	38	+
	39	+ var formData = { triple: { graph: graph, subject: subject, predicate: predicate, object: object } }
	40	+
	41	+ jQuery.ajax({
	42	+ cache: false,
	43	+ type: 'POST',
	44	+ url: '/admin/plugin/virtuoso/remove_triple',
	45	+ data: formData,
	46	+ dataType: 'json',
	47	+ success: function(data, status, ajax){
	48	+ if ( !data.ok ) {
	49	+ display_notice(data.error.message);
	50	+ }
	51	+ else {
	52	+ display_notice(data.message);
	53	+ jQuery("li#triple-" + triple_id).fadeOut(700, function() {
	54	+ if (jQuery("ul#triples-list > li").length == 1) {
	55	+ jQuery("form#form-triples-edit").remove();
	56	+ }
	57	+ else {
	58	+ jQuery("li#triple-" + triple_id).remove();
	59	+ }
	60	+ });
	61	+ }
	62	+ },
	63	+ error: function(ajax, status, errorThrown) {
	64	+ alert('Send request - HTTP '+status+': '+errorThrown);
	65	+ }
	66	+ });
	67	+
	68	+ return false;
	69	+}
	@@ -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,32 @@		@@ -0,0 +1,32 @@
	1	+require 'test_helper'
	2	+
	3	+class VirtuosoPluginOntologyMappingControllerTest < ActionController::TestCase
	4	+
	5	+ setup do
	6	+ @environment = Environment.default
	7	+ @plugin = VirtuosoPlugin.new(self)
	8	+ login_as(create_admin_user(environment))
	9	+ @ontology_mapping = [{'source' => 'title', 'target' => 'http://purl.org/dc/elements/1.1/title'},
	10	+ {'source' => 'creator', 'target' => 'http://purl.org/dc/elements/1.1/creator'}]
	11	+ end
	12	+
	13	+ attr_reader :environment, :plugin, :ontology_mapping
	14	+
	15	+ should 'list saved mappings' do
	16	+ settings = plugin.settings
	17	+ settings.ontology_mapping = ontology_mapping
	18	+ settings.save!
	19	+ get :index
	20	+ assert_select "#ontology-table tr", 3 do
	21	+ assert_select "input[name='ontology_mapping[][source]']"
	22	+ assert_select "input[name='ontology_mapping[][target]']"
	23	+ end
	24	+ end
	25	+
	26	+ should 'save ontology mappings' do
	27	+ post :index, 'ontology_mapping' => ontology_mapping
	28	+ @environment = environment.reload
	29	+ assert_equivalent ontology_mapping, plugin.settings.ontology_mapping
	30	+ end
	31	+
	32	+end
@@ -0,0 +1,51 @@		@@ -0,0 +1,51 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class DublinCoreMetadataTest < ActiveSupport::TestCase
	4	+
	5	+ should 'parse default dublin core fields' do
	6	+ dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
	7	+ assert_equal "Title", dc.title
	8	+ assert_equal "Creator", dc.creator
	9	+ assert_equal ["Subject", "Other Subject"], dc.subject
	10	+ assert_equal "Description", dc.description
	11	+ assert_equal "2014", dc.date
	12	+ assert_equal "Type", dc.type
	13	+ assert_equal "Identifier", dc.identifier
	14	+ assert_equal "Language", dc.language
	15	+ assert_equal "Rights", dc.rights
	16	+ assert_equal "Format", dc.format
	17	+ end
	18	+
	19	+ should 'extract fields' do
	20	+ dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
	21	+ assert_equal "Title", dc.extract_field('dc:title')
	22	+ assert_equal "Creator", dc.extract_field('dc:creator')
	23	+ assert_equal ["Subject", "Other Subject"], dc.extract_field('dc:subject')
	24	+ end
	25	+
	26	+ should 'return nil when field do not exists' do
	27	+ dc = VirtuosoPlugin::DublinCoreMetadata.new(metadata)
	28	+ assert_equal nil, dc.extract_field('dc:undefinedField')
	29	+ end
	30	+
	31	+ def metadata
	32	+ REXML::Document.new('
	33	+ <metadata>
	34	+ <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/">
	35	+ <dc:title>Title</dc:title>
	36	+ <dc:creator>Creator</dc:creator>
	37	+ <dc:subject>Subject</dc:subject>
	38	+ <dc:subject>Other Subject</dc:subject>
	39	+ <dc:description>Description</dc:description>
	40	+ <dc:date>2014</dc:date>
	41	+ <dc:type>Type</dc:type>
	42	+ <dc:identifier>Identifier</dc:identifier>
	43	+ <dc:language>Language</dc:language>
	44	+ <dc:rights>Rights</dc:rights>
	45	+ <dc:format>Format</dc:format>
	46	+ </oai_dc:dc>
	47	+ </metadata>
	48	+ ')
	49	+ end
	50	+
	51	+end
	@@ -29,4 +29,8 @@ class VirtuosoPluginTest < ActiveSupport::TestCase		@@ -29,4 +29,8 @@ class VirtuosoPluginTest < ActiveSupport::TestCase
29	plugin.virtuoso_readonly_client	29	plugin.virtuoso_readonly_client
30	end	30	end
31		31
		32	+ should 'has a default value for ontology mapping setting' do
		33	+ assert plugin.settings.ontology_mapping
		34	+ end
		35	+
32	end	36	end