Mercurial > hg > ismi-richfaces

changeset 20:7edb4ff2590b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
references
author dwinter
date Mon, 13 Apr 2015 13:47:54 +0000
parents 7f4e574966bd
children 176a21acd008
files src/main/java/de/mpiwg/itgroup/ismi/publicView/pages/WitnessCodexDynamicPage.java src/main/java/de/mpiwg/itgroup/ismi/utils/templates/TitleTemplate.java src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java src/main/webapp/imageServer/resources/js/diva4ismi.js src/main/webapp/public/publicWitness.jsp
diffstat 5 files changed, 63 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/publicView/pages/WitnessCodexDynamicPage.java	Mon Apr 13 11:14:52 2015 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/publicView/pages/WitnessCodexDynamicPage.java	Mon Apr 13 13:47:54 2015 +0000
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.HashMap;
 
 import org.mpi.openmind.repository.bo.Entity;
 
@@ -15,6 +16,7 @@
 	private Integer startPage;
 	private Boolean imageFullscreen;
         private Long witnessId;
+        private HashMap<String,String> references;
 	
 	@Override
 	public void load(Long witnessId){
@@ -47,6 +49,15 @@
 		}
 		Collections.sort(this.witnessList);
 		Collections.sort(this.unknownList);
+
+		//load the references
+		this.references=new HashMap<String,String>();
+
+		list0 = getWrapper().getSourcesForTargetRelation(codexId, "is_reference_of", "REFERENCE", 1);
+		for(Entity reference:list0){
+		    //this.references.add(reference.getOwnValue());
+		    this.references.put(reference.getOwnValue(),getWrapper().getAttributeOVByName(reference.getId(), "additional_information", false));
+		}
 	}
 	
 	public void init(){
@@ -98,5 +109,9 @@
 	public void setUnknownList(List<WitnessTemplate> unknownList) {
 		this.unknownList = unknownList;
 	}
+ public HashMap<String,String> getReferenceList(){
+	return references;
+
+    }
 	
 }
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/TitleTemplate.java	Mon Apr 13 11:14:52 2015 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/TitleTemplate.java	Mon Apr 13 13:47:54 2015 +0000
@@ -35,7 +35,7 @@
 	//extra
 	public List<String> aliasList;
 	public List<String> authorMisattributionList;
-        public List<String>referenceEndnoteIdList;
+        public Map<String,String> referenceEndnoteIdList;
 	public String personDedicatedTo;
 	public String commentaryOnText;
 	public String translationOfText;
@@ -138,9 +138,15 @@
 		
 		this.loadRefernces();
 
-		this.referenceEndnoteIdList = new ArrayList();
+		this.referenceEndnoteIdList = new HashMap<String,String>();
+
+			
+		
+
 		for  (ReferenceTemplate refTempl : this.getReferenceList()){
-		    this.referenceEndnoteIdList.add(refTempl.getEndnoteId());
+			 
+			    this.referenceEndnoteIdList.put(refTempl.getEndnoteId(),refTempl.getAdditionalInf());
+	
 		}
 
 
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java	Mon Apr 13 11:14:52 2015 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java	Mon Apr 13 13:47:54 2015 +0000
@@ -61,7 +61,11 @@
 	public String authorAsWrittenInWitness;
 	public String copyist;
 	public String placeOfCopying;
+<<<<<<< .mine
+        public Map<String,String> referenceEndnoteIdList;
+=======
         public List<String>referenceEndnoteIdList;
+>>>>>>> .r4754
 	public String page_dimensions;
 	public String written_area_dimensions;
 	public String lines_per_page;
@@ -264,17 +268,31 @@
 				list0 = om.getSourcesForTargetRelation(witness,
 						"is_reference_of", "REFERENCE", -1);
 				for (Entity ref : list0) {
-					System.out.println("### REF= " + ref.getId());
+				    //System.out.println("### REF= " + ref.getId());
 					this.refEntityList.add(om.getEntityContent(ref));
 				}
 			}
 
 			this.loadRefernces();
+<<<<<<< .mine
+		       	this.referenceEndnoteIdList = new HashMap<String,String>();
+
+			
+		
+
+			for  (ReferenceTemplate refTempl : this.getReferenceList()){
+			 
+			    this.referenceEndnoteIdList.put(refTempl.getEndnoteId(),refTempl.getAdditionalInf());
+			   
+		}
+
+=======
 		       	this.referenceEndnoteIdList = new ArrayList();
 			for  (ReferenceTemplate refTempl : this.getReferenceList()){
 			    this.referenceEndnoteIdList.add(refTempl.getEndnoteId());
 		}
 
+>>>>>>> .r4754
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js	Mon Apr 13 11:14:52 2015 +0000
+++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js	Mon Apr 13 13:47:54 2015 +0000
@@ -120,7 +120,8 @@
     		//mache rel urls zu absoluten
 			if (data.nodes.length > 0) {
 				var ref = data.nodes[0].node.citation.replace(new RegExp("/ismi","g"),divaGlobal.drupal_url);  	
-			    $("#"+createIdFromRef(loc)).html(ref);
+			    var bib =  $(loc);
+			   bib.html(ref);
 			}
 		},
 		error: function(data) {
@@ -245,7 +246,7 @@
     $('#witness-refs').html(referencesContent);
     for(refKey in json.data.references){
 		var ref = json.data.references[refKey];
-	    var loc="#bibl-entry-"+titleId+"-"+refKey ;
+	var loc="#bibl-entry-"+titleId+"-"+ createIdFromRef(refKey) ;
 	    var bibInf=json.data.references[refKey];
 	showBibliographyEntryFormatted(refKey,bibInf,loc);	    
 	}
@@ -391,7 +392,7 @@
 	$('#title-bib').html(referencesContent);
        	for(var refKey in json.data.references){
 		var ref = json.data.references[refKey];
-	    var loc="#bibl-entry-"+titleId+"-"+refKey ;
+	    var loc="#bibl-entry-"+titleId+"-"+ createIdFromRef(refKey) ;
 	    var bibInf=json.data.references[refKey];
 	    showBibliographyEntryFormatted(refKey,bibInf,loc);	    
 	}
--- a/src/main/webapp/public/publicWitness.jsp	Mon Apr 13 11:14:52 2015 +0000
+++ b/src/main/webapp/public/publicWitness.jsp	Mon Apr 13 13:47:54 2015 +0000
@@ -344,6 +344,22 @@
 											<td>
 										</tr>
 									</c:forEach>
+									<tr><td class="tdTitle">References</td><td></td><td><table class="tableContent">
+									<tbody>
+										<c:forEach var="ref" items="${witnessPage0.getReferenceList().keySet()}">
+										<tr>
+										<td  style="text-align">	<c:out value="${ref}"/>
+										</td>
+										</tr>
+										<tr>
+										<td  style="text-align">	<c:out value="${witnessPage0.getReferenceList()[ref]}"/>
+										</td>
+										</tr>
+
+										</c:forEach>
+									</tbody>
+								</table>
+									</td></tr>	
 								</tbody>
 							</table>