New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MCR-1904 fixed SOLR expert search #659
Conversation
added core selection for predefined aliases 'main' and 'classification'
<div class="table-responsive"> | ||
<table class="table table-striped table-hover table-condensed"> | ||
<xsl:variable name="url" select="concat($MCR.Solr.ServerURL, '/admin/luke')" /> | ||
<xsl:variable name="url" select="concat($MCR.Solr.ServerURL, 'solr/', $core, '/admin/luke?wt=xml')" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is possible to specify a ServerURL for each Core, MCR.Solr.ServerURL is only the fallback if no URL for core is specified
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll take a look on this
</select> | ||
</div> | ||
</div> | ||
</xed:bind> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if this is the best solution. It is user friendly, but filters flexibility. We can specify more core types (not only classification and core). If so, we have to add this here ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will not work for an undefined set of core aliases but only for a fixed set. a 'real' expert has to change the URL parameter to any other core. No field names and types will be fetched in either case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
another possibility would be to replace the select box with an input field that defaults to 'main'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sounds good for me. In the most use cases "main" will be used I think.
Something gone wrong on 1a1673a! |
<xsl:param name="MCR.Solr.Core.main.Name" /> | ||
<xsl:param name="MCR.Solr.Core.main.ServerURL" /> | ||
<xsl:param name="MCR.Solr.Core.classification.Name" /> | ||
<xsl:param name="MCR.Solr.Core.classification.ServerURL" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now searchmask is flexible but this template still only works for "classification" or "main". This code have also to be that flexible or we can switch back to drop down menu in xed.
accepted for now as of Rostock meeting |
* 2018.06.0.x: MCR-1904 fixed SOLR expert search (#659) MCR-1907 add runtime compatiblity for Java 10 (#648) MCR-1909 support optional core parameter for MCRSolrQueryResolver (#658) MCR-1910 delete tmp files after upload (#650) MCR-1911 close InputStream if SOLR doesn't do it (#651) MCR-1912 add messages for better logging MCR-1915 add annotation MCRAccessControlExposeHeaders (#664) MCR-1915 add 'Location' to 'Access-Control-Expose-Headers' MCR-1917 fixed MCRQL condition parser problem (#663) MCR-1918 set content type XML MCR-1920 Make includes flexible: xed:preload, xed:modify, xed:remove MCR-1922 read SOLR config from classpath (#662) MCR-1924 use permissions as defined by MCRAccessManager MCR-1925 add missing field copy in clone()
added core selection for predefined aliases 'main' and 'classification'
Link to jira.