blacklight_advanced_search 1.0.0pre5 → 1.0.0

data/README.rdoc

@@ -3,8 +3,8 @@ This is an advanced search plugin for Blacklight ( http://www.projectblacklight.
 == Pre-requisites:
 * The Blacklight plugin ( http://github.com/projectblacklight/blacklight )
   * NOTE: Blacklight 3.x is required for current version of Advanced Search plugin
-  * advanced search plugin 0.12.0 will work with Blacklight 2.9/Rails2. 
-  * Older tagged versions of Advanced Search may work with older BL. 
+  * advanced search plugin latest 0.X.X version will work with Blacklight 2.9/Rails2. 
+  * Older tagged versions of Advanced Search may work with even older BL. 
 
 
 == Installation:

data/VERSION

@@ -1 +1 @@
-1.0.0pre5
+1.0.0

data/lib/blacklight_advanced_search/controller.rb

@@ -51,24 +51,39 @@ module BlacklightAdvancedSearch::Controller
   # BlacklightAdvancedSearch init code will add it to CatalogController
   # if it's configured to do so. You can of course add it yourself
   # manually too. 
+  #
+  # Note: For syntactically invalid input, we'll just skip the adv
+  # parse and send it straight to solr same as if advanced_parse_q
+  # were not being used. 
   def add_advanced_parse_q_to_solr(solr_parameters, req_params = params)
-    debugger
     unless req_params[:q].blank?
       field_def = Blacklight.search_field_def_for_key( req_params[:search_field]) ||
         Blacklight.default_search_field
         
+              
       # If the individual field has advanced_parse_q suppressed, punt
       return if field_def[:advanced_parse_q] == false  
         
       solr_direct_params = field_def[:solr_parameters] || {}
       solr_local_params = field_def[:solr_local_parameters] || {}
       
-      deep_merge!(solr_parameters, solr_direct_params)
-      
-      deep_merge!(
-        solr_parameters, 
-        ParsingNesting::Tree.parse(req_params[:q]).to_single_query_params( solr_local_params )  
-       )
+      # See if we can parse it, if we can't, we're going to give up
+      # and just allow basic search, perhaps with a warning.
+      begin
+        adv_search_params = ParsingNesting::Tree.parse(req_params[:q]).to_single_query_params( solr_local_params )
+        
+        deep_merge!(solr_parameters, solr_direct_params)
+        
+        deep_merge!(
+          solr_parameters, 
+          adv_search_params    
+         )
+      rescue Parslet::UnconsumedInput => e 
+        # do nothing, don't merge our input in, keep basic search
+        # optional TODO, display error message in flash here, but hard to 
+        # display a good one. 
+        return
+      end
     end
   end
 
@@ -97,6 +112,8 @@ module BlacklightAdvancedSearch::Controller
   end
   
   
+  
+  
 end
 
   

metadata

@@ -1,58 +1,77 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: blacklight_advanced_search
-version: !ruby/object:Gem::Version
-  version: 1.0.0pre5
-  prerelease: 5
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Jonathan Rochkind
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 -04:00
+
+date: 2011-09-12 00:00:00 -04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &2156044920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156044920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: blacklight
-  requirement: &2156044000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156044000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: parslet
-  requirement: &2156043200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156043200
+  version_requirements: *id003
 description: 
-email:
+email: 
 - blacklight-development@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - LICENSE
 - README.rdoc
@@ -101,29 +120,38 @@ files:
 has_rdoc: true
 homepage: http://projectblacklight.org/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: blacklight
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Blacklight Advanced Search plugin
-test_files:
+test_files: 
 - spec/lib/filter_parser_spec.rb
 - spec/parsing_nesting/build_tree_spec.rb
 - spec/parsing_nesting/consuming_spec.rb