added place of origin to data and search

Author: emgeier

resources/js/search.js

@@ -44,6 +44,7 @@ function searchData(params) {
         if (params.title && !matchesField(item, 'displayTitleEnglish', params.title)) return false;
         if (params.syriacText && !matchesField(item, 'syrTitle', params.syriacText)) return false;
         if (params.placeName && !matchesField(item, 'placeName', params.placeName)) return false;
+        if (params.origPlace && !matchesField(item, 'origPlace', params.origPlace)) return false;
         if (params.persName && !matchesField(item, 'persName', params.persName)) return false;
         if (params.shelfmark && !matchesField(item, 'shelfmark', params.shelfmark)) return false;
         if (params.decorations && !matchesField(item, 'decorations', params.decorations)) return false;
@@ -136,7 +137,8 @@ async function runSearch() {
         persName: params.get('persName'),
         shelfmark: params.get('shelfmark'),
         decorations: params.get('decorations'),
-        decorationsType: params.get('decorationsType')
+        decorationsType: params.get('decorationsType'),
+        origPlace: params.get('origPlace')
     };
 
     const hasQuery = Object.values(searchParams).some(v => v);

search.html

@@ -244,7 +244,7 @@ <h1 style="padding-left:1em; color:white; margin-top:3em;">Advanced Search</h1>
                      <div class="form-group">
                         <div class="col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2">
                            Limit search to place of origin: 
-                           <input type="checkbox" id="origPlaceLimit" name="origPlaceLimit" value="true">
+                           <input type="checkbox" id="origPlace" name="origPlace" value="true">
                         </div>
                      </div>
 
@@ -339,7 +339,8 @@ <h2 style="margin-bottom: 20px;">Search Results</h2>
                if (urlParams.get('shelfmark')) $('#shelfmark').val(urlParams.get('shelfmark'));
                if (urlParams.get('decorations')) $('#decorations').val(urlParams.get('decorations'));
                if (urlParams.get('decorationsType')) $('#decorationsType').val(urlParams.get('decorationsType'));
-               
+               if (urlParams.get('origPlace')) $('#placeName').val(urlParams.get('origPlace'));
+
                $('#toggleSearch').on('click', function() {
                   $('#advancedSearch').slideToggle();
                });
@@ -360,7 +361,8 @@ <h2 style="margin-bottom: 20px;">Search Results</h2>
                      persName: $('#persName').val(),
                      shelfmark: $('#shelfmark').val(),
                      decorations: $('#decorations').val(),
-                     decorationsType: $('#decorationsType').val()
+                     decorationsType: $('#decorationsType').val(),
+                     origPlace: $('#origPlace').is(':checked') ? $('#placeName').val() : ''
                   };
                   const params = new URLSearchParams();
                   Object.keys(searchParams).forEach(key => {

tei2json.py

@@ -10,7 +10,7 @@
 
   # directory -> produce one JSON file per TEI named <basename>.json
   python tei2json.py --dir ./britishLibrary-data/data/tei --outdir json_output
-  
+
   # directory -> produce OpenSearch bulk file
   python tei2json.py --dir ./britishLibrary-data/data/tei --bulk bulk_data.json --index britishlibrary-index-1 --idprefix ms
 """
@@ -120,6 +120,7 @@ def extract_json(tree):
 
     # placeName
     place_list = text_list(root, ".//tei:placeName")
+    origin_place_list = text_list(root, ".//tei:origPlace")
 
     # shelfmark: altIdentifier idno type=BL-Shelfmark or altIdentifier/ idno content
     shelfmarks = text_list(root, ".//tei:altIdentifier/tei:idno[@type='BL-Shelfmark'] | .//tei:altIdentifier/tei:idno | .//tei:msIdentifier//tei:idno[@type='BL-Shelfmark']")
@@ -189,6 +190,7 @@ def extract_json(tree):
     if summary: out["summary"] = summary
     if pers_list: out["persName"] = pers_list
     if place_list: out["placeName"] = place_list
+    if origin_place_list: out["origPlace"] = origin_place_list
     if shelfmarks: out["shelfmark"] = shelfmarks
     if final_rubrics: out["finalRubrics"] = final_rubrics
     if colophons: out["colophons"] = colophons