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

Editorial History is messing up the layout of the html-files #263

Closed
m-k-r opened this issue May 14, 2017 · 8 comments
Closed

Editorial History is messing up the layout of the html-files #263

m-k-r opened this issue May 14, 2017 · 8 comments

Comments

@m-k-r
Copy link
Collaborator

m-k-r commented May 14, 2017

A few days ago I changed the MakeHTML.xls to get Editorial History for dclp but the output is messed up.

Without Editorial History it looks like this: http://litpap.info/dclp/59137 (Transcription und Apparatus are new)
With Editorial History it looks like this:
dclp-59137
It should look like this: http://litpap.info/ddbdp/bgu;1;2

The changes in MakeHTML can be seen here:
DCLP/navigator@5d25885

For now Editorial History is deactived until the problem can be solved.

@paregorios
Copy link
Member

@rla2118 @HolgerEssler @jcowey @rogerbagnall what are you expecting to see for editorial history?

@m-k-r
Copy link
Collaborator Author

m-k-r commented May 16, 2017

I did a bit further investigation and it seems this error occurs not only with dclp editorial history but with every editorial history when dclp is involved. For example http://litpap.info/ddbdp/sb;22;15203. 649 ddbdp-files files contain "Provisional papyri.info output"

The changes responsible for this have to be in the last 2 month.

@paregorios
Copy link
Member

Ah, so this is a pre-existing papyri.info feature that is not working right with DCLP content?

@m-k-r
Copy link
Collaborator Author

m-k-r commented May 16, 2017

It seems that way. This commit DCLP/navigator@bf1c2a8 looks like a good starting point. As far as I remember the error wasn't there yet and has to be introduced later.

@paregorios
Copy link
Member

thanks @m-k-r I will ask @wsalesky @leoba or @sarcanon to have a look

@jcowey
Copy link
Contributor

jcowey commented May 17, 2017

Using this as an example:
http://papyri.info/ddbdp/sb;28;17209

This is what we would like to see:
bildschirmfoto 2017-05-17 um 16 04 02

which is displaying the contents of
https://github.com/papyri/idp.data/blob/master/DDB_EpiDoc_XML/sb/sb.28/sb.28.17209.xml#L32-L37

@jcowey
Copy link
Contributor

jcowey commented May 17, 2017

For http://litpap.info/dclp/59137

I would hope to see the contents of

https://github.com/DCLP/idp.data/blob/master/DCLP/60/59137.xml#L106-L123

@wsalesky wsalesky self-assigned this May 18, 2017
@Edelweiss Edelweiss self-assigned this May 22, 2017
wsalesky added a commit to DCLP/navigator that referenced this issue May 22, 2017
wsalesky added a commit to DCLP/navigator that referenced this issue May 22, 2017
@wsalesky
Copy link
Contributor

wsalesky commented May 22, 2017

@paregorios reday for review.

XSLT Changes: pn-xslt/MakeHTML.xsl
Add template to include t:revisionDesc

Example diff:

diff --git a/output/dclp/100/99554.html b/output/dclp/100/99554.html
index 67cce891c..d49ee2b2e 100644
--- a/output/dclp/100/99554.html
+++ b/output/dclp/100/99554.html
@@ -110,6 +110,23 @@
                         <div id="edition"></div>
                      </div>
                   </div>
+                  <div id="history" class="text">
+                     <div id="history-headers">
+                        <h3><span id="edit-history">Editorial History</span>; 
+                           <span id="all-history">All History</span>; 
+                           (<a href="https://github.com/DCLP/idp.data/blame/master/DCLP/100/99554.xml" target="_blank">detailed</a>)
+                        </h3>
+                     </div>
+                     <div id="history-lists">
+                        <ul id="edit-history-list" style="display:none;">
+                           <li>No editorial history recorded.</li>
+                        </ul>
+                        <ul id="all-history-list" style="display:none">
+                           <li>2014-12-10 [<a href="DCLP">DCLP</a>]: Crosswalked to EpiDoc XML
+                           </li>
+                        </ul>
+                     </div>
+                  </div>

Question
I used the logic from history display used by the other data repositories, however I'm not sure "All History" behaves as expected, perhaps due to a difference in data encoding?

Current logic:
Editorial History is designated by the a 'T' in the change date: t:change[contains(@when, 'T')]
All History is designated by date encoding: t:change[matches(@when, '^\d{4}-\d{2}-\d{2}$')]

So "All History" does not display all the change elements, as I would expect. Should I change the logic, or are you happy with the current functionality.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

8 participants