Changeset 683

Timestamp:

09/09/10 20:44:35 (14 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2/WebContent/scripts

Files:

• mdservice2_ui.js (modified) (8 diffs)
• mdservice_model.js (modified) (2 diffs)

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -87 +87 @@
                                 this.Queries[0] = jj;
                             }
+                        });
+                        
+                        $.each(jsonw["WorkspaceProfile"]["Querysets"], function(i,item){
+                                if (String(this.Queries) != "null") {
+                                        $.each(this.Queries, function(i,item){
+                                                if (this.collections != "null") {
+                                                        if (this.collections[0] == undefined){
+                                                        var jj = this["collections"]["item"];
+                                                                delete this["collections"]["item"];
+                                                                this.collections = [{}];
+                                                        this.collections[0] = jj;
+                                                    }
+                                                }
+                                        });
+                                }
                         });
                 }
@@ -503 +518 @@
                 var qid = $(this).closest('.query_wrapper').attr("id");
                 var qstring = queryset.getquerystring(qid);     
-                var coll = queryset.getcollections(qid);
-                if (coll == "") {
-                        coll = "null";
-                }
-                
-                var id = $("#qts_select option:selected").val();
+                var json_coll = queryset.getcollections(qid);
+                
+                var id = parseInt($("#qts_select option:selected").val());
                 var iq = $("#qs_select option").size();
                 
-                //var query = new Query("","");
                 if (iq == 0){
                         jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}];
                 }
-                jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq] = {"querystring":qstring,"searchclauses":"null" , "collections" : {"item":coll}};
-                
+                jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq] = {"querystring":qstring,"searchclauses":"null" , "collections" : json_coll};
                 saveWorkspace();
                 
@@ -620 +630 @@
                 var iq = parseInt($("#qs_select option:selected").val());
                 
+                var collection_text = "";
+                if (jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq].collections != "null"){
+                        $.each(jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq].collections,function(i,item){
+                                collection_text = collection_text + "," + item;
+                        });
+                        if (collection_text.length > 1) {
+                                collection_text = collection_text.substring(1); 
+                        }
+                }
+                
                 var query = new Query("","");
                 query.load(jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq]);
+                query.collection = collection_text;
                 queryset.addquery(query);
                 
                 searchclauseset.sctext = query.query;
                 searchclauseset.buildfromquerystring();
-        });
-        $('#qs_delete').click(function(){
+
+                $('#collection_list').attr("value",collection_text);
+        });
+        $('#qs_remove').click(function(){
                 var count = $("#qs_select option").size();
                 var id = parseInt($("#qts_select option:selected").val());
@@ -634 +657 @@
                 
                 for (var i=iq;i<size-1;i++){
-                        jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][i] = jjsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][i+1];
+                        jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][i] = jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][i+1];
                 }
         
@@ -640 +663 @@
                 jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"].length = size-1;
                 
+                if (size == 1){
+                        jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = "null";
+                }
                 
                 saveWorkspace();
@@ -816 +842 @@
                         if (String(jsonq.Queries) != "null") {
                                 $.each(jsonw["WorkspaceProfile"].Querysets[id].Queries, function(i,item) {
-                                        notifyUser(i + ',' + this.querystring + ',' + this.created,'debug');
+                                        notifyUser(i + ',' + this.querystring + ',' + this.collections[0],'debug');
                                         $('#qs_select').append(new Option(this.querystring, i));
                                 });
@@ -833 +859 @@
                                 if (String(jsonw["WorkspaceProfile"].Querysets[id].Queries) != "null") {
                                         $.each(jsonw["WorkspaceProfile"].Querysets[id].Queries, function(i,item) {
-                                                notifyUser(i + ',' + this.querystring + ',' + this.created,'debug');
-                                                $('#qs_select').append(new Option(this.querystring, i));
+                                        
+                                                notifyUser(i + ',' + this.querystring + ',' + this.collections[0],'debug');
+                                                $('#qs_select').append(new Option(this.querystring , i));
                                         });
                                 }
@@ -857 +884 @@
                                 this.Queries = {};
                                 this.Queries["Query"] = jj;
-                                        
                             }
+                            /*
+                            $.each(this.Queries,function(i,item){
+                                if (this.collections != "null"){
+                                         if (this.collections[1] == undefined){
+                                                        var jj = this["collections"][0];
+                                                        delete this["collections"][0];
+                                                        this.collections = {};
+                                                        this.collections["item"] = jj;
+                                                    }           
+                                }
+                            });
+                            */
                         }
                 });

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -101 +101 @@
         getcollections: function(qid) {
                 var coll = "";
+                var json_coll, json_temp;
                 
                 for (var i = 0; i < this.queries.length; i++) {
@@ -107 +108 @@
                         } 
                 }
-                return coll;
+                
+                if (coll == "") {
+                        json_coll = {};
+                        json_coll = "null";
+                } else {  
+                        var pos = coll.indexOf(",", 0);
+                        var i = 0;
+                        
+                        json_coll = [{}];
+                        while (pos > -1){
+                                if (pos > -1){
+                                        json_coll[i] = coll.substring(0,pos);
+                                } else {
+                                        json_coll[i] = coll;
+                                }
+                                coll = coll.substring(pos+1);
+                                pos = coll.indexOf(",", 0);
+                                i = i+1;
+                        }
+                        
+                        json_coll[i] = coll;
+
+                        
+                }
+                return json_coll;
         }
 };