From 01a28d60e808ee0a7ff3c8c8f543d7232baa264f Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Wed, 9 Nov 2011 07:45:22 +0000
Subject: [PATCH]  * adjust the syncer.

---
 module/svn/syncer/syncer.php | 77 +++++++++++++++++++++++++++---------
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git a/module/svn/syncer/syncer.php b/module/svn/syncer/syncer.php
index 2c15417bed..965fdfdd41 100644
--- a/module/svn/syncer/syncer.php
+++ b/module/svn/syncer/syncer.php
@@ -9,8 +9,11 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
+error_reporting(E_ALL ^ E_STRICT ^ E_WARNING);
+
 include './config.php';
 include './api.class.php';
+
 $syncer = new syncer($config);
 $syncer->run();
 
@@ -57,6 +60,7 @@ class syncer
     public function __construct($config)
     {
         $this->setConfig($config);
+        $this->setTimeZone();
         $this->setRepos();
         $this->setLogRoot();
         $this->loginZentao();
@@ -74,6 +78,17 @@ class syncer
         $this->config = $config;
     }
 
+   /**
+   * Set timezone.
+   * 
+   * @access public
+   * @return void
+   */
+    public function setTimeZone()
+    {
+        date_default_timezone_set($this->config->timezone);
+    }
+
     /**
      * Set the repos.
      * 
@@ -119,29 +134,41 @@ class syncer
      */
     public function run()
     {
-        foreach($this->repos as $name => $repo)
+        while(true)
         {
-            $this->printLog("begin repo $name");
-            $repo = (object)$repo;
-            $repo->name = $name;
+            foreach($this->repos as $name => $repo)
+            {
+                $this->printLog("begin repo $name");
+                $repo = (object)$repo;
+                $repo->name = $name;
 
-            $this->setRepo($repo);
+                $this->setRepo($repo);
 
-            $savedRevision = $this->getSavedRevision();
-            $this->printLog("start from revision $savedRevision");
-            $logs = $this->getRepoLogs($repo, $savedRevision);
-            $this->printLog("get " . count($logs) . " logs");
+                $savedRevision = $this->getSavedRevision();
+                $this->printLog("start from revision $savedRevision");
+                $logs = $this->getRepoLogs($repo, $savedRevision);
+                $revisions = $this->getRevisionsFromLogs($logs);
+                if(!$revisions) 
+                {
+                    $this->printLog("no logs");
+                    continue;
+                }
+                $this->printLog('fetched ' . count($revisions) . ' logs');
 
-            $this->printLog('begin posting logs');
-            $objects = $this->zentaoClient->post('svn', 'apiSync', array('logs' => $logs, 'repoRoot' => $this->repoRoot));
-            $objects = $objects->parsedObjects;
+                $this->printLog('begin posting logs');
+                $objects = $this->zentaoClient->post('svn', 'apiSync', array('logs' => $logs, 'repoRoot' => $this->repoRoot));
+                $objects = $objects->parsedObjects;
 
-            $this->printLog('parsed objects:');
-            echo 'story: ' . join(',', (array)$objects->stories) . "\n";
-            echo 'task: '  . join(',', (array)$objects->tasks) . "\n";
-            echo 'bugs: '  . join(',', (array)$objects->bugs) . "\n";
+                $this->printLog('parsed objects:');
+                echo 'story: ' . join(',', (array)$objects->stories) . "\n";
+                echo 'task: '  . join(',', (array)$objects->tasks) . "\n";
+                echo 'bugs: '  . join(',', (array)$objects->bugs) . "\n";
 
-            echo "----------------------\n";
+                $this->saveLastRevision(max($revisions));
+                echo "----------------------\n";
+            }
+            $this->printLog("sleeping {$this->config->sleep} seconds");
+            sleep($this->config->sleep);
         }
     }
 
@@ -170,7 +197,7 @@ class syncer
     {
         if($this->config->svn->client == '') die("You must set the svn svnClient file.\n");
         $this->svnClient = $this->config->svn->client . " --non-interactive";
-        if(isset($repo->username)) $this->svnClient .= " --username '$repo->username' --password '$repo->password' --no-auth-cache";
+        if(isset($repo->username)) $this->svnClient .= " --username $repo->username --password $repo->password --no-auth-cache";
     }
 
     /**
@@ -232,6 +259,20 @@ class syncer
         return (int)trim(file_get_contents($this->logFile));
     }
 
+    /**
+     * Get revisons from logs.
+     * 
+     * @param  string    $logs 
+     * @access public
+     * @return array|bool
+     */
+    public function getRevisionsFromLogs($logs)
+    {
+        if(!preg_match_all('|revision="(.*)"|', $logs, $results)) return false;
+        $revisions = $results[1];
+        return $revisions;
+    }
+
     /**
      * Save the last revision.
      *