mirror of
https://github.com/LCPQ/QUESTDB_website.git
synced 2024-12-24 13:23:40 +01:00
Merge branch 'master' into QUEST5
This commit is contained in:
commit
f04c1cf3dd
@ -16,7 +16,6 @@ draft: false
|
||||
<script src="/js/processingIndicator.js"></script>
|
||||
<script src="/js/noNan.js"></script>
|
||||
<script src="/js/websiteFile.js"></script>
|
||||
<script src="/js/getPublis.js"></script>
|
||||
<script src="/js/DOICache.js"></script>
|
||||
<script src="/js/nestedCheckbox.js"></script>
|
||||
<script src="/js/selectSelectAll.js"></script>
|
||||
@ -215,6 +214,7 @@ draft: false
|
||||
selects.each(function() {
|
||||
AllValsCache.set(this.name,getAllVals(this))
|
||||
})
|
||||
|
||||
var AAllValsCache = Array.from(AllValsCache)
|
||||
var vals = uniq(window.dats.filter(d => {
|
||||
return AAllValsCache.every(([k,v]) => {
|
||||
@ -233,13 +233,18 @@ draft: false
|
||||
if (name === "DOI") {
|
||||
let newvals = []
|
||||
for (const val of vals) {
|
||||
for (const set of publis.sets.values()) {
|
||||
if (set.includes(val)) {
|
||||
if (!newvals.some(v=>JSON.stringify(v)===JSON.stringify(set))) {
|
||||
newvals.push(set)
|
||||
if (val==="") {
|
||||
newvals.push([""])
|
||||
}
|
||||
else {
|
||||
for (const set of publis.sets.values()) {
|
||||
if (set.includes(val)) {
|
||||
if (!newvals.some(v=>JSON.stringify(v)===JSON.stringify(set))) {
|
||||
newvals.push(set)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
vals = newvals
|
||||
}
|
||||
|
@ -10,7 +10,6 @@ draft: false
|
||||
<script src="/js/getTextFromFile.js" type="text/javascript"></script>
|
||||
<script src="/js/trueTypeOf.js" type="text/javascript"></script>
|
||||
<script src="/js/uniq.js"></script>
|
||||
<script src="/js/getPublis.js"></script>
|
||||
<script src="/js/websiteFile.js"></script>
|
||||
<script src="/js/numberUtils.js"></script>
|
||||
<script src="/js/DebugMode.js"></script>
|
||||
|
@ -27,7 +27,7 @@ class publiDB {
|
||||
return setname
|
||||
}
|
||||
if (supportUnknow && doi === "") {
|
||||
return UnknowSetName
|
||||
return publiDB.UnknowSetName
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
@ -1,7 +0,0 @@
|
||||
async function getPublis() {
|
||||
const text = await getTextFromFileUrlAsync("/data/publis/index.yaml")
|
||||
const myYaml=jsyaml.load(text);
|
||||
myYaml.sets= ((myYaml.sets===null) ? new Map() : new Map(Object.entries(myYaml.sets)));
|
||||
myYaml.others=((myYaml.others===null) ? new Map() : new Map(Object.entries(myYaml.others)));
|
||||
return myYaml
|
||||
}
|
Loading…
Reference in New Issue
Block a user