To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. - Verify that the () are not shown in the link text and are not part of the URL. Problem: It's correct to remove () from the link, but the link text should still include them. Problem exists in staff and OPAC. From the detail page XSLT, problem is in lines 1149 and 1154: 1146 <xsl:choose> 1147 <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']"> 1148 <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute> 1149 <xsl:value-of select="translate($f780, '()', '')"/> 1150 </a> 1151 </xsl:when> 1152 <xsl:otherwise> 1153 <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute> 1154 <xsl:value-of select="translate($f780, '()', '')"/> 1155 </a> 1156 </xsl:otherwise> 1157 </xsl:choose>
Ah, same problem appears to exist for 785.
Created attachment 59190 [details] [review] Bug 17853 - Don't remove () from link text I have followed your test plan, applied the patch and have noticed that there are now brackets around the link text. Is this what you were looking for?
Created attachment 59198 [details] [review] Bug 17853 - Don't remove () from link text I have followed your test plan, applied the patch and have noticed that there are now brackets around the link text. Is this what you were looking for?
Gracie: Yes, they should be around the link text, but not part of the URL. If that is what you see you should sign off. :)
I've tested this and get the same result with or without this patch - no parenthesis is displayed in the link text (or url for that matter, but it should not display there?).
Patch tested with a sandbox, by Felix Hemme <felix.hemme@thulb.uni-jena.de>
Created attachment 61877 [details] [review] Bug 17853 - Don't remove () from link text I have followed your test plan, applied the patch and have noticed that there are now brackets around the link text. Is this what you were looking for? Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de>
Created attachment 62078 [details] [review] Bug 17853 - Don't remove () from link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 62079 [details] [review] Bug 17853 - Don't remove () from field 785 link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL.
Fixed commit messages - added new patch for 785 field
Created attachment 63325 [details] [review] [SIGNED-OFF] Bug 17853 - Don't remove () from link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Created attachment 63326 [details] [review] [SIGNED-OFF] Bug 17853 - Don't remove () from field 785 link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
QA: Looking here now
For both 780 and 785 fields a and t are put into variable f780/5. Since you replace this variable by subfield a, we loose information.
Created attachment 103044 [details] [review] Bug 17853 - Don't remove () from 780 link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 103045 [details] [review] Bug 17853: Don't remove () from 785 link text and restore link value of 780 The only thing we change for 780 and 785 is, that if the display text contains (), they are no longer removed. To test: - Catalogue a record with 785$a some text (including) parenthesis e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 103219 [details] [review] Bug 17853 - Don't remove () from 780 link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 103220 [details] [review] Bug 17853: Don't remove () from 785 link text and restore link value of 780 The only thing we change for 780 and 785 is, that if the display text contains (), they are no longer removed. To test: - Catalogue a record with 785$a some text (including) parenthesis e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com>
Created attachment 104573 [details] [review] Bug 17853 - Don't remove () from 780 link text To test: - Catalogue a record with 780, Indicators 00 and $a some text including parentheses. e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Felix Hemme <felix.hemme@thulb.uni-jena.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com> Bug 17853: Don't remove () from 785 link text and restore link value of 780 The only thing we change for 780 and 785 is, that if the display text contains (), they are no longer removed. To test: - Catalogue a record with 785$a some text (including) parenthesis e.g. Hospitals (Chicago, Ill. : 1936) - Verify that the () are not shown in the link text and are not part of the URL. - Apply patch - Verify that the () are shown in the link text and are not part of the URL. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Patches are squashed. Makes changes more clear.
Yes, and we lose authorship - I intentionally saved the authorship of the Academy student to keep her contribution.
I'd prefer if the separate patches could be restored - seeing the diff is easy with git, 2 patches or 1.
(In reply to Katrin Fischer from comment #21) > Yes, and we lose authorship - I intentionally saved the authorship of the > Academy student to keep her contribution. I still see her name?
But it's no longer what she wrote.
Nice work everyone! Pushed to master for 20.05
Backported to 19.11.x for 19.11.06
backported to 19.05.x for 19.05.11