Changeset 128

Timestamp:

10/25/08 22:12:05 (5 years ago)

Author:

samuraraujo

Message:

 

Location:

Explorator/trunk/app

Files:

• controllers/explorator_controller.rb (modified) (1 diff)
• helpers/explorator_helper.rb (modified) (1 diff)
• models/explorator_application.rb (modified) (5 diffs)
• models/resource_set.rb (modified) (1 diff)

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| 
-      puts x
+      
       render_resource(x).to_s().downcase.index(@filter.downcase) != nil}
       @size = resources.size()

Explorator/trunk/app/models/explorator_application.rb

@@ -17 +17 @@
 class Application  
    attr_accessor :uri
+
   def initialize(id)   
     super()
     @uri = 'http://www.tecweb.inf.puc-rio.br/application/id/'+  id + '/'
   end
-  def instance()   
-   
-    if @instance == nil      
+  def instance()    
+    if @instance == nil     
+      @cache = Hash.new
       @instance=EXPLORATOR::Application.new(@uri + 'default')
       @instance.explorator::uuid=@uri
@@ -36 +37 @@
   def add(resourceset)    
     raise ExploratorError.new('Must be a ResourceSet instance') if !resourceset.instance_of? EXPLORATOR::Set
+    puts '## Adding to cache ##'
+    puts resourceset.uri
+    @cache['<' + resourceset.uri + '>'] = resourceset
+    
     if instance.explorator::set == nil
       instance.explorator::set = [resourceset]
@@ -44 +49 @@
   #get a resource set
   def get(uri)        
-    EXPLORATOR::Set.new(uri) 
+    #EXPLORATOR::Set.new(uri) 
+    puts '## Retrieving from the cache ##'
+    puts uri
+    @cache[uri]
   end    
   ##verifies whether the set was added in the pool
@@ -85 +93 @@
       end
     end
+    @cache = Hash.new
     #remove the resources from the application
     instance.explorator::set = []
@@ -116 +125 @@
   #remove a specific resource set from the pool
   def remove(uri)      
+    @cache[uri]=nil
     resource = EXPLORATOR::Set.new(uri)     
     #before remove store the set expression.     

Explorator/trunk/app/models/resource_set.rb

@@ -64 +64 @@
   end
   #defines a new expression and reevaluates the expression.
-  def expression=(exp)      
+  def expression=(exp)  
+    puts '## Evaluating Expression ##'
     puts exp
    # begin           
       #for avoid loop evaluation.
-     current_expression = self.explorator::expression
+      current_expression = self.explorator::expression
       exp.gsub!("'" + self.to_s + "'",current_expression) if  current_expression != nil
-      #evaluates the expression
-      
-      x = eval(exp)
-     
+      #evaluates the expression      
+      x = eval(exp)     
 #      updates the expression
       self.explorator::expression = exp