Added 'query_errors' to report dynamic query errors.

lib/zena/use/query_builder.rb

@@ -5,14 +5,20 @@ module QueryBuilder
       module ViewMethods
         include RubyLess
         safe_method [:query_parse, String] => {:class => String, :accept_nil => true}
+        safe_method :query_errors => {:class => String, :nil => true}
 
         def find_node_by_zip(zip)
           return nil unless zip
           secure(Node) { Node.find_by_zip(zip) }
         end
 
+        def query_errors
+          @query_errors
+        end
+
         def query(class_name, node_name, pseudo_sql, opts = {})
           type = opts[:type] || :find
+          @query_errors = nil
           if klass = VirtualClass[class_name]
             begin
               query = klass.build_query(:all, pseudo_sql,
@@ -28,9 +34,7 @@ def query(class_name, node_name, pseudo_sql, opts = {})
                 return klass.do_find(:all, eval(query.to_s))
               end
             rescue ::QueryBuilder::Error => err
-              msg = "Error in dynamic query #{pseudo_sql.inspect}: #{err}"
-              js_data << "alert(#{msg.inspect})" if dev_mode?
-              Node.logger.info msg
+              @query_errors = "<span class='query'>#{pseudo_sql}</span> <span class='error'>#{err}</span>"
             end
           end
           # error

test/integration/zafu_compiler/query.yml

@@ -237,4 +237,10 @@ select_group_count_having:
 core_context:
   # Ensure that :project rubyless method uses enrollable.
   src: "<r:project do='origin || title'/>"
-  tem: "/ar1.prop\['origin'\] or var1.prop\['title'\]/"
+  tem: "/ar1.prop\['origin'\] or var1.prop\['title'\]/"
+
+query_errors:
+  context:
+    c: 'badaboum'
+  src: "<r:query default='nodes' select='nodes in #{params[:c]}'><r:elsif test='query_errors' do='query_errors'/></r:query>"
+  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope 'badaboum'.</span>"