Mercurial > hg > ismi-richfaces

changeset 9:e07a1ae515b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author jurzua
date Tue, 24 Feb 2015 10:09:31 +0000
parents 54c1bb63a713
children 17551d9f091f
files src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java src/main/resources/hibernate.cfg.xml src/main/webapp/entry/codex.xhtml src/main/webapp/entry/person.xhtml src/main/webapp/entry/text.xhtml src/main/webapp/entry/witness.xhtml src/main/webapp/imageServer/resources/js/diva4ismi.js src/main/webapp/search/displayAuthor.xhtml src/main/webapp/search/displayTitle.xhtml
diffstat 9 files changed, 39 insertions(+), 184 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentTextBean.java	Tue Feb 24 10:09:31 2015 +0000
@@ -232,8 +232,6 @@
 				this.creationDate = new Calendar();
 			}
 			
-
-
 			this.loadAttributes(this.entity);//, getDefinition(this.entity));
 			
 			for (Relation rel : text.getSourceRelations()) {
@@ -254,14 +252,6 @@
 					target = getTargetRelation(rel);
 					this.authorLo.setEntityAndAttribute0(target);
 					
-					/*
-					this.authorInfo = "ID = " + authorLo.getEntity().getId();
-					Attribute attArabicName = getTargetAttribute(target, "name");
-					if(attArabicName != null){
-						this.authorInfo += ", Arabic Name = " + attArabicName.getOwnValue();
-						this.textAuthorName = attArabicName.getValue();
-					}*/
-					
 					if(this.authorLo.attribute != null){
 						this.textAuthorNameTranslit = this.authorLo.attribute.getValue();
 					}
@@ -302,15 +292,8 @@
 					this.shortTitleAlias = alias;
 					this.valueShortTitle = alias.getAttributeByName("alias").getValue();
 				}
-			}	
-			/*
-			List<String> idsNoFound = new ArrayList<String>();
-			for(TargetMisattribution misAtt : this.misattDataTable.getMisattList()){
-				if(misAtt.getItem().getErrorLoading() != null){
-					idsNoFound.add(misAtt.getItem().getPublication().getObjid());
-				}
-			}*/
-			//this.loadReferences(this.entity);
+			}
+			
 			this.loadEndNoteRefs();
 			this.displayUrl = generateDisplayUrl(authorLo.entity, text, null, getAppBean().getRoot());
 		}
@@ -524,129 +507,6 @@
 		this.setSelectPersonRendered(false);
 	}
 	
