talia_core 0.5.1 → 0.5.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 1
+:patch: 2
 :build: 

data/lib/swicky/json_encoder.rb

@@ -12,6 +12,7 @@ module Swicky
     end
 
     def to_json
+      puts @triples.inspect
       @items ||= begin
         items = []
         # First a round to make sure that each item has a label
@@ -20,7 +21,8 @@ module Swicky
         triple_hash.each { |object, values| items += build_item(object, values) }
         items
       end
-      hashy = { 'items' => @items, 'types' => @types_hash, 'properties' => @properties_hash }
+      # hashy = { 'items' => @items, 'types' => @types_hash, 'properties' => @properties_hash }
+      # puts hashy.inspect
       { 'items' => @items, 'types' => @types_hash, 'properties' => @properties_hash }.to_json
     end  
 
@@ -73,6 +75,7 @@ module Swicky
         additional_items << additional if(additional)
         label
       end
+      labels.uniq!
       [(labels.size == 1) ? labels.first : labels, additional_items]
     end
     
@@ -94,6 +97,7 @@ module Swicky
       end
       # All types will be referred to by their local name
       types.collect! { |type| make_type_local(type) }
+      types.uniq!
       types
     end
     

data/lib/swicky/notebook.rb

@@ -112,9 +112,9 @@ module Swicky
         # TODO: Fix this to better query once available in ActiveRDF
         additional_triples = []
         result_triples.each do |trip|
-          additional_triples += ActiveRDF::Query.new(N::URI).select(:predicate, :object).where(trip[1].to_uri, :predicate, :object).execute.collect { |result| [trip[1].to_uri] + result }
+          additional_triples += ActiveRDF::Query.new(N::URI).select(:predicate, :object).distinct.where(trip[1].to_uri, :predicate, :object).execute.collect { |result| [trip[1].to_uri] + result }
           if(trip.last.respond_to?(:uri))
-            additional_triples += ActiveRDF::Query.new(N::URI).select(:predicate, :object).where(trip.last, :predicate, :object).execute.collect { |result| [trip.last] + result }
+            additional_triples += ActiveRDF::Query.new(N::URI).select(:predicate, :object).distinct.where(trip.last, :predicate, :object).execute.collect { |result| [trip.last] + result }
           end
         end
         

data/lib/talia_core/initializer.rb

@@ -354,11 +354,11 @@ module TaliaCore
         onto_dir = File.join(TALIA_ROOT, @config['auto_ontologies'])
         raise(SystemInitializationError, "Cannot find configured ontology dir #{onto_dir}") unless(File.directory?(onto_dir))
         adapter = ActiveRDF::ConnectionPool.write_adapter
-        raise(SystemInitializationError, "Ontology autoloading without a context-aware adapter deletes all RDF data. This is only allowed in testing, please load the ontology manually.") unless(adapter.supports_context? || (@environment == 'testing'))
+        raise(SystemInitializationError, "Ontology autoloading without a context-aware adapter deletes all RDF data. This is only allowed in testing, please load the ontology manually.") unless(adapter.contexts || (@environment == 'testing'))
         raise(SystemInitializationError, "Ontology autoloading requires 'load' capability on the adapter.") unless(adapter.respond_to?(:load))
 
         # Clear out the RDF
-        if(adapter.supports_context?)
+        if(adapter.contexts)
           TaliaCore::RdfImport.clear_file_contexts
         else
           adapter.respond_to?(:clear) ? adapter.clear : TaliaUtil::Util::flush_rdf
@@ -369,7 +369,7 @@ module TaliaCore
         Dir.foreach(onto_dir) do |file|
           if(file =~ /\.owl$|\.rdf$|\.rdfs$/)
             file = File.expand_path(File.join(onto_dir, file))
-            adapter.supports_context? ? TaliaCore::RdfImport.import_file(file, 'rdfxml', :auto) : TaliaCore::RdfImport.import_file(file, 'rdfxml')
+            adapter.contexts ? TaliaCore::RdfImport.import_file(file, 'rdfxml', :auto) : TaliaCore::RdfImport.import_file(file, 'rdfxml')
             loaded_ontos << File.basename(file)
           end
         end
@@ -383,7 +383,7 @@ module TaliaCore
         path_to_core_ext = File.join(TALIA_CODE_ROOT, 'lib', 'core_ext')
         Dir[path_to_core_ext + '/**/*.rb'].each { |f| require f}
       end
-      
+
       # Register the default mime types
       def register_mime_types
 
@@ -411,7 +411,7 @@ module TaliaCore
           Mime::Type.register "application/xml+#{type}", type.gsub(/-/, '_').to_sym, [], [ type ] 
         end
       end
-      
+
     end
   end
 

data/lib/talia_core/rdf_import.rb

@@ -14,7 +14,7 @@ module TaliaCore
       def import(rdf_syntax, files, context=nil)
         puts "Importing #{files.size} files into the triple store."
         
-        raise(ArgumentError, "Cannot use context, adapter doesn't support it.") if(context && !adapter.supports_context?)
+        raise(ArgumentError, "Cannot use context, adapter doesn't support it.") if(context && !adapter.contexts)
         
         # check if the connection to te triplestore is ok...otherwise exit the script
         if !adapter

data/lib/talia_util/util.rb

@@ -26,7 +26,7 @@ module TaliaUtil
       def setup_ontologies
         # Clear the ontologies from RDF, if possible
         adapter = ActiveRDF::ConnectionPool.write_adapter
-        if(adapter.supports_context?)
+        if(adapter.contexts)
           TaliaCore::RdfImport.clear_file_contexts
         else
           puts "WARNING: Cannot remove old ontologies, adapter doesn't support contexts."
@@ -36,7 +36,7 @@ module TaliaUtil
         files = Dir[File.join(ontology_folder, '*.{rdf*,owl}')]
         ENV['rdf_syntax'] ||= 'rdfxml'
         params = [ENV['rdf_syntax'], files]
-        params << :auto if(adapter.supports_context?)
+        params << :auto if(adapter.contexts)
         TaliaCore::RdfImport::import(*params)
         RdfUpdate::owl_to_rdfs
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: talia_core
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
   - Danilo Giacomi
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-02-15 00:00:00 +01:00
 default_executable: talia
 dependencies: 
   - !ruby/object:Gem::Dependency