--- loncom/homework/default_homework.lcpm	2008/05/30 01:16:04	1.134
+++ loncom/homework/default_homework.lcpm	2008/06/10 16:20:29	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.134 2008/05/30 01:16:04 www Exp $
+# $Id: default_homework.lcpm,v 1.135 2008/06/10 16:20:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1024,46 +1024,28 @@ sub sec {
     return $sec;
 }
 
+sub eval_time {
+   my ($timestamp)=@_;
+   unless ($timestamp) { return ''; }
+   return &locallocaltime($timestamp);
+}
+
 sub open_date { 
     my ($partid)=@_;
     unless ($partid) { $partid=0; }
-    my @dc = split(/\s+/,localtime(&EXT('resource.'.$partid.'.opendate')));
-    return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969);
-    my @hm = split(/:/,$dc[3]);
-    my $ampm = " am";
-    if ($hm[0] > 12) {
-	$hm[0]-=12;
-	$ampm = " pm";
-    }
-    return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm;
+    return &eval_time(&EXT('resource.'.$partid.'.opendate'));
 }
 
 sub due_date {
     my ($partid)=@_;
     unless ($partid) { $partid=0; } 
-    my @dc = split(/\s+/,localtime(&EXT('resource.'.$partid.'.duedate')));
-    return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969);
-    my @hm = split(/:/,$dc[3]);
-    my $ampm = " am";
-    if ($hm[0] > 12) {
-	$hm[0]-=12;
-	$ampm = " pm";
-    }
-    return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm;
+    return &eval_time(&EXT('resource.'.$partid.'.duedate'));
 }
 
 sub answer_date { 
     my ($partid)=@_;
     unless ($partid) { $partid=0; }
-    my @dc = split(/\s+/,localtime(&EXT('resource.'.$partid.'.answerdate')));
-    return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969);
-    my @hm = split(/:/,$dc[3]);
-    my $ampm = " am";
-    if ($hm[0] > 12) {
-	$hm[0]-=12;
-	$ampm = " pm";
-    }
-    return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm;
+    return &eval_time(&EXT('resource.'.$partid.'.answerdate'));
 }
 
 sub array_moments {