[mhk] r1075 committed - Sex information and comments updated @mhk_families

[codesite...@google.com]

Revision: 1075
Author: tbc...@gmail.com
Date: Tue May 28 09:08:43 2013
Log: Sex information and comments updated @mhk_families
http://code.google.com/p/mhk/source/detail?r=1075

Modified:
/branches/mhk_families/idb/etc/template/new/rperson_family.vm

/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyManagement.java
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyWorker.java
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Family.java
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Person.java
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/parser/TranslatorWorker.java

=======================================
--- /branches/mhk_families/idb/etc/template/new/rperson_family.vm Mon May
27 17:26:00 2013
+++ /branches/mhk_families/idb/etc/template/new/rperson_family.vm Tue May
28 09:08:43 2013
@@ -21,6 +21,7 @@
#set ( $help = "rperson")

#set($rperson_id=$req.getParameter("rid"))
+#set($ged_rperson_id=$id)

#set($Entity=$db.getEntityBrief($rperson_id))

@@ -66,10 +67,13 @@
##alert("ADD "+ "${person.getId()}");
#if($person.getSex()=="M" || $person.getSex()=="m")
nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(192,219,243)'}, line: {color:'rgb(100,100,100)'} }});
+ ##alert("ADD MALE "+ "${person.getId()}"+" "+"${person.getSex()}");
#elseif($person.getSex()=="F" || $person.getSex()=="f")
nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(255,212,212)'}, line: {color:'rgb(100,100,100)'} }});
+ ##alert("ADD FEMALE "+ "${person.getId()}"+" "+"${person.getSex()}");
#else
nodes[i]=ftree.AddPerson("${person.getName()}",{config: {node:
{background: 'rgb(0,0,0)'}, line: {color:'rgb(100,100,100)'} }});
+ ##alert("ADD N/A "+ "${person.getId()}"+" "+"${person.getSex()}");
#end
hash["${person.getId()}"]=i;
i++;
@@ -112,10 +116,10 @@
#end
}
#end
-
+ ##alert("${ged_rperson_id}");
ftree.Render(document.getElementById('pralltree'));
- ftree.center(nodes[0]);
- ftree.center(hash["${rperson_id}"]);
+ ##ftree.center(nodes[0]);
+ ftree.center(nodes[hash["${ged_rperson_id}"]]);
}

</script>
=======================================
---
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyManagement.java
Mon May 27 17:06:48 2013
+++
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyManagement.java
Tue May 28 09:08:43 2013
@@ -84,6 +84,7 @@
ResultSet db_persons=null;
ResultSet db_families=null;
HashMap <String,PersonFamilies> db_person_families=new
HashMap<String,PersonFamilies>();
+ HashMap <String,String> db_person_sex=new HashMap<String,String>();
try {
stmt = conn.createStatement();
db_persons = stmt.executeQuery("SELECT * FROM persons");
@@ -93,6 +94,7 @@
while(db_persons.next()){
PersonFamilies person_family=new
PersonFamilies(db_persons.getString("id"),db_persons.getString("sex"),db_persons.getString("name"));
db_person_families.put(db_persons.getString("id"),person_family);
+
db_person_sex.put(db_persons.getString("id"),db_persons.getString("sex"));
}

while(db_families.next()){
@@ -102,6 +104,7 @@
String mother_name=db_families.getString("name_mn");
String father_name=db_families.getString("name_pn");
String child_name=db_families.getString("name_n");
+ String child_sex=db_person_sex.get(db_families.getString("id_n"));

if(mother.equals("null"))
mother=null;
@@ -119,6 +122,7 @@
family.setFatherName(father_name);
family.setChild(child);
family.setChildName(child_name);
+ family.setChildSex(child_sex);

if(mother!=null)
db_person_families.get(mother).getFamiliesMpn().add(family);
=======================================
---
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyWorker.java
Tue May 21 09:12:14 2013
+++
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/geneology/FamilyWorker.java
Tue May 28 09:08:43 2013
@@ -51,7 +51,7 @@
@Override
public void exec(Hashtable task, BackgroundThread bg) throws Exception {
// TODO Auto-generated method stub
- System.out.println("FAMILY WORKER ");
+ //System.out.println("FAMILY WORKER ");

system= (DBSystem) task.get("db");

=======================================
--- /branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Family.java Tue
May 21 09:12:14 2013
+++ /branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Family.java Tue
May 28 09:08:43 2013
@@ -13,6 +13,7 @@
private String mother_name;
private String father_name;
private String child_name;
+ private String child_sex;
public Family() {}
public String getChild() {
return child;
@@ -51,4 +52,12 @@
public void setChildName(String child_name) {
this.child_name = child_name;
}
+ public void setChildSex(String child_sex) {
+ this.child_sex = child_sex;
+ }
+ public String getChildSex() {
+ return child_sex;
+ }
+
+
}
=======================================
--- /branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Person.java Sun
Apr 7 08:45:02 2013
+++ /branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/objects/Person.java Tue
May 28 09:08:43 2013
@@ -224,4 +224,17 @@
public void setId(String id) {
this.id = id;
}
+
+ /**
+ * @return Returns the sex.
+ */
+ public String getSex() {
+ return sex;
+ }
+ /**
+ * @param sex The sex to set.
+ */
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
}
=======================================
---
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/parser/TranslatorWorker.java
Wed May 1 11:11:53 2013
+++
/branches/mhk_families/idb/pt/uc/cisuc/jrc/mhk/parser/TranslatorWorker.java
Tue May 28 09:08:43 2013
@@ -30,7 +30,7 @@
String path = (String) task.get("path");
String t = (String) task.get("task");
if (t.equals("translate")){
- System.out.println("TRANSLATOR WORKER TRANSLATE");
+ //System.out.println("TRANSLATOR WORKER TRANSLATE");
GedcomParser ged_parser=new GedcomParser();
ged_parser.start(path,filename);
//job_import_file(task);