diff --git a/schema.xml b/schema.xml
index d224dee..1f95810 100644
--- a/schema.xml
+++ b/schema.xml
@@ -437,7 +437,7 @@
-
+
diff --git a/src/main/java/gov/nysenate/opendirectory/models/Person.java b/src/main/java/gov/nysenate/opendirectory/models/Person.java
index 3a02d51..3bbbd65 100644
--- a/src/main/java/gov/nysenate/opendirectory/models/Person.java
+++ b/src/main/java/gov/nysenate/opendirectory/models/Person.java
@@ -14,6 +14,8 @@ public class Person {
public Person() {}
+
+ //VARIABLES NEED TO BE EXACT STRING MATCHES OF SOLR SCHEMA.XML
private TreeSet credentials;
private HashMap> permissions;
@@ -39,7 +41,7 @@ public Person() {}
private String twitter;
private String facebook;
private String linkedin;
- private String IRC;
+ private String irc;
public String getFirstName() {
return firstName;
@@ -80,7 +82,7 @@ public TreeSet getCredentials(){
public String getBio(){
return bio;
}
- public String getPic(){
+ public String getPicture(){
return picture;
}
public String getLinkedin() {
@@ -104,8 +106,8 @@ public TreeSet getInterests() {
public TreeSet getSkills() {
return skills;
}
- public String getIRC() {
- return IRC;
+ public String getIrc() {
+ return irc;
}
public void setFirstName(String firstName) {
@@ -147,7 +149,7 @@ public void setCredentials (TreeSet credentials){
public void setBio(String bio){
this.bio = bio;
}
- public void setPic(String picture){
+ public void setPicture(String picture){
this.picture = picture;
}
public void setSkills(TreeSet skills) {
@@ -171,8 +173,8 @@ public void setFacebook(String facebook) {
public void setLinkedin(String linkedin) {
this.linkedin = linkedin;
}
- public void setIRC(String iRC) {
- IRC = iRC;
+ public void setIrc(String IRC) {
+ this.irc = IRC;
}
public String toString() {
diff --git a/src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java b/src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java
index 074cf05..a2c0faf 100644
--- a/src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java
+++ b/src/main/java/gov/nysenate/opendirectory/solr/SecureLoader.java
@@ -62,6 +62,8 @@ public Person loadPerson(SolrDocument profile) {
String fieldname = (String)fields.item(c).getAttributes().item(1).getNodeValue();
if(fieldname.equals("user_credential") || fieldname.equals("skills") || fieldname.equals("interests")) {
+
+ //System.out.println(fieldname);
if(approved)
person.setCredentials(Credentials((String)profile.getFieldValue(fieldname)));
else
diff --git a/src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java b/src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java
index a4fd2ba..64d9ae3 100644
--- a/src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java
+++ b/src/main/java/gov/nysenate/opendirectory/solr/SolrSession.java
@@ -101,15 +101,16 @@ private void addPerson(Person person) throws SolrServerException, IOException {
person.setPermissions(Person.getDefaultPermissions());
person.setCredentials(cred_default);
- person.setBio("");
- person.setEmail2("");
- person.setPhone2("");
- person.setTwitter("");
- person.setFacebook("");
- person.setLinkedin("");
- person.setIRC("");
+ person.setBio(" ");
+ person.setEmail2(" ");
+ person.setPhone2(" ");
+ person.setTwitter(" ");
+ person.setFacebook(" ");
+ person.setLinkedin(" ");
+ person.setIrc(" ");
person.setSkills(null);
person.setInterests(null);
+ person.setPicture(" ");
}
String permissions = Permissions(person.getPermissions());
@@ -141,13 +142,13 @@ private void addPerson(Person person) throws SolrServerException, IOException {
//additional contact info
solr_person.addField("bio", person.getBio(), 1.0f);
- solr_person.addField("picture", person.getPic(), 1.0f);
+ solr_person.addField("picture", person.getPicture(), 1.0f);
solr_person.addField("email2", person.getEmail2(), 1.0f);
solr_person.addField("phone2", person.getPhone2(), 1.0f);
solr_person.addField("twitter", person.getTwitter(), 1.0f);
solr_person.addField("facebook", person.getFacebook(), 1.0f);
solr_person.addField("linkedin", person.getLinkedin(), 1.0f);
- solr_person.addField("irc", person.getIRC(), 1.0f);
+ solr_person.addField("irc", person.getIrc(), 1.0f);
solr_person.addField("skills", skills, 1.0f);
solr_person.addField("interests", interests,1.0f);