bugfixes for search

Edirom · May 30, 2016 · a92d149 · a92d149
1 parent 44dd504
commit a92d149
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/controller.xql b/controller.xql
@@ -102,7 +102,7 @@ else if ($exist:resource = 'correspDesc.xml') then
 (: Suche :)
 else if (matches($exist:path, concat('^/', $lang, '/', lang:get-language-string('search', $lang), '/?$'))) then
    (: Shortcut for IDs, given as query string :)
-   if(config:get-doctype-by-id(str:sanitize(string-join(request:get-parameter('q', ''), ' '))) = $search:wega-docTypes) then controller:dispatch(map:put($exist-vars, 'resource', str:sanitize(string-join(request:get-parameter('q', ''), ' '))))
+   if(config:get-combined-doctype-by-id(str:sanitize(string-join(request:get-parameter('q', ''), ' '))) = $search:wega-docTypes) then controller:dispatch(map:put($exist-vars, 'resource', str:sanitize(string-join(request:get-parameter('q', ''), ' '))))
    else controller:forward-html('/templates/search.html', $exist-vars)
 
 (: Register :)

diff --git a/modules/config.xqm b/modules/config.xqm
@@ -166,6 +166,13 @@ declare function config:get-doctype-by-id($id as xs:string?) as xs:string? {
         else ()
 };
 
+declare function config:get-combined-doctype-by-id($id as xs:string?) as xs:string* {
+    for $func in wdt:functions-available()
+    return 
+        if($func($id)('check')()) then $func($id)('name')
+        else ()
+};
+
 (:~
  : Checks whether a given id matches the WeGA pattern of person ids
  :

diff --git a/templates/index.html b/templates/index.html
@@ -23,7 +23,7 @@ <h3 class="unterschriftweber">
                             <div class="input-group-btn dropdown">
                                 <select class="input-group-addon gradient-light bootstrap-select form-control" name="d">
                                     <option value="all" data-template="lang:translate">all</option>
-                                    <option value="persons" data-template="lang:translate">persons</option>
+                                    <option value="personsPlus" data-template="lang:translate">personsPlus</option>
                                     <option value="letters" data-template="lang:translate">correspondence</option>
                                     <option value="diaries" data-template="lang:translate">diaries</option>
                                     <option value="writings" data-template="lang:translate">writings</option>