-
-	/**
-	 * Added by DW
-	 * 
-	 * @param event
-	 */
-	/*jurzua
-	public void shortTitleChangeListener(ValueChangeEvent event) {
-		try {
-			if (event.getNewValue() == null) {
-				return;
-			}
-			if (event.getNewValue().equals(event.getOldValue())) {
-				return;
-			}
-
-			String newShortName = (String) event.getNewValue();
-
-			if (shortTitleAlias == null) {
-				shortTitleAlias = new Entity(Node.TYPE_ABOX, "ALIAS", false);
-			}
-
-			Attribute attr = this.shortTitleAlias.getAttributeByName("alias");
-			if (attr == null) {
-				this.shortTitleAlias.addAttribute(new Attribute("alias",
-						TEXT, newShortName));
-			} else
-				attr.setValue(newShortName);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}*/
-	/*
-	public void translationChangeListener(ValueChangeEvent event) {
-		translationLo = changeListener(event, translationLo, TEXT, "full_title_translit");
-
-	}*/
-
-	/*
-	public void commentaryChangedListener(ValueChangeEvent event) {
-		commentaryLo = changeListener(event, commentaryLo, TEXT, "full_title_translit");
-
-	}*/
-
-	/*
-	public void dedicatedPersonChangedListener(ValueChangeEvent event) {
-		dedicatedPersonLo = changeListener(event, dedicatedPersonLo, PERSON, "name_translit");
-	}
-	*/
-	/*
-	public void valueChangeMethod4Author(ValueChangeEvent event) {
-		System.out.println("**** " + event.getNewValue());
-		System.out.println(this.authorLo.entity);
-		System.out.println();
-		
-		this.authorInfo =  null;
-		authorLo = changeListener(event, authorLo, PERSON, "name_translit");
-		if(authorLo != null && authorLo.entity != null && authorLo.entity.isPersistent()){
-			this.authorInfo = "ID = " + authorLo.getEntity().getId();
-			Attribute attArabicName = getTargetAttribute(authorLo.entity, "name_translit");
-			if(attArabicName != null)
-				this.authorInfo += ", Arabic Name = " + attArabicName.getOwnValue();
-		}
-	}
-	
-	
-	public void actionListenerNotSelectingAuthor(ActionEvent event){
-		this.authorLo.suggestedItems = new ArrayList<SelectItem>();
-		this.authorLo.entity = null;
-		this.authorLo.attribute = null;
-	}*/
-	
-
-	/*
-	public void actionListenerSelectAuthor(ActionEvent event){
-		System.out.println("actionListenerSelectAuthor");
-		System.out.println(this.authorLo.entity);
-		System.out.println();
-		
-		this.authorLo.suggestedItems = new ArrayList<SelectItem>();
-		SelectItem selectItem = (SelectItem) getRequestBean("item");
-		if(selectItem != null){
-			Attribute att = (Attribute)selectItem.getValue();
-			
-			Entity ent = getWrapper().getEntityById(att.getSourceId());
-			
-			if(ent != null){
-				this.authorLo.setEntityAndAttribute(ent, "name_translit");
-				
-				this.authorInfo = "ID = " + authorLo.getEntity().getId();
-				Attribute attArabicName = getTargetAttribute(ent, "name");
-				if(attArabicName != null){
-					this.authorInfo += ", Arabic Name = " + attArabicName.getOwnValue();
-					this.textAuthorName = attArabicName.getValue();
-				}
-				
-				if(this.authorLo.attribute != null){
-					this.textAuthorNameTranslit = this.authorLo.attribute.getValue();
-				}	
-			}
-		}
-	}
-	*/
-	
-	
-	/*
-	public void placeChangedListener(ValueChangeEvent event) {
-		placeLo = changeListener(event, placeLo, PLACE, "name");
-	}*/
-
-	/*
-	@Override
-	public Entity getEntity() {
-		if (this.entity == null) {
-			this.entity = new Entity();
-			this.entity.setObjectClass(TEXT);
-			this.entity.setLightweight(false);
-			this.loadAttributes(this.entity);//, getDefinition(this.entity));
-		}
-		return this.entity;
-	}
-	*/
 	public boolean mandatoryEntriesOK(){
 		boolean ok = true;
 		if(this.authorLo.entity == null || !this.authorLo.entity.isPersistent()){
--- a/src/main/resources/hibernate.cfg.xml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/resources/hibernate.cfg.xml	Tue Feb 24 10:09:31 2015 +0000
@@ -22,7 +22,7 @@
 		<property name="hibernate.connection.url">jdbc:mysql://localhost/openmind?characterEncoding=UTF-8</property>
         <property name="hibernate.connection.charSet">UTF-8</property>  
         <property name="hibernate.connection.username">root</property>
-        <property name="hibernate.connection.password">admin</property>   
+        <property name="hibernate.connection.password">e1nste1n</property>   
                  
 		<!--
 		<property name="hibernate.connection.username">ismi</property>
--- a/src/main/webapp/entry/codex.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/entry/codex.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -354,15 +354,18 @@
 			<h:outputText value="Distinguishing Features" />
 			<h:inputTextarea cols="100" rows="10"
 				value="#{CurrentCodex.attributes['distinguishing_features']}" />
-
-			<h:outputText value="Notes on ownership" />
-			<h:inputTextarea cols="100" rows="10"
-				value="#{CurrentCodex.attributes['notes_on_ownership']}" />
-
+			
 			<h:outputText value="Notes" />
 			<h:inputTextarea cols="100" rows="10"
 				value="#{CurrentCodex.attributes['notes']}" />
 
+			<h:outputText value="Notes (old)" />
+			<h:inputTextarea cols="100" rows="10"
+				value="#{CurrentCodex.attributes['notes_old']}" />
+			
+			<h:outputText value="Notes on ownership (old)" />
+			<h:inputTextarea cols="100" rows="10"
+				value="#{CurrentCodex.attributes['notes_on_ownership']}" />
 
 		</h:panelGrid>
 
--- a/src/main/webapp/entry/person.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/entry/person.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -111,9 +111,14 @@
 				value="#{CurrentPerson.attributes['authority_id']}" />
 			<h:outputText />
 
-			<h:outputText value="Notes"></h:outputText>
+			<h:outputText value="Notes"/>
 			<h:inputTextarea cols="70" rows="10"
-				value="#{CurrentPerson.attributes['notes']}"></h:inputTextarea>
+				value="#{CurrentPerson.attributes['notes']}"/>
+			<h:outputText />
+
+			<h:outputText value="Notes (old)"/>
+			<h:inputTextarea cols="70" rows="10"
+				value="#{CurrentPerson.attributes['notes_old']}"/>
 			<h:outputText />
 
 			<h:outputText value="Born in" />
--- a/src/main/webapp/entry/text.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/entry/text.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -140,6 +140,11 @@
 			<h:inputTextarea cols="65" rows="10"
 				value="#{CurrentText.attributes['notes']}" />
 			<h:outputText />
+			
+			<h:outputText value="Notes (old)" />
+			<h:inputTextarea cols="65" rows="10"
+				value="#{CurrentText.attributes['notes_old']}" />
+			<h:outputText />
 
 			<h:outputText value="Commentary on" />
 			<ismi:autocomplete lo="#{CurrentText.commentaryLo}" />
--- a/src/main/webapp/entry/witness.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/entry/witness.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -331,18 +331,24 @@
 		<h:panelGrid columns="2" styleClass="createPanel"
 			columnClasses="createPanelFirstColumn">
 
-			<h:outputText value="Notes on Title and Author" />
+			<h:outputText value="Notes" />
+			<h:inputTextarea cols="80" rows="10"
+				value="#{CurrentWitness.attributes['notes']}" />
+			
+			<h:outputText value="Notes (old)" />
+			<h:inputTextarea cols="80" rows="10"
+				value="#{CurrentWitness.attributes['notes_old']}" />
+
+			<h:outputText value="Notes on Title and Author (old)" />
 			<h:inputTextarea cols="80" rows="10"
 				value="#{CurrentWitness.attributes['notes_on_title_author']}" />
-			<h:outputText value="Notes on Collation and Corrections" />
+			<h:outputText value="Notes on Collation and Corrections  (old)" />
 			<h:inputTextarea cols="80" rows="10"
 				value="#{CurrentWitness.attributes['notes_on_collation_and_corrections']}" />
-			<h:outputText value="Notes on Ownership" />
+			<h:outputText value="Notes on Ownership  (old)" />
 			<h:inputTextarea cols="80" rows="10"
 				value="#{CurrentWitness.attributes['notes_on_ownership']}" />
-			<h:outputText value="Notes (general)" />
-			<h:inputTextarea cols="80" rows="10"
-				value="#{CurrentWitness.attributes['notes']}" />
+			
 
 		</h:panelGrid>
 		
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js	Tue Feb 24 10:09:31 2015 +0000
@@ -1,7 +1,7 @@
 var divaGlobal = {
-		rest_url : "http://localhost:8080/ismi-richfaces",
+		//rest_url : "http://localhost:8080/ismi-richfaces",
 		debugModus : false,
-		//rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
+		rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
 		iipServerURL: "https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi"
 }
 
--- a/src/main/webapp/search/displayAuthor.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/search/displayAuthor.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -410,19 +410,7 @@
 									</h:dataTable>
 								</h:panelGrid>
 
-								<h:outputText value="Notes on Title and Author" />
-								<h:outputText
-									value="#{Session.displayAuthor.witness.notesOnTitleAuthor}" />
-
-								<h:outputText value="Notes on Collation and Corrections" />
-								<h:outputText
-									value="#{Session.displayAuthor.witness.notesOnCollationAndCorrections}" />
-
-								<h:outputText value="Notes on Ownership" />
-								<h:outputText
-									value="#{Session.displayAuthor.witness.notesOnOwnership}" />
-
-								<h:outputText value="Notes (general)" />
+								<h:outputText value="Notes" />
 								<h:outputText value="#{Session.displayAuthor.witness.notes}" />
 
 								<h:outputText value="Table of Contents" />
--- a/src/main/webapp/search/displayTitle.xhtml	Thu Oct 30 12:50:33 2014 +0000
+++ b/src/main/webapp/search/displayTitle.xhtml	Tue Feb 24 10:09:31 2015 +0000
@@ -269,19 +269,7 @@
 							</h:dataTable>
 						</h:panelGrid>
 
-						<h:outputText value="Notes on Title and Author" />
-						<h:outputText
-							value="#{Session.displayTitle.witness.notesOnTitleAuthor}" />
-
-						<h:outputText value="Notes on Collation and Corrections" />
-						<h:outputText
-							value="#{Session.displayTitle.witness.notesOnCollationAndCorrections}" />
-
-						<h:outputText value="Notes on Ownership" />
-						<h:outputText
-							value="#{Session.displayTitle.witness.notesOnOwnership}" />
-
-						<h:outputText value="Notes (general)" />
+						<h:outputText value="Notes" />
 						<h:outputText value="#{Session.displayTitle.witness.notes}" />
 
 						<h:outputText value="Table of Contents" />