stephan: devel/kolab dirservnotify, 1.2, 1.3 kolabdcachetool, 1.1.1.1, 1.2

[cvs at intevation.de]

Author: stephan

Update of /kolabrepository/devel/kolab
In directory doto:/tmp/cvs-serv29337

Modified Files:
	dirservnotify kolabdcachetool 
Log Message:
simplify kolabdcachetool dependencies



Index: dirservnotify
===================================================================
RCS file: /kolabrepository/devel/kolab/dirservnotify,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dirservnotify	12 May 2004 08:35:24 -0000	1.2
+++ dirservnotify	23 Mar 2005 11:57:10 -0000	1.3
@@ -9,7 +9,7 @@
 use Kolab;
 use Kolab::DirServ;
 use Kolab::LDAP;
-use Kolab::Util;
+use Time::Local;
 use vars qw($name $mode $verbose $debug $timestamp);
 
 GetOptions(
@@ -20,6 +20,24 @@
     "timestamp" => \$timestamp
 );
 
+sub ldapDateToEpoch
+{
+    my $ldapdate = shift;
+
+        (my $y, my $m, my $d, my $h, my $mi, my $se) = unpack('A4A2A2A2A2A2', $ldapdate);
+	#$y = $y - 1900;
+	$m = $m - 1;
+	#$d = $d - 1;
+
+	if ($debug) {
+		print "Trying to do date: $ldapdate\n";
+	}
+
+	    return timelocal($se, $mi, $h, $d, $m, $y);
+}
+	    
+
+
 if (!defined $mode) { 
    print "No mode defined! Please specify update/delete/new.\n";
    exit 1;
@@ -50,7 +68,7 @@
 	#Get the old timestamp
         my $FILE;
         if (!($FILE = IO::File->new($filename, 'r'))) {
-	   $lastmodify = "20000000000000Z";
+	   $lastmodify = "20000101000000Z";
 	} else {
 	   while (<$FILE>) {
 		$lastmodify = $_ if !defined $lastmodify;

Index: kolabdcachetool
===================================================================
RCS file: /kolabrepository/devel/kolab/kolabdcachetool,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kolabdcachetool	3 May 2004 14:04:04 -0000	1.1.1.1
+++ kolabdcachetool	23 Mar 2005 11:57:10 -0000	1.2
@@ -37,9 +37,9 @@
 
 my ($guid, $ts);
 foreach $guid (keys %db) {
-    $sorted{
     $ts = "";
-    $ts = ", deleted " . strftime("%F %T", localtime($db2{$guid})) if exists($db2{$guid});
+    #$ts = ", deleted " . strftime("%F %T", localtime($db2{$guid})) if exists($db2{$guid});
+    $ts = ", deleted " if exists($db2{$guid});
     print "GUID: `$guid', mailbox: `" . $db{$guid} . "'$ts\n";
 }