litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run saved query from compilation page

Browse source
This commit is contained in:
Georgy Litvinov 2021-02-23 22:46:00 +01:00
parent 33dd87477e
commit 65c45626ee
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
webapp/src/main/webapp/templates/freemarker/compilation.ftl
View file

@ -96,6 +96,26 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!> <#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!> <#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
</#if> </#if>
<#assign rawQuery = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#rawQueryString")!>
<#assign queryBuilderRules = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#queryBuilderRules")!>
<#if rawQuery?has_content && queryBuilderRules?has_content>
<#list queryBuilderRules.statements as statement>
<#assign queryBuilderRulesString = statement.value!>
</#list>
<#list rawQuery.statements as statement>
<#assign rawQueryString = statement.value!>
</#list>
<form action="${urls.base}/customsearch" method="post">
<input type="hidden" id="queryBuilderRules" name="queryBuilderRules" value='${queryBuilderRulesString}' />
<input type="hidden" id="querytext" name="querytext" value='${rawQueryString}' />
<input type="submit" id="submit" value="Поисковый запрос"/>
</form>
</#if>
<div class="expandSwitch"> <div class="expandSwitch">
<label class="switch">Раскрыть статью <label class="switch">Раскрыть статью
<input id="expandlCB" type="checkbox" onclick="switchExpand();"> <input id="expandlCB" type="checkbox" onclick="switchExpand();">

21
webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
View file

@ -75,11 +75,16 @@
}; };
</#if> </#if>
var rules_start; var rules_start;
if (localStorage.getItem('queryBuilderFormSaved') === true || localStorage.getItem('queryBuilderFormSaved') === 'true') { <#if queryBuilderRules??>
rules_start = JSON.parse(localStorage.getItem('queryBuilderForm')); rules_start = ${queryBuilderRules};
} else { <#else>
rules_start = rules_example; if (localStorage.getItem('queryBuilderFormSaved') === true || localStorage.getItem('queryBuilderFormSaved') === 'true') {
} rules_start = JSON.parse(localStorage.getItem('queryBuilderForm'));
} else {
rules_start = rules_example;
}
</#if>
$('#builder').queryBuilder({ $('#builder').queryBuilder({
filters: [ filters: [
@ -134,8 +139,10 @@
var query_string = format_query_string(json_result,""); var query_string = format_query_string(json_result,"");
var hits = $("#hitsPerPageSelect :selected"); var hits = $("#hitsPerPageSelect :selected");
if (!$.isEmptyObject(query_string)) { if (!$.isEmptyObject(query_string)) {
localStorage.setItem('queryBuilderForm',JSON.stringify(json_result)); <#if !queryBuilderRules??>
localStorage.setItem('queryBuilderFormSaved',true); localStorage.setItem('queryBuilderForm',JSON.stringify(json_result));
localStorage.setItem('queryBuilderFormSaved',true);
</#if>
var queryURL = "${urls.base}/customsearch?querytext=" + query_string; var queryURL = "${urls.base}/customsearch?querytext=" + query_string;
if (hits !== null){ if (hits !== null){
queryURL = queryURL.concat("&hitsPerPage=",hits.text()); queryURL = queryURL.concat("&hitsPerPage=",hits.text());