CRSearch: オンラインURL初期化オプションに対応 (Google検索対象サイトとして使用)

Author: akinomyoga

js/crsearch/crsearch.js

@@ -26,6 +26,7 @@ export default class CRSearch {
     google_url: new URL('https://www.google.co.jp/search'),
     force_new_window: false,
     base_url: null,
+    online_base_url: null,
   }
 
   static _KLASS = 'crsearch'
@@ -127,6 +128,8 @@ export default class CRSearch {
     this._log.info('parsing...', json)
     if (this._opts.base_url)
       json.base_url = this._opts.base_url
+    if (this._opts.online_base_url)
+      json.online_base_url = this._opts.online_base_url
 
     const db = new Database(this._log, json)
     this._db.set(db.name, db)
@@ -238,9 +241,10 @@ export default class CRSearch {
 
     for (const [name, db] of this._db) {
       // always include fallback
+      const fallback_site = db.online_base_url ? db.online_base_url.host : db.base_url.host
       const e = this._make_result(null, q.original_text, {
         name: db.name,
-        url: db.base_url.host,
+        url: fallback_site,
       })
       e.attr('data-result-id', result_id++)
       result_list.append(e)
@@ -275,7 +279,8 @@ export default class CRSearch {
 
   _make_google_url(q, site) {
     const url = this._opts.google_url
-    url.set('query', {q: `${q} site:${site}`})
+    if (site != '') q = `${q} site:${site}`
+    url.set('query', {q: q})
     return url
   }
 

js/crsearch/database.js

@@ -13,6 +13,7 @@ export default class Database {
     this._log = log.makeContext('Database')
     this._name = json.database_name
     this._base_url = new URL(json.base_url)
+    this._online_base_url = json.online_base_url ? new URL(json.online_base_url) : null
     this._path_ns_map = new Map
     this._ids = []
 
@@ -97,6 +98,10 @@ export default class Database {
     return this._base_url
   }
 
+  get online_base_url() {
+    return this._online_base_url
+  }
+
   get all_fullpath_pages() {
     return this._all_fullpath_pages
   }