start work on 'generic' search box

3 files changed, 30 insertions, 8 deletions

diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index ebb70d90..61ba0029 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -9,6 +9,7 @@ from flask_wtf.csrf import CSRFError
 from fatcat_client import Editgroup, EditgroupAnnotation
 from fatcat_client.rest import ApiException
 from fatcat_tools.transforms import *
+from fatcat_tools.normal import *
 from fatcat_web import app, api, auth_api, priv_api, mwoauth
 from fatcat_web.auth import handle_token_login, handle_logout, load_user, handle_ia_xauth, handle_wmoauth
 from fatcat_web.cors import crossdomain
@@ -496,6 +497,31 @@ def reviewable_view():
 
 ### Search ##################################################################
 
+@app.route('/search', methods=['GET', 'POST'])
+def generic_search():
+    if not 'q' in request.args.keys():
+        return redirect('/release/search')
+    query = request.args.get('q').strip()
+
+    if len(query.split()) != 1:
+        # multi-term? must be a real search
+        return redirect(url_for('release_search', q=query))
+
+    if clean_doi(query):
+        return redirect(url_for('release_lookup', doi=clean_doi(query)))
+    if clean_pmcid(query):
+        return redirect(url_for('release_lookup', pmcid=clean_pmcid(query)))
+    if clean_sha1(query):
+        return redirect(url_for('file_lookup', sha1=clean_sha1(query)))
+    if clean_issn(query):
+        return redirect(url_for('container_lookup', issnl=clean_issn(query)))
+    if clean_isbn13(query):
+        return redirect(url_for('release_lookup', isbn13=clean_isbn13(query)))
+    if clean_orcid(query):
+        return redirect(url_for('creator_lookup', orcid=clean_orcid(query)))
+
+    return redirect(url_for('release_search', q=query))
+
 @app.route('/release/search', methods=['GET', 'POST'])
 def release_search():
 
@@ -734,10 +760,6 @@ def page_about():
 def page_rfc():
     return render_template('rfc.html')
 
-@app.route('/search', methods=['GET'])
-def page_search_redirect():
-    return redirect("/release/search")
-
 @app.route('/robots.txt', methods=['GET'])
 def robots():
     return send_from_directory(os.path.join(app.root_path, 'static'),
diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html
index 9255c9c3..2ada551d 100644
--- a/python/fatcat_web/templates/base.html
+++ b/python/fatcat_web/templates/base.html
@@ -49,7 +49,7 @@
     <a href="/changelog" class="item">Changelog</a>
     <div class="right menu">
       <div class="item" style="padding: 0;">
-        <form class="" action="/release/search" method="get" role="search" aria-label="Papers">
+        <form class="" action="/search" method="get" role="search" aria-label="Papers">
           <div class="ui transparent inverted icon input">
             <i class="search icon" style="padding-right: 2em;"></i>
             <input type="text" placeholder="Search Papers..." name="q" style="border: 1px solid #777 !important; padding: 5px !important; width: 15em;">
diff --git a/python/fatcat_web/templates/home.html b/python/fatcat_web/templates/home.html
index 26c45f03..afaab559 100644
--- a/python/fatcat_web/templates/home.html
+++ b/python/fatcat_web/templates/home.html
@@ -14,11 +14,11 @@
   <div class="ui text container">
     <h1 class="ui header inverted huge centered">Perpetual Access to Millions of Open Research Publications From Around The World</h1>
     <br>
-    <form class="" action="/release/search" method="get" role="search" aria-label="papers" itemprop="potentialAction" itemscope itemtype="https://schema.org/SearchAction">
-      <meta itemprop="target" content="https://{{ config.FATCAT_DOMAIN }}/release/search?q={q}"/>
+    <form class="" action="/search" method="get" role="search" aria-label="papers" itemprop="potentialAction" itemscope itemtype="https://schema.org/SearchAction">
+      <meta itemprop="target" content="https://{{ config.FATCAT_DOMAIN }}/search?q={q}"/>
       <div class="ui form">
         <div class="ui action input huge fluid">
-          <input type="text" placeholder="Query..." name="q" aria-label="search release metadata" required itemprop="query-input">
+          <input type="text" placeholder="Query..." name="q" aria-label="search metadata" required itemprop="query-input">
           <button class="ui green button">Search</button>
         </div>
       </div>