[FIX] annotations: use new api param 'testgroup' in various highlight creation

annotations/static/annotations/app.js

@@ -97,6 +97,21 @@
             //             +propToRead+" ("+cache[propToRead]+")")
             params[key] = cache[propToRead]
           }
+          else if (typeof val == "object" && val["fromCacheIfElse"]) {
+            var propToReadIf = val["fromCacheIfElse"][0]
+            var propToReadElse = val["fromCacheIfElse"][1]
+            // console.log("reading from cache: response data property " +
+            //             "if:"+propToReadIf+" ("+cache[propToReadIf]+")"+
+            //             " else:"+propToReadElse+" ("+cache[propToReadElse]+")")
+            var valueIf = cache[propToReadIf]
+            var valueElse = cache[propToReadElse]
+            if (valueIf && valueIf != 'null' && valueIf != '') {
+              params[key] = valueIf
+            }
+            else {
+              params[key] = valueElse
+            }
+          }
       }
 
       // Now we run the call
@@ -149,8 +164,8 @@
     // -------------------------------------------------------------------------
 
     // debug
-    // console.log("==> $rootScope <==")
-    // console.log($rootScope)
+    console.log("==> $rootScope <==")
+    console.log($rootScope)
   });
 
 })(window);

annotations/static/annotations/highlight.js

@@ -219,9 +219,9 @@
                       'crudCalls':[
                       {'service': MainApiAddNgramHttpService, 'action': 'put',
                        'params' : {'ngramStr':newNgramText, corpusId: $rootScope.corpusId},
-                       'dataPropertiesToCache': ['id'] },
+                       'dataPropertiesToCache': ['id', 'group'] },
                       {'service': MainApiChangeNgramHttpService, 'action': 'put',
-                       'params' : {'listId':stoplist_id, 'ngramIdList': {'fromCache': 'id'} } }
+                       'params' : {'listId':stoplist_id, 'ngramIdList': {'fromCacheIfElse': ['group','id']} } }
                       ]
                   }) ;
               $scope.menuItems.push({
@@ -230,9 +230,9 @@
                       'crudCalls':[
                       {'service': MainApiAddNgramHttpService, 'action': 'put',
                        'params' : {'ngramStr':newNgramText, corpusId: $rootScope.corpusId},
-                       'dataPropertiesToCache': ['id'] },
+                       'dataPropertiesToCache': ['id', 'group'] },
                       {'service': MainApiChangeNgramHttpService, 'action': 'put',
-                       'params' : {'listId':mainlist_id, 'ngramIdList': {'fromCache': 'id'} } }
+                       'params' : {'listId':mainlist_id, 'ngramIdList': {'fromCacheIfElse': ['group','id']} } }
                       ]
                   }) ;
               $scope.menuItems.push({
@@ -241,11 +241,11 @@
                       'crudCalls':[
                       {'service': MainApiAddNgramHttpService, 'action': 'put',
                        'params' : {'ngramStr':newNgramText, corpusId: $rootScope.corpusId},
-                       'dataPropertiesToCache': ['id'] },
+                       'dataPropertiesToCache': ['id', 'group'] },
                       {'service': MainApiChangeNgramHttpService, 'action': 'put',
-                       'params' : {'listId':mainlist_id, 'ngramIdList': {'fromCache': 'id'} } },
+                       'params' : {'listId':mainlist_id, 'ngramIdList': {'fromCacheIfElse': ['group','id']} } },
                       {'service': MainApiChangeNgramHttpService, 'action': 'put',
-                       'params' : {'listId':maplist_id, 'ngramIdList': {'fromCache': 'id'} } }
+                       'params' : {'listId':maplist_id, 'ngramIdList': {'fromCacheIfElse': ['group','id']} } }
                       ]
                   }) ;
 

annotations/static/annotations/http.js

@@ -90,17 +90,20 @@
   * MainApiAddNgramHttpService: Create and index a new ngram
   * ===========================
   * route: PUT api/ngrams?text=mynewngramstring&corpus=corpus_id
-  * ------
+  *
+  * NB it also checks if ngram exists (returns the preexisting id)
+  *    and if it has a mainform/group (via 'testgroup' option)
+  *                                   (useful if we add it to a list afterwards)
   *
   */
   http.factory('MainApiAddNgramHttpService', function($resource) {
     return $resource(
        // adding explicit "http://" b/c this a cross origin request
       'http://' + window.GARG_ROOT_URL
-                + "/api/ngrams?text=:ngramStr&corpus=:corpusId",
+                + "/api/ngrams?text=:ngramStr&corpus=:corpusId&testgroup",
       {
         ngramStr: '@ngramStr',
-        corpusId: '@corpusId'
+        corpusId: '@corpusId',
       },
       {
         put: {