Changeset 29893 for websites/trajoin

Timestamp:

02/11/09 09:16:50 (4 years ago)

Author:

brtriver

Message:

change varchar to blob in original column type, and fix commit to repo

Location:

websites/trajoin/trunk

Files:

• apps/frontend/config/module.yml (modified) (1 diff)
• apps/frontend/modules/translation/actions/actions.class.php (modified) (1 diff)
• apps/frontend/modules/translation/templates/showTranslatedSuccess.php (modified) (1 diff)
• config/schema.yml (modified) (2 diffs)
• lib/model/HistoryPeer.php (modified) (2 diffs)

websites/trajoin/trunk/apps/frontend/config/module.yml

@@ -5 +5 @@
       1.2/jobeet/en: jobbet directory
       1.2/cookbook/en: test
+      1.2/forms_book/en: form
       jobeet: Learn symfony step by step 24 days, 1 hour a day
       1.2/book: The Definitive Guide to symtony

websites/trajoin/trunk/apps/frontend/modules/translation/actions/actions.class.php

@@ -77 +77 @@
           $newTranslation = $this->form->save();
           HistoryPeer::save($this->form->getObject(), $request->getParameter('translation[note]'), date('Y-m-d H:i:s'));
+          HistoryPeer::commit2repo($this->Parser->getFilePath(), $request->getParameter('translation[note]'));
           // svn commit if on production server
-          if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) {
-            $Filesystem = new sfFilesystem();
-            $svnPath = "../data/contents/markdown/1.2/";
-            $this->logMessage($Filesystem->sh(sprintf('../symfony trajoin:markdown %s', $this->Parser->getFilePath())));
-            $cmd= sprintf('svn status --config-dir /home/svn/.subversion %s* |grep ^? |cut -d \' \' -f 7 | xargs --no-run-if-empty svn add --config-dir /home/svn/.subversion ', $svnPath);
-            $this->logMessage($Filesystem->sh($cmd));
-            $cmd= sprintf('svn commit --config-dir /home/svn/.subversion -m "%s" %s --username trajoin', escapeshellcmd($request->getParameter('translation[note]')), $svnPath);
-            $this->logMessage($Filesystem->sh($cmd));
-          }
+          //          if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) {
+          //  $Filesystem = new sfFilesystem();
+          //  $svnPath = "../data/contents/markdown/1.2/";
+          //  $this->logMessage($Filesystem->sh(sprintf('../symfony trajoin:markdown %s', $this->Parser->getFilePath())));
+          //  $cmd= sprintf('svn status --config-dir /home/svn/.subversion %s* |grep ^? |cut -d \' \' -f 7 | xargs --no-run-if-empty svn add --config-dir /home/svn/.subversion ', $svnPath);
+          //  $this->logMessage($Filesystem->sh($cmd));
+          //  $cmd= sprintf('svn commit --config-dir /home/svn/.subversion -m "%s" %s --username trajoin', escapeshellcmd($request->getParameter('translation[note]')), $svnPath);
+          //  $this->logMessage($Filesystem->sh($cmd));
+          //}
         } else {
           $this->form->updateObject($this->form->getValues());

websites/trajoin/trunk/apps/frontend/modules/translation/templates/showTranslatedSuccess.php

@@ -7 +7 @@
   <a href="<?php echo url_for('@original') . "/" . $filePath ?>"><?php echo basename($filePath) ?></a>
 </p>
-
 <?php foreach($Parser->getChunks(ESC_RAW) as $id => $chunk): ?>
     <?php if (trim($chunk) == "") continue ?>

websites/trajoin/trunk/config/schema.yml

@@ -7 +7 @@
     id: { type: INTEGER, primaryKey: true, required: true, autoincrement: true }
     file_path: { type: VARCHAR, size: '255', required: true, index: true }
-    original: { type: LONGVARCHAR, required: false }
+    original: { type: VARBINARY, required: false }
   translation_i18n:
     _attributes: { phpName: TranslationI18n }
@@ -29 +29 @@
     translation_id: { type: INTEGER, required: true, foreignTable: translation, foreignReference: id }
     culture: { type: VARCHAR, size: '7', required: true }
-    original: { type: LONGVARCHAR, required: false }
+    original: { type: VARBINARY, required: false }
     translated: { type: LONGVARCHAR, required: true }
     note: { type: LONGVARCHAR, required: false }

websites/trajoin/trunk/lib/model/HistoryPeer.php

@@ -113 +113 @@
     $translation->getCurrentTranslationI18n()->setUserId($history->getUserId());
     $translation->save();
+    // commit to repo
+    self::commit2repo($translation->getFilePath(), $history->getNote());
     // clear histories by same user and same chunk
     $sameHistories = self::retrieveByTranslationId($history->getTranslationId(), $history->getCulture());
@@ -126 +128 @@
     }
   }
+  static public function commit2repo($filePath, $message="")
+  {
+    // svn commit if on production server
+    if (in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) return;
+    $Filesystem = new sfFilesystem();
+    $svnPath = "../data/contents/markdown/1.2/";
+    $cmd= sprintf('svn update --config-dir /home/svn/.subversion %s', $svnPath);
+    //$cmd= sprintf('svn update  %s', $svnPath);
+    self::logMessage($Filesystem->sh($cmd));
+    self::logMessage($Filesystem->sh(sprintf('../symfony trajoin:markdown %s', $filePath)));
+    $cmd= sprintf('svn status --config-dir /home/svn/.subversion %s* |grep ^? |cut -d \' \' -f 7 | xargs --no-run-if-empty svn add --config-dir /home/svn/.subversion ', $svnPath);
+    //$cmd= sprintf('svn status  %s* |grep ^? |cut -d \' \' -f 7 | xargs svn add ', $svnPath);
+    self::logMessage($Filesystem->sh($cmd));
+    $cmd= sprintf('svn commit --config-dir /home/svn/.subversion -m "%s" %s --username trajoin', escapeshellcmd($message), $svnPath);
+    //$cmd= sprintf('svn commit -m "%s" %s --username trajoin', escapeshellcmd($message), $svnPath);
+    self::logMessage($Filesystem->sh($cmd));
+  }
+  static private function logMessage($message)
+  {
+  if (sfConfig::get('sf_logging_enabled')) {
+      sfContext::getInstance()->getLogger()->info($message);
+    }
+  }
 }