Mercurial > hg > extraction-interface
diff controllers/extractapp.php @ 59:6e44605eb4f6 extractapp
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 11:32:25 +0200 |
| parents | a11f9103b8db |
| children | 3395385476d1 |
line wrap: on
line diff
--- a/controllers/extractapp.php Tue Mar 31 10:59:52 2015 +0200 +++ b/controllers/extractapp.php Tue Mar 31 11:32:25 2015 +0200 @@ -23,7 +23,7 @@ $this->ReturnView($viewmodel->StartTagging(), true); break; case 'SaveFullTextToLGService': - $viewmodel->messages['info'] .= "SaveFullTextToLGService! "."<br>"; + $viewmodel->messages['info'] .= "SaveFullTextToLGService! "; $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['info'] .= "Reload the latest text "."<br>"; + $viewmodel->messages['info'] .= "Reload the latest text "; $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['info'] .= "(Countinue tagging) "."<br>"; + $viewmodel->messages['info'] .= "(Countinue tagging) "; if ($this->postdata['topic']) { $viewmodel->SetTopic($this->postdata['topic']); } @@ -56,7 +56,7 @@ default: // first time visit extraction interface from LGService - $viewmodel->messages['info'] .= "Welcome to Extraction Interface. "."<br>"; + $viewmodel->messages['info'] .= "Welcome to Extraction Interface. "; if ($this->postdata['fileId'] != 0) { // ($this->postdata['branchId'] != 0) { // get text from fileId, from LGService