Skip to content

Commit 5d2baed

Browse files
fixed searchbar for special cases
1 parent d32962a commit 5d2baed

File tree

2 files changed

+47
-51
lines changed

2 files changed

+47
-51
lines changed

src/webfrontend/CustomDataTypeIconclass.coffee

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ class CustomDataTypeIconclass extends CustomDataTypeWithCommons
215215
# choose record from suggestions
216216
onClick: (ev2, btn) ->
217217
iconclassInfo = btn.getOpt("value")
218-
219218
###############################################
220219
# brackets with dots provided?
221220
###############################################
@@ -274,48 +273,44 @@ class CustomDataTypeIconclass extends CustomDataTypeWithCommons
274273
cdata = {}
275274
that.__updateResult(cdata, layout, opts)
276275
@
277-
###############################################
278-
# if no bracketsvalue in chosen record
279-
###############################################
280-
else
281-
# lock conceptURI in savedata
282-
if iconclassInfo?.n
283-
cdata.conceptURI = 'https://iconclass.org/' + iconclassInfo.n
276+
###############################################
277+
# if no bracketsvalue in chosen record
278+
###############################################
284279
else
285-
cdata.conceptURI = 'https://iconclass.org/' + iconclassInfo
286-
cdata.frontendLanguage = activeFrontendLanguage
287-
288-
fullInfoUrl = 'https://iconclass.org/' + iconclassInfo + '.json'
289-
# download full record from iconclass
290-
searchsuggest_xhr.xhr = new (CUI.XHR)(url: fullInfoUrl)
291-
searchsuggest_xhr.xhr.start().done((data, status, statusText) ->
292-
extendedInfo_xhr = { "xhr" : undefined }
293-
iconclassInfo = data
294-
# lock conceptName in savedata
295-
cdata.conceptName = IconclassUtil.getConceptNameFromObject iconclassInfo, cdata
296-
297-
cdata.conceptAncestors = []
298-
# if treeview, add ancestors
299-
if iconclassInfo?.p?.length > 0
300-
# save ancestor-uris to cdata
301-
for ancestor in iconclassInfo.p
302-
cdata.conceptAncestors.push 'https://iconclass.org/' + ancestor
303-
# add own uri to ancestor-uris
304-
cdata.conceptAncestors.push 'https://iconclass.org/' + iconclassInfo.n
305-
306-
cdata.conceptAncestors = cdata.conceptAncestors.join(' ')
307-
308-
# facetTerm
309-
cdata.facetTerm = IconclassUtil.getFacetTerm(iconclassInfo, that.getDatabaseLanguages())
310-
311-
# lock conceptFulltext in savedata
312-
cdata._fulltext = IconclassUtil.getFullTextFromObject iconclassInfo, false
313-
# lock standard in savedata
314-
cdata._standard = IconclassUtil.getStandardTextFromObject that, iconclassInfo, cdata, false
315-
316-
that.__updateResult(cdata, layout, opts)
317-
@
318-
)
280+
# lock conceptURI in savedata
281+
if iconclassInfo?.n
282+
cdata.conceptURI = 'https://iconclass.org/' + iconclassInfo.n
283+
else
284+
cdata.conceptURI = 'https://iconclass.org/' + iconclassInfo
285+
286+
cdata.frontendLanguage = activeFrontendLanguage
287+
288+
fullInfoUrl = 'https://iconclass.org/' + iconclassInfo + '.json'
289+
290+
# lock conceptName in savedata
291+
cdata.conceptName = IconclassUtil.getConceptNameFromObject iconclassInfo, cdata
292+
293+
cdata.conceptAncestors = []
294+
# if treeview, add ancestors
295+
if iconclassInfo?.p?.length > 0
296+
# save ancestor-uris to cdata
297+
for ancestor in iconclassInfo.p
298+
cdata.conceptAncestors.push 'https://iconclass.org/' + ancestor
299+
# add own uri to ancestor-uris
300+
cdata.conceptAncestors.push 'https://iconclass.org/' + iconclassInfo.n
301+
302+
cdata.conceptAncestors = cdata.conceptAncestors.join(' ')
303+
304+
# facetTerm
305+
cdata.facetTerm = IconclassUtil.getFacetTerm(iconclassInfo, that.getDatabaseLanguages())
306+
307+
# lock conceptFulltext in savedata
308+
cdata._fulltext = IconclassUtil.getFullTextFromObject iconclassInfo, false
309+
# lock standard in savedata
310+
cdata._standard = IconclassUtil.getStandardTextFromObject that, iconclassInfo, cdata, false
311+
312+
that.__updateResult(cdata, layout, opts)
313+
@
319314
items: menu_items
320315

321316
# if no suggestions: set "empty" message to menu

src/webfrontend/iconclassUtilities.coffee

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,16 @@ class IconclassUtil
103103

104104
# build standard upon prefLabel!
105105
# 1. TEXT
106-
if object.txt[activeFrontendLanguage]
107-
conceptName = object.txt[activeFrontendLanguage]
108-
# else take first preflabel..
109-
else if iconclassInfo?.txt?.de
110-
conceptName = object.txt.de
111-
else if iconclassInfo?.txt?.en
112-
conceptName = object.txt.en
113-
else
114-
conceptName = object.txt[Object.keys(object.txt)[0]]
106+
if object?.txt
107+
if object.txt[activeFrontendLanguage]
108+
conceptName = object.txt[activeFrontendLanguage]
109+
# else take first preflabel..
110+
else if iconclassInfo?.txt?.de
111+
conceptName = object.txt.de
112+
else if iconclassInfo?.txt?.en
113+
conceptName = object.txt.en
114+
else
115+
conceptName = object.txt[Object.keys(object.txt)[0]]
115116

116117
conceptName = object.n + ' - ' + conceptName
117118

0 commit comments

Comments
 (0)