Menu
▾
▴
cobricks-cvscommit
|
From: Michael K. <ko...@us...> - 2006-10-18 16:47:54
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23013/cobricks/user Modified Files: UserManagerImpl.java userontology.xml Log Message: Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- UserManagerImpl.java 5 Oct 2006 17:57:50 -0000 1.67 +++ UserManagerImpl.java 18 Oct 2006 16:47:50 -0000 1.68 @@ -1747,8 +1747,10 @@ * */ public void updateUserLastLogin(int userid, Date date) - throws CobricksException { + throws CobricksException + { User user = getUser(userid); + if (user == null) return; user.setAttributeLocally(User.LASTLOGIN, date); Map attrs = new HashMap(); attrs.put("lastlogin", date); Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- userontology.xml 5 Oct 2006 17:57:50 -0000 1.15 +++ userontology.xml 18 Oct 2006 16:47:50 -0000 1.16 @@ -45,14 +45,30 @@ <description lang="de">Sprachkenntnisse</description> <description lang="en">Languages Spoken</description> </attr> + <attr name="basic.personal.location.geo.lat" type="string(20)"> + <description lang="de">Aufenthaltsort Breitengrad (WGS84)</description> + <description lang="en">Location Latitude (WGS84)</description> + </attr> + <attr name="basic.personal.location.geo.lng" type="string(20)"> + <description lang="de">Aufenthaltsort Laengengrad (WGS84)</description> + <description lang="en">Location Longitude (WGS84)</description> + </attr> - <attr name="basic.contact-priv.location.gml" type="string(50)"> - <description lang="de">Position (gml:Point)</description> - <description lang="en">Position (gml:Point)</description> + <attr name="basic.contact-priv.location.geo.lat" type="string(20)"> + <description lang="de">Wohnort Breitengrad (WGS84)</description> + <description lang="en">Home Latitude (WGS84)</description> </attr> - <attr name="basic.contact-work.location.gml" type="string(50)"> - <description lang="de">Position (gml:Point)</description> - <description lang="en">Position (gml:Point)</description> + <attr name="basic.contact-priv.location.geo.lng" type="string(20)"> + <description lang="de">Wohnort Laengengrad (WGS84)</description> + <description lang="en">Home Longitude (WGS84)</description> + </attr> + <attr name="basic.contact-work.location.geo.lat" type="string(20)"> + <description lang="de">Arbeit Breitengrad (WGS84)</description> + <description lang="en">Work Latitude (WGS84)</description> + </attr> + <attr name="basic.contact-work.location.geo.lng" type="string(20)"> + <description lang="de">Arbeit Laengengrad (WGS84)</description> + <description lang="en">Work Longitude (WGS84)</description> </attr> <attr name="basic.contact-priv.postal.comment" type="string(50)"/> @@ -81,9 +97,9 @@ <description lang="de">Homepage (privat)</description> <description lang="en">Homepage (private)</description> </attr> - <attr name="basic.contact-priv.online.openbc.name" type="string(100)"> - <description lang="de">OpenBC Name</description> - <description lang="en">OpenBC name</description> + <attr name="basic.contact-priv.online.xing.name" type="string(100)"> + <description lang="de">Xing Name</description> + <description lang="en">Xing name</description> </attr> <attr name="basic.contact-priv.online.messenger.icq" type="string(100)"> <description lang="de">ICQ ID</description> |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14571/user Modified Files: UserManagerImpl.java userontology.xml Log Message: Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- UserManagerImpl.java 18 Oct 2006 16:47:50 -0000 1.68 +++ UserManagerImpl.java 26 Oct 2006 10:38:25 -0000 1.69 @@ -1142,8 +1142,13 @@ if (attrs.get(User.USERCLASS) == null) { attrs.put(User.USERCLASS, ontology.getClass("user").getName()); } else { - attrs.put(User.USERCLASS, ontology.getClass( + try { + attrs.put(User.USERCLASS, ontology.getClass( (String) attrs.get(User.USERCLASS)).getName()); + } catch (Exception e) { + attrs.put(User.USERCLASS, + ontology.getClass("user").getName()); + } } // password must be crypted and inserted in the corresponding Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- userontology.xml 18 Oct 2006 16:47:50 -0000 1.16 +++ userontology.xml 26 Oct 2006 10:38:25 -0000 1.17 @@ -122,11 +122,25 @@ <description lang="en">Phone (private)</description> </attr> <attr name="basic.contact-priv.telecom.fax" type="string(25)"/> - <attr name="basic.contact-work.postal.comment" type="string(50)"/> - <attr name="basic.contact-work.postal.street" type="string(50)"/> - <attr name="basic.contact-work.postal.city" type="string(30)"/> - <attr name="basic.contact-work.postal.postalcode" type="string(20)"/> - <attr name="basic.contact-work.postal.country" type="string(30)"/> + </attr> + <attr name="basic.contact-work.postal.comment" type="string(50)"> + </attr> + <attr name="basic.contact-work.postal.street" type="string(50)"> + <description lang="de">Strasse</description> + <description lang="en">Street</description> + </attr> + <attr name="basic.contact-work.postal.city" type="string(30)"> + <description lang="de">Stadt</description> + <description lang="en">City</description> + </attr> + <attr name="basic.contact-work.postal.postalcode" type="string(20)"> + <description lang="de">PLZ</description> + <description lang="en">Zip code</description> + </attr> + <attr name="basic.contact-work.postal.country" type="string(30)"> + <description lang="de">Land</description> + <description lang="en">Country</description> + </attr> <attr name="basic.contact-work.online.email" type="string(50)"> <description lang="de">E-Mail (geschaeftlich)</description> <description lang="en">Email (work)</description> @@ -136,6 +150,18 @@ <description lang="de">Homepage (geschäftlich)</description> <description lang="en">Homepage (work)</description> </attr> + <attr name="basic.contact-work.online.messenger.icq" type="string(100)"> + <description lang="de">ICQ ID</description> + <description lang="en">ICQ ID</description> + </attr> + <attr name="basic.contact-work.online.messenger.msn" type="string(100)"> + <description lang="de">MSN ID</description> + <description lang="en">MSN ID</description> + </attr> + <attr name="basic.contact-work.online.messenger.skype" type="string(100)"> + <description lang="de">Skype ID</description> + <description lang="en">Skype ID</description> + </attr> <attr name="basic.contact-work.telecom.mobile" type="string(25)"> <description lang="de">Mobiltelefon (geschaeftlich)</description> <description lang="en">Mobile phone (work)</description> @@ -144,14 +170,20 @@ <description lang="de">Telefon (geschaeftlich)</description> <description lang="en">Phone (work)</description> </attr> - <attr name="basic.contact-work.telecom.fax" type="string(25)"/> - + <attr name="basic.contact-work.telecom.fax" type="string(25)"> + <description lang="de">Fax (geschaeftlich)</description> + <description lang="en">Fax number (work)</description> + </attr> + <attr name="basic.credentials.password.crypt" type="string(30)"/> <attr name="basic.work.companyname" type="string(150)"/> <attr name="basic.work.jobdescription" type="string(50)"/> - <attr name="interests.freetext" type="string(500)"/> + <attr name="interests.freetext" type="string(500)"> + <description lang="de">Interessen</description> + <description lang="en">Interests</description> + </attr> <attr name="interests.categories" type="category[]"> <description lang="de">Interessen</description> <description lang="en">Interests</description> @@ -167,8 +199,12 @@ <contextclass>ContextUserUser</contextclass> </attr> - <attr name="history.org.cobricks.lastlogin" type="date"/> - <attr name="history.org.cobricks.regtime" type="date"/> + <attr name="history.org.cobricks.lastlogin" type="date"> + <description lang="en">Last login</description> + </attr> + <attr name="history.org.cobricks.regtime" type="date"> + <description lang="en">Member since</description> + </attr> <attr name="preference.language" type="string(2)"> <description lang="de">bevorzugte Sprache</description> |
Thanks for helping keep SourceForge clean.
X