src/js/serializers/JSONSerializer.js
branchpopcorn-port
changeset 639 f18233d3a7fa
parent 636 b1629eed3e11
child 666 08d1656c608a
--- a/src/js/serializers/JSONSerializer.js	Mon Jan 16 12:47:16 2012 +0100
+++ b/src/js/serializers/JSONSerializer.js	Mon Jan 16 15:05:55 2012 +0100
@@ -292,11 +292,11 @@
     }
   }
 
-  var available_types = this._data["available_types"];    
+  var available_types = this._data["annotation_types"];    
   if (IriSP.null_or_undefined(available_types)) {
-    available_types = this._data["available-types"];
+    available_types = this._data["annotation-types"];
     if (IriSP.null_or_undefined(available_types)) {
-      console.log("neither available_types nor available-types are defined");      
+      console.log("neither annotation_types nor annotation-types are defined");      
       return;
     }
   }
@@ -339,7 +339,7 @@
   if (IriSP.null_or_undefined(available_types)) {
     available_types = this._data["annotation-types"];
     if (IriSP.null_or_undefined(available_types)) {
-      console.log("neither available_types nor available-types are defined");      
+      console.log("neither annotation_types nor annotation-types are defined");      
       return;
     }
   }
@@ -352,7 +352,7 @@
       potential_types.push(available_types[i].id);
     }
   }
-  console.log("pot", potential_types, "avail", annotation_types);
+
   // Get the intersection of both.
   var nonTweetsId = IriSP.underscore.intersection(annotation_types, potential_types);