[Bedework-commit] r539 - in trunk/calendar3: dumprestore/src/org/bedework/dumprestore/dump dumprestore/src/org/bedework/dumprestore/dump/dumpling webcommon/src/org/bedework/webcommon/taglib

[svnadmin at bedework.org]

Author: douglm
Date: 2006-06-05 22:18:40 -0400 (Mon, 05 Jun 2006)
New Revision: 539

Modified:
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
   trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java
Log:
Fix taglib - String.valueOf(null) = "null"

Fix dump/restore counts

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java	2006-06-05 20:56:51 UTC (rev 538)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java	2006-06-06 02:18:40 UTC (rev 539)
@@ -65,6 +65,9 @@
   public int subscriptions;
 
   /** */
+  public int calendars;
+
+  /** */
   public int locations;
 
   /** */
@@ -106,6 +109,7 @@
     System.out.println("          syspars: " + syspars);
     System.out.println("            users: " + users);
     System.out.println("        timezones: " + timezones);
+    System.out.println("        calendars: " + calendars);
     System.out.println("  subscribedUsers: " + subscribedUsers);
     System.out.println("    subscriptions: " + subscriptions);
     System.out.println("        locations: " + locations);

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java	2006-06-05 20:56:51 UTC (rev 538)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java	2006-06-06 02:18:40 UTC (rev 539)
@@ -88,6 +88,6 @@
       dumpCalendar((BwCalendar)children.next());
     }
 
-    globals.categories++;
+    globals.calendars++;
   }
 }

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java	2006-06-05 20:56:51 UTC (rev 538)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java	2006-06-06 02:18:40 UTC (rev 539)
@@ -63,14 +63,11 @@
       tagStart(sectionEvents);
     }
 
-    long ct = 0;
-
     while (it.hasNext()) {
       dumpEvent((BwEvent)it.next());
-      ct++;
 
-      if ((ct % 100) == 0) {
-        info("        ... " + ct);
+      if ((globals.events % 100) == 0) {
+        info("        ... " +       globals.events);
       }
     }
 

Modified: trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java
===================================================================
--- trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java	2006-06-05 20:56:51 UTC (rev 538)
+++ trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/NameScopePropertyTag.java	2006-06-06 02:18:40 UTC (rev 539)
@@ -98,6 +98,10 @@
    * @throws JspTagException
    */
   protected String getString(boolean required) throws JspTagException {
-    return String.valueOf(getObject(name, scope, property, required));
+    Object o = getObject(required);
+    if (o == null) {
+      return null;
+    }
+    return String.valueOf(o);
   }
 }