Skip to content
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

Merged
merged 3 commits into from Aug 17, 2018

Conversation

yagee-de
Copy link
Member

@yagee-de yagee-de commented Aug 1, 2018

added core selection for predefined aliases 'main' and 'classification'

Link to jira.

added core selection for predefined aliases 'main' and 'classification'
@yagee-de yagee-de requested review from kkrebs and bt1cu August 1, 2018 07:11
<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')" />
Copy link
Contributor

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

Copy link
Member Author

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>
Copy link
Contributor

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 ...

Copy link
Member Author

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.

Copy link
Member Author

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'

Copy link
Contributor

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.

@MyCoRe-Travis
Copy link

Something gone wrong on 1a1673a!
Please Check https://github.com/MyCoRe-Travis/test_artifacts/tree/3763-pull_request-659

<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" />
Copy link
Contributor

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.

@yagee-de
Copy link
Member Author

accepted for now as of Rostock meeting

@yagee-de yagee-de merged commit 85b3ff9 into 2018.06.0.x Aug 17, 2018
@yagee-de yagee-de deleted the issues/MCR-1904-SOLR-expert-search branch August 17, 2018 07:27
yagee-de added a commit that referenced this pull request Aug 17, 2018
* 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()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants