Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23013/cobricks/core
Modified Files:
ConditionProcessor.java CoreManager.java properties.txt
Log Message:
Index: CoreManager.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/CoreManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CoreManager.java 22 Aug 2005 13:52:06 -0000 1.15
+++ CoreManager.java 18 Oct 2006 16:47:49 -0000 1.16
@@ -151,6 +151,23 @@
// initialize scheduler handler
schedulerHandler = new SchedulerHandler(this, properties);
+
+ // now check for the portal component database tables
+ logger.info("Checking and updating the core component database "
+ +"tables");
+ Set set = dbAccess.getComponentTableNames(getComponentId());
+ Iterator i = set.iterator();
+ while (i.hasNext()) {
+ String tablename = (String)i.next();
+ int res = dbAccess.checkTable(tablename);
+ if (res == -1) dbAccess.createTable(tablename);
+ else if (res == -2) {
+ logger.info("Found need to update table "+tablename);
+ if (!dbAccess.updateTable(tablename))
+ logger.error("Updating table "+tablename+" failed.");
+ }
+ }
+
}
Index: ConditionProcessor.java
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/ConditionProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConditionProcessor.java 16 Feb 2006 15:21:06 -0000 1.2
+++ ConditionProcessor.java 18 Oct 2006 16:47:49 -0000 1.3
@@ -118,6 +118,8 @@
if (thisuser == null || item == null) return false;
Object o1 = thisuser.getAttribute("interests.categories");
Object o2 = item.getAttribute("categories");
+ if (o2 == null)
+ return false;
Iterator i = ((Set)o2).iterator();
while (i.hasNext()) {
Object o3 = i.next();
Index: properties.txt
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/properties.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- properties.txt 26 Jul 2005 10:56:44 -0000 1.3
+++ properties.txt 18 Oct 2006 16:47:49 -0000 1.4
@@ -44,3 +44,7 @@
#mail.smtp.host=smtp.domain.com
#mail.smtp.user=username
#mail.smtp.pw=userpw
+
+# google maps api key and url for that key (for geocoder etc)
+google.maps.api.key=
+google.maps.api.keyurl=
|
