Mercurial > hg > extraction-interface

diff develop/controllers/extractapp.php @ 14:ac77748bb813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Load regex files based on current topic. Only show the regex in this topic. To do that, it needs to lookup a table called 'topic_regex_relation' which has the relation of topic and regex filename in filesystem. - Extractapp UI with some layout modification: button, popup window, responsive (by bootstrap now). It was just for quick prototyping.
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 19 Feb 2015 11:07:27 +0100
parents cc36a20a68ab
children fb948097de39
line wrap: on
line diff
--- a/develop/controllers/extractapp.php	Tue Feb 17 15:25:11 2015 +0100
+++ b/develop/controllers/extractapp.php	Thu Feb 19 11:07:27 2015 +0100
@@ -20,29 +20,36 @@
         switch ($this->postdata['func']) {
             case 'SaveFullText':
                 $viewmodel->SaveFullText($this->postdata);          
-                $this->ReturnView($viewmodel->StartTagging(), false); 
+                $this->ReturnView($viewmodel->StartTagging(), true); 
                 break;   
             case 'SaveFullTextToLGService':
-                echo "[Z] SaveFullTextToLGService! ";
+                $viewmodel->messages .= "[Z] SaveFullTextToLGService! ";
                 $viewmodel->GetInfoFromPreviousPage($this->postdata);
                 $response = $viewmodel->SaveFullTextToLGService($this->postdata);
                 
                 $viewmodel->UpdateInfoByResponseFromLGService($response);    // update file_id, branch_id, user_id
                 
-                $this->ReturnView($viewmodel->StartTagging(), false); 
+                $this->ReturnView($viewmodel->StartTagging(), true); 
+                break;
+
+            case 'SmartRegexLoad':
+                $viewmodel->SmartRegexLoad($this->postdata['topic_id']);
+                break;
+            case 'SmartRegexSave':
+                $viewmodel->SmartRegexSave($this->postdata);
                 break;
 
             case 'ContinueTagging':
-                echo "[Z] (Countinue tagging) ";
+                $viewmodel->messages .= "[Z] (Countinue tagging) ";
                 if ($this->postdata['topic']) {
                     $viewmodel->SetTopic($this->postdata['topic']);
                 }
                 $viewmodel->GetInfoFromPreviousPage($this->postdata);
-                $this->ReturnView($viewmodel->StartTagging(), false); 
+                $this->ReturnView($viewmodel->StartTagging(), true); 
                 break;
+
             default:    // first time visit extraction interface from LGService
-                // TODO: get the _post data from Jorge's service
-                echo "[Z] Welcome to Extraction Interface. ";
+                $viewmodel->messages .= "[Z] Welcome to Extraction Interface. ";
 
                 if ($this->postdata['fileId'] != 0) { // ($this->postdata['branchId'] != 0) {
                     // get text from fileId, from LGService
@@ -56,15 +63,15 @@
                 } else if (is_numeric($this->urlvalues['id'])) {
                     // get text from local file system (for development stage only)
                     $viewmodel->GetTextFromLocal($this->urlvalues['id']);
+                    $this->ReturnView_localtest($viewmodel->StartTagging(), true); 
+                    break;                    
 
                 } else {
-                    var_dump($this->postdata);
-
-                    echo "wrong url!!";
+                    $viewmodel->messages .= "wrong url!!";
                     return;
                 }
 
-                $this->ReturnView($viewmodel->StartTagging(), false); 
+                $this->ReturnView($viewmodel->StartTagging(), true); 
                 break;
         }
 
@@ -75,7 +82,7 @@
     protected function ExportTable() {
         //$viewmodel = new ExtractappModel();
         $viewmodel = $this->viewmodel;
-        $this->ReturnView($viewmodel->ExportTable($this->postdata), false);
+        $this->ReturnView($viewmodel->ExportTable($this->postdata), true);
 
     }
 
@@ -84,13 +91,13 @@
         $viewmodel = $this->viewmodel;
         switch ($this->postdata['func']) {
             case 'AddNewList':
-                $this->ReturnView($viewmodel->AddNewList($this->postdata), false);
+                $this->ReturnView($viewmodel->AddNewList($this->postdata), true);
                 break;
             case 'SaveWordlist':
-                $this->ReturnView($viewmodel->SaveWordlist($this->postdata), false);
+                $this->ReturnView($viewmodel->SaveWordlist($this->postdata), true);
                 break;
             default:    // EditWordlist
-                $this->ReturnView($viewmodel->EditWordlist($this->urlvalues), false);    
+                $this->ReturnView($viewmodel->EditWordlist(), true);    
             break;
          } 
     }
@@ -101,16 +108,16 @@
         $viewmodel = $this->viewmodel;
         switch ($this->postdata['func']) {
             case 'NewTagElement':
-                $this->ReturnView($viewmodel->NewTagElement($this->postdata), false);
+                $this->ReturnView($viewmodel->NewTagElement($this->postdata), true);
                 break;
             case 'SaveTagElement':
-                $this->ReturnView($viewmodel->SaveTagElement($this->postdata), false);
+                $this->ReturnView($viewmodel->SaveTagElement($this->postdata), true);
                 break;
             case 'DeleteTag':
-                $this->ReturnView($viewmodel->DeleteTag($this->postdata), false);
+                $this->ReturnView($viewmodel->DeleteTag($this->postdata), true);
                 break;
             default:    // EditTaglist
-                $this->ReturnView($viewmodel->EditTaglist($this->urlvalues), false);
+                $this->ReturnView($viewmodel->EditTaglist(), true);
                 break;
         }
     }
@@ -124,7 +131,7 @@
                 
                 break;
             default:    
-                $this->ReturnView($viewmodel->ConfigTagsInTopic($this->postdata), false);  
+                $this->ReturnView($viewmodel->ConfigTagsInTopic($this->postdata), true);  
             break;
          } 
     }
@@ -134,6 +141,8 @@
         $this->ReturnView($viewmodel->Test(), true);
     }
 
+
+    
 	
 }