use modelId as arg

heigeo · May 9, 2017 · 8593a06 · 8593a06
1 parent b7a78d7
commit 8593a06
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/www/tensorflow.js b/www/tensorflow.js
@@ -145,7 +145,7 @@ function loadModel(modelId, callback, errorCallback, progressCallback) {
         };
     }
     if (!model.cached) {
-        checkCached(model, function(cached) {
+        checkCached(modelId, function(cached) {
             if (!cached) {
                 fetchModel(
                     model,
@@ -195,7 +195,14 @@ function fetchModel(model, callback, errorCallback, progressCallback) {
     fetchZip(model, callback, errorCallback, progressCallback);
 }
 
-function checkCached(model, callback, errorCallback) {
+function checkCached(modelId, callback, errorCallback) {
+    var model;
+    try {
+        model = getModel(modelId);
+    } catch (e) {
+        errorCallback(e);
+        return;
+    }
     var zipUrl = model.model_path.split('#')[0];
     if (model.label_path.indexOf(zipUrl) == -1) {
         errorCallback('Model and labels must be in same zip file!');