Mercurial > hg > extraction-interface

diff controllers/extractapp.php @ 58:a11f9103b8db extractapp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New: 1.display messages 2.handle saving conflict:up-to-date or reload text
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 31 Mar 2015 10:59:52 +0200
parents 5cf9720a2e25
children 6e44605eb4f6
line wrap: on
line diff
--- a/controllers/extractapp.php	Mon Mar 30 17:23:47 2015 +0200
+++ b/controllers/extractapp.php	Tue Mar 31 10:59:52 2015 +0200
@@ -23,7 +23,7 @@
                 $this->ReturnView($viewmodel->StartTagging(), true); 
                 break;   
             case 'SaveFullTextToLGService':
-                $viewmodel->messages .= "SaveFullTextToLGService! "."<br>";
+                $viewmodel->messages['info'] .= "SaveFullTextToLGService! "."<br>";
                 $viewmodel->GetInfoFromPreviousPage($this->postdata);
                 $response = $viewmodel->SaveFullTextToLGService($this->postdata);
                 $viewmodel->UpdateInfoByResponseFromLGService($response);    // update file_id, branch_id, user_id
@@ -38,7 +38,7 @@
                 $viewmodel->SmartRegexSave($this->postdata);
                 break;
             case 'ReloadText':
-                $viewmodel->messages .= "Reload the latest text "."<br>";
+                $viewmodel->messages['info'] .= "Reload the latest text "."<br>";
                 $viewmodel->GetInfoFromPreviousPage($this->postdata);
                 $viewmodel->ReloadSetting();    // set file_id = current_fileId, current_fileId = 0
                 $viewmodel->GetTextFromFileId();
@@ -46,7 +46,7 @@
                 break;
 
             case 'ContinueTagging':
-                $viewmodel->messages .= "(Countinue tagging) "."<br>";
+                $viewmodel->messages['info'] .= "(Countinue tagging) "."<br>";
                 if ($this->postdata['topic']) {
                     $viewmodel->SetTopic($this->postdata['topic']);
                 }
@@ -56,7 +56,7 @@
 
 
             default:    // first time visit extraction interface from LGService
-                $viewmodel->messages .= "Welcome to Extraction Interface. "."<br>";
+                $viewmodel->messages['info'] .= "Welcome to Extraction Interface. "."<br>";
 
                 if ($this->postdata['fileId'] != 0) { // ($this->postdata['branchId'] != 0) {
                     // get text from fileId, from LGService
@@ -78,7 +78,7 @@
                     break;                    
 
                 } else {
-                    $viewmodel->messages .= "wrong url!!";
+                    $viewmodel->messages['error'] .= "wrong url!!";
                     return;
                 }