Merge pull request #451 from srophe/441-searching-by-uri-in-author-does-not-return-results

441 searching by uri in author does not return results

Author: wlpotter

search.html

@@ -99,7 +99,7 @@ <h1 style="padding-left:1em; color:white; margin-top:3em;">Advanced Search</h1>
                         <div class="col-sm-9 col-md-4">
                            <div class="input-group">
                               <input type="text" id="author" name="author" class="form-control keyboard ui-keyboard-input ui-widget-content ui-corner-all" 
-                                 aria-haspopup="true" role="textbox">
+                                 aria-haspopup="true" role="textbox" placeholder="Search by name or URI">
                               <div class="input-group-btn"><span class="keyboard-menu"><button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Select Keyboard">
                                  &nbsp;<span class="syriaca-icon syriaca-keyboard">&nbsp; </span><span class="caret"></span></button>
                                  <ul class="dropdown-menu">

tei2json.py

@@ -230,6 +230,9 @@ def extract_json(tree, part_node=None):
     authors = text_list(root, ".//tei:msItem//tei:author//tei:persName")
     # msItem/author/@ref
     authorsUri = text_list(root, ".//tei:msItem//tei:author/@ref")
+
+    # combined authors and URIs
+    authorsTextAndUri = authors+authorsUri
 
     # incipits: from msItem/incipit
     incipits = text_list(root, ".//tei:msItem//tei:incipit")
@@ -265,7 +268,7 @@ def extract_json(tree, part_node=None):
     if date_calendar: out["dateCalendar"] = date_calendar
     if decorations: out["decorations"] = decorations
     if decoration_types: out["decorationsType"] = decoration_types
-    if authors: out["author"] = authors
+    if authorsTextAndUri: out["author"] = authorsTextAndUri
     if authorsUri: out["authorUri"] = authorsUri
     if incipits: out["incipit"] = incipits
     if explicits: out["explicit"] = explicits