talia_core 0.4.0 → 0.4.1

data/lib/talia_core/active_source_parts/xml/generic_reader.rb

@@ -14,7 +14,7 @@ module TaliaCore
       # present. If attributes for one source are imported in more than one place, all
       # subsequent calls will merge the newly imported attributes with the existing ones.
       class GenericReader
-        
+
         extend TaliaUtil::IoHelper
         include TaliaUtil::Progressable
 
@@ -87,7 +87,7 @@ module TaliaCore
           if(use_root && self.respond_to?("#{@doc.root.name}_handler".to_sym))
             run_with_progress('XmlRead', 1) { read_source(@doc.root) }
           else
-            read_children_of(@doc.root)
+            read_children_with_progress(@doc.root)
           end
           @sources.values
         end
@@ -126,14 +126,18 @@ module TaliaCore
           attribs = call_handler(element, &block)
           add_source_with_check(attribs) if(attribs)
         end
-        
-        def read_children_of(element, &block)
+
+        def read_children_with_progress(element, &block)
           run_with_progress('Xml Read', element.children.size) do |prog|
-            element.children.each do |element|
-              prog.inc
-              next unless(element.is_a?(Hpricot::Elem))
-              read_source(element, &block)
-            end
+            read_children_of(element, prog, &block)
+          end
+        end
+
+        def read_children_of(element, progress = nil, &block)
+          element.children.each do |element|
+            progress.inc if(progress)
+            next unless(element.is_a?(Hpricot::Elem))
+            read_source(element, &block)
           end
         end
 
@@ -142,7 +146,7 @@ module TaliaCore
         end
 
         private
-        
+
 
         # Removes all characters that are illegal in IRIs, so that the
         # URIs can be imported

data/lib/talia_core/data_types/mime_mapping.rb

@@ -28,6 +28,10 @@ module TaliaCore
           :xml => { :type => XmlData },
           :html =>{ :type => XmlData },
           :tei => { :type => XmlData },
+          :tei_p5 => { :type => XmlData },
+          :tei_p4 => { :type => XmlData }, 
+          :gml => { :type => XmlData },
+          :wittei => { :type => XmlData },
           :hnml => { :type => XmlData },
           :jpeg => { :type => ImageData, :loader => :create_iip },
           :tiff => { :type => ImageData, :loader => :create_iip },

data/lib/talia_dependencies.rb

@@ -6,7 +6,7 @@ RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Stuff we may need to load from sources/uninstalled versions
 TLoad::require_module("assit", "assit", "/../../assit") unless(defined?(assit))
-TLoad::require_module("activerdf", "active_rdf", "/../../ActiveRDF")
+TLoad::require_module("activerdf_net7", "active_rdf", "/../../ActiveRDF")
 TLoad::require_module("semantic_naming", "semantic_naming", "/../../semantic_naming")
 
 require 'version'

metadata

@@ -5,7 +5,7 @@ homepage: http://trac.talia.discovery-project.eu/
 executables: 
 - talia
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 post_install_message: 
 date: 2009-10-13 22:00:00 +00:00
 files: 
@@ -166,7 +166,7 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 1.99.1
+        version: 2.0.5
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: activesupport
@@ -176,17 +176,17 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 1.99.1
+        version: 2.0.5
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: activerdf
+  name: activerdf_net7
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     version: 
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.6.11
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: assit
@@ -196,7 +196,7 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 0.0.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: semantic_naming
@@ -206,7 +206,47 @@ dependencies:
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
-        version: 0.0.1
+        version: 2.0.0
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: averell23-bj
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    version: 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: hpricot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    version: 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: oai
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    version: 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 0.0.12
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: ruby-openid
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    version: 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 2.1.7
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: builder