Changeset 197

Timestamp:

12/08/08 16:37:02 (5 years ago)

Author:

samuraraujo

Message:

 

Location:

Explorator/trunk

Files:

• app/controllers/explorator_controller.rb (modified) (1 diff)
• app/helpers/explorator_helper.rb (modified) (2 diffs)
• app/helpers/render_helper.rb (modified) (1 diff)
• lib/dataload.rb (modified) (2 diffs)
• lib/query_builder.rb (modified) (6 diffs)
• public/javascripts/explorator_controller.js (modified) (3 diffs)

Explorator/trunk/app/controllers/explorator_controller.rb

@@ -15 +15 @@
   # attr_accessor :resourceset
   #default rails method. returns the view index.rhtml.
-  def index        
+  def index     
+ 
 end
  

Explorator/trunk/app/helpers/explorator_helper.rb

@@ -22 +22 @@
     if((@filter!=nil)&&(@filter!=""))
       resources =   resources.select {|x| 
-      
-      render_resource(x).to_s().downcase.index(@filter.downcase) != nil}
+        
+        render_resource(x).to_s().downcase.index(@filter.downcase) != nil}
       @size = resources.size()
       return resources
     end
     resources = resources[@resourceset.offset.to_i,@resourceset.pagination.to_i]
-  resources
+    resources
   end
   def subjects(predicate, resource=nil)
@@ -67 +67 @@
     classes = Array.new      
     resource.type.each do |type|
-      classes <<   type.localname.downcase
+      
+        classes <<   type.localname.downcase
+     
     end    
-    classes.uniq.join(' ') << ' '
+    classes.uniq.join(' ') << ' '    
   end
   #verifies whether the resource is from type class.

Explorator/trunk/app/helpers/render_helper.rb

@@ -19 +19 @@
   # The heuristic used is the following:
   #If was defined a resource view than render it, else render the first resource type's view. 
-  def render_resource (resource)   
-  
-     
+  def render_resource (resource)       
     return truncate(resource) if !(resource.instance_of? RDFS::Resource)     
     #if a view was defined by the user.        

Explorator/trunk/lib/dataload.rb

@@ -25 +25 @@
 
 adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://localhost:8080/openrdf-sesame/repositories/NOKIA", :results => :sparql_xml, :caching =>true
-adapter.title='NOKIA_SPARQL'
+adapter.title='NOKIA_DEFAULT'
 
 adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://localhost:8080/openrdf-sesame/repositories/MONDIAL", :results => :sparql_xml, :caching =>true
-adapter.title='MONDIAL_SPARQL'
+adapter.title='MONDIAL_DEFAULT'
 
 adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://localhost:8080/openrdf-sesame/repositories/CIA", :results => :sparql_xml, :caching =>true
-adapter.title='CIA_SPARQL'
+adapter.title='CIA_DEFAULT'
 
 #adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://localhost:8087/openrdf-sesame/repositories/METAMODEL", :results => :sparql_xml, :caching =>true
@@ -37 +37 @@
 
 adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://localhost:8080/openrdf-sesame/repositories/FACETO", :results => :sparql_xml, :caching =>true
-adapter.title='FACETO'
+adapter.title='FACETO_DEFAULT'
 #adapter =ConnectionPool.add_data_source :type => :sparql,:engine => :sesame2, :url => "http://data.linkedmdb.org/sparql", :results => :sparql_xml, :caching =>true
 #adapter.title='IMDB_SPARQL'

Explorator/trunk/lib/query_builder.rb

@@ -15 +15 @@
   attr_accessor  :result  
   #constructor.
-  def initialize(s=nil,p=nil,o=nil,*r)    
+  def initialize(s=nil,p=nil,o=nil,r=nil)    
     # initialize the variable query with the ActiveRDF Query
     @result = Array.new    
@@ -35 +35 @@
   #
   #returns a array of resource. Sometimes the parameter s could be a SemanticExpression instance.
-  def resource_or_self(s)
+  def resource_or_self(s,r)
     if s == nil
       Array.new 
     elsif s.instance_of? SemanticExpression
