Ticket #6072: dojo.data.ItemFileStore_20080410.patch

tests/data/readOnlyItemFileTestTemplates.js

@@ -251 +251 @@
                 }
         },
         {
+                name: "Identity API: fetchItemByIdentity() preventCache",
+                runTest: function(datastore, t){
+                        //      summary: 
+                        //              Simple test of the fetchItemByIdentity function of the store.
+                        var args = tests.data.readOnlyItemFileTestTemplates.getTestData("countries");
+                        args.urlPreventCache = true;
+                        var store = new datastore(args);
+
+                        var d = new doh.Deferred();
+                        function onItem(item){
+                                t.assertTrue(item !== null);
+                                if(item !== null){
+                                        var name = store.getValue(item,"name");
+                                        t.assertEqual(name, "El Salvador");
+                                }
+                                d.callback(true);
+                        }
+                        function onError(errData){
+                                t.assertTrue(false);
+                                d.errback(errData);
+                        }
+                        store.fetchItemByIdentity({identity: "sv", onItem: onItem, onError: onError});
+                        return d; // Deferred
+                }
+        },
+        {
                 name: "Identity API: fetchItemByIdentity() notFound",
                 runTest: function(datastore, t){
                         //      summary: 
@@ -475 +501 @@
                 }
         },
         {
+                name: "Read API: fetch() all PreventCache",
+                runTest: function(datastore, t){
+                        //      summary: 
+                        //              Simple test of a basic fetch on ItemFileReadStore.
+                        //      description:
+                        //              Simple test of a basic fetch on ItemFileReadStore.
+                        var args = tests.data.readOnlyItemFileTestTemplates.getTestData("countries");
+                        args.urlPreventCache = true;
+                        var store = new datastore(args);
+                        
+                        var d = new doh.Deferred();
+                        function completedAll(items, request){
+                                t.is(7, items.length);
+                                d.callback(true);
+                        }
+                        function error(errData, request){
+                                t.assertTrue(false);
+                                d.errback(errData);
+                        }
+
+                        //Get everything...
+                        store.fetch({ onComplete: completedAll, onError: error});
+                        return d;
+                }
+        },
+        {
                 name: "Read API: fetch() one",
                 runTest: function(datastore, t){
                         //      summary: 

data/ItemFileReadStore.js

@@ -61 +61 @@
                 this._reverseRefMap = "_RRM"; // Default attribute for constructing a reverse reference map for use with reference integrity
                 this._loadInProgress = false;   //Got to track the initial load to prevent duelling loads of the dataset.
                 this._queuedFetches = [];
+                if(keywordParameters.urlPreventCache !== undefined){
+                        this.urlPreventCache = keywordParameters.urlPreventCache?true:false;
+                }
         },
         
         url: "",        // use "" rather than undefined for the benefit of the parser (#3539)
 
+        //Parameter to allow specifying if preventCache should be passed to the xhrGet call or not when loading data from a url.  
+        //Note this does not mean the store calls the server on each fetch, only that the data load has preventCache set as an option.
+        //Added for tracker: #6072
+        urlPreventCache: false,  
+
         _assertIsItem: function(/* item */ item){
                 //      summary:
                 //              This function tests whether the item passed in is indeed an item in the store.
@@ -284 +292 @@
                                         this._loadInProgress = true;
                                         var getArgs = {
                                                         url: self._jsonFileUrl, 
-                                                        handleAs: "json-comment-optional"
+                                                        handleAs: "json-comment-optional",
+                                                        preventCache: this.urlPreventCache
                                                 };
                                         var getHandler = dojo.xhrGet(getArgs);
                                         getHandler.addCallback(function(data){
@@ -636 +645 @@
                                         this._loadInProgress = true;
                                         var getArgs = {
                                                         url: self._jsonFileUrl, 
-                                                        handleAs: "json-comment-optional"
+                                                        handleAs: "json-comment-optional",
+                                                        preventCache: this.urlPreventCache
                                         };
                                         var getHandler = dojo.xhrGet(getArgs);
                                         getHandler.addCallback(function(data){
@@ -727 +737 @@
                                 var getArgs = {
                                         url: self._jsonFileUrl, 
                                         handleAs: "json-comment-optional",
+                                        preventCache: this.urlPreventCache,
                                         sync: true
                                 };
                         var getHandler = dojo.xhrGet(getArgs);