-      s.result.collect {|s,p,o| s}.compact.uniq
+      s.result.collect {|s,p,o| eval(r.to_s)}.compact.uniq
     elsif s.instance_of? Array
       s
@@ -52 +52 @@
   #the same method as query, but it is able to treat arrays.
   #This methos
-  def spo(s,p,o,*r)      
+  def spo(s,p,o,r=nil)      
     result = Array.new 
-    s = resource_or_self(s)
-    p = resource_or_self(p)
-    o = resource_or_self(o)
+    s = resource_or_self(s,r)
+    p = resource_or_self(p,r)
+    o = resource_or_self(o,r)
     s.each do |x|
       p.each do |y|
@@ -74 +74 @@
   #Wrapper for the class ActiveRDF Query. This method executes a query and returns a set of resources.
   #With parameter must be a single resource.
-  def query(s,p,o,*r)       
+  def query(s,p,o,r=nil)       
     q = Query.new    
     if r.to_s == :p.to_s
@@ -141 +141 @@
         tmp = SemanticExpression.new.spo(Thread.current[:application].get(s).elements.collect{|s,p,o| eval(r.to_s)}.uniq,:p,:o).result
       else
-        tmp =  Thread.current[:application].get(s).elements
+        tmp =Thread.current[:application].get(s).elements
       end
       #Intersection method, passed as parameter a triple expression
     else
-      tmp =  query(s,p,o,r)
+      tmp = query(s,p,o,r)
     end
     #@result = @result & tmp - The intersection is between the subjects and it is not between triples.
@@ -206 +206 @@
     end
     return false
+  end
+  def resources(r)
+    self.result.collect {|s,p,o| eval(r.to_s)}
   end
   

Explorator/trunk/public/javascripts/explorator_controller.js

@@ -148 +148 @@
                                 view = 'object_view';
                         } 
-            ajax_create(new SemanticExpression().spo(new SemanticExpression(':s'), new SemanticExpression(':p'), new SemanticExpression(':o'), parameters.get(':r')) + "&view=" + view);
+            ajax_create(new SemanticExpression().spo(':s', ':p', ':o', ':r') + "&view=" + view);
                 }                  
           clear();
@@ -187 +187 @@
 /////////////////////////////// SEMANTIC OPERATIONS //////////////////////////////////////////
 //These are the operations applyed over triples or semantics annotations
-function cmd_semantic(){
-    
-    
+function cmd_semantic(){    
          $$('._clear').each(function(item){
         item.onclick = function(){
@@ -281 +279 @@
         return this;
     },
-    spo: function(s, p, o, r){
-        this.expression += '.spo(' + s + ',' + p + ',' + o + ',' + r + ')';
+        getResourcesArray: function (param){
+                var a = parameters.get(param);
+                var expression = '';
+                if (a == undefined) 
+            return param;
+        //The parameter could be only one element or several.                   
+        if (Object.isArray(a)) {                        
+            expression += a.map(function(x){
+                                var resource = Element.resource(x);
+                                if (resource == 'null'){ 
+                                var exp = x.readAttribute('exp');
+                                if (exp.indexOf (':o,:o')!= -1)
+                                {
+                                        return 'SemanticExpression.new' + encodeURIComponent(exp.replace(":o,:o",':o')) +'.resources(:o)' ;                                     
+                                }else if (exp.indexOf (':o,:p') != -1)
+                                {
+                                        return 'SemanticExpression.new' + encodeURIComponent(exp.replace(":o,:p",':o')) +'.resources(:p)' ;                                     
+                                }else{
+                                        return 'SemanticExpression.new' + encodeURIComponent(exp) +'.resources(:s)' ;                                   
+                                }
+                                }else{
+                                    return "['" + resource + "']" ;
+                                }
+            }).join('|');                       
+        }       
+                return  expression ; //returns a array of resources in ruby
+        },
+    spo: function(s, p, o, r){          
+        this.expression += '.spo(' + this.getResourcesArray(s) + ',' + this.getResourcesArray(p) + ',' + this.getResourcesArray(o) + ',' + parameters.get(r) + ')';
         return this;
